[Pkg-kde-commits] rev 1108 - in branches/kde-3.4.0/packages/kdebase/debian: . patches
Pierre Habouzit
madcoder-guest@costa.debian.org
Tue, 24 May 2005 14:30:53 +0000
Author: madcoder-guest
Date: 2005-05-24 14:30:38 +0000 (Tue, 24 May 2005)
New Revision: 1108
Removed:
branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_2005-05-07.diff.uu
Modified:
branches/kde-3.4.0/packages/kdebase/debian/changelog
branches/kde-3.4.0/packages/kdebase/debian/patches/98_buildprep.diff
Log:
kdebase 3.4.1 : buildprep + remove branch pull
Modified: branches/kde-3.4.0/packages/kdebase/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/changelog 2005-05-24 13:49:34 UTC (rev 1107)
+++ branches/kde-3.4.0/packages/kdebase/debian/changelog 2005-05-24 14:30:38 UTC (rev 1108)
@@ -1,3 +1,9 @@
+kdebase (4:3.4.1-0pre1) alioth; urgency=low
+
+ * New upstream release.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Tue, 24 May 2005 16:24:01 +0200
+
kdebase (4:3.4.0-0pre4) alioth; urgency=low
* New upstream release.
Deleted: branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_2005-05-07.diff.uu
Modified: branches/kde-3.4.0/packages/kdebase/debian/patches/98_buildprep.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/patches/98_buildprep.diff 2005-05-24 13:49:34 UTC (rev 1107)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/98_buildprep.diff 2005-05-24 14:30:38 UTC (rev 1108)
@@ -1,7 +1,7 @@
-diff -Nru kdebase-3.4.0.orig/acinclude.m4 kdebase-3.4.0/acinclude.m4
---- kdebase-3.4.0.orig/acinclude.m4 2005-03-04 08:11:03.000000000 -0500
-+++ kdebase-3.4.0/acinclude.m4 2005-05-07 12:16:44.000000000 -0400
-@@ -1682,15 +1682,6 @@
+diff -rua kdebase-3.4.1.orig/acinclude.m4 kdebase-3.4.1/acinclude.m4
+--- kdebase-3.4.1.orig/acinclude.m4 2005-05-23 18:34:12.000000000 +0200
++++ kdebase-3.4.1/acinclude.m4 2005-05-24 16:23:00.388752031 +0200
+@@ -1690,15 +1690,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)
-@@ -2131,9 +2122,6 @@
+@@ -2139,9 +2130,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -27,7 +27,7 @@
AC_TRY_COMPILE([
$2
],
-@@ -5686,6 +5674,7 @@
+@@ -5770,6 +5758,7 @@
## the same distribution terms that you use for the rest of that program.
# serial 47 AC_PROG_LIBTOOL
@@ -35,7 +35,7 @@
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -5745,7 +5734,7 @@
+@@ -5829,7 +5818,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -44,7 +44,7 @@
AC_SUBST(LIBTOOL)dnl
# Prevent multiple expansion
-@@ -6159,12 +6148,11 @@
+@@ -6243,12 +6232,11 @@
if AC_TRY_EVAL(ac_compile); then
case "`/usr/bin/file conftest.o`" in
*32-bit*)
@@ -58,7 +58,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -6176,7 +6164,6 @@
+@@ -6260,7 +6248,6 @@
esac
;;
*64-bit*)
@@ -66,7 +66,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -6306,7 +6293,7 @@
+@@ -6390,7 +6377,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 +75,7 @@
case $build_os in
msdosdjgpp*)
-@@ -6335,20 +6322,26 @@
+@@ -6419,20 +6406,26 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -107,7 +107,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.
-@@ -6498,7 +6491,7 @@
+@@ -6582,7 +6575,7 @@
lt_cv_dlopen_self=yes
])
;;
@@ -116,7 +116,7 @@
*)
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
-@@ -6587,13 +6580,6 @@
+@@ -6671,13 +6664,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -130,7 +130,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.
-@@ -6617,8 +6603,11 @@
+@@ -6701,8 +6687,11 @@
fi
fi
chmod u+w .
@@ -144,7 +144,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -6735,7 +6724,7 @@
+@@ -6819,7 +6808,7 @@
*)
AC_MSG_RESULT([no])
;;
@@ -153,7 +153,7 @@
fi
])# AC_LIBTOOL_SYS_LIB_STRIP
-@@ -6748,7 +6737,7 @@
+@@ -6832,7 +6821,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -162,7 +162,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -6758,7 +6747,20 @@
+@@ -6842,7 +6831,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -184,7 +184,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -6823,7 +6825,7 @@
+@@ -6907,7 +6909,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -193,7 +193,7 @@
;;
beos*)
-@@ -6848,7 +6850,7 @@
+@@ -6932,7 +6934,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -202,7 +202,7 @@
need_version=no
need_lib_prefix=no
-@@ -6913,7 +6915,7 @@
+@@ -6997,7 +6999,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -211,7 +211,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"`
-@@ -6936,7 +6938,7 @@
+@@ -7020,7 +7022,7 @@
dynamic_linker=no
;;
@@ -220,7 +220,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -6996,7 +6998,7 @@
+@@ -7080,7 +7082,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -229,7 +229,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -7011,7 +7013,7 @@
+@@ -7095,7 +7097,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -238,7 +238,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7022,7 +7024,7 @@
+@@ -7106,7 +7108,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -247,7 +247,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7084,22 +7086,19 @@
+@@ -7168,22 +7170,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 +276,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,
-@@ -7109,6 +7108,30 @@
+@@ -7193,6 +7192,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -307,7 +307,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -7118,7 +7141,7 @@
+@@ -7202,7 +7225,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -316,7 +316,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -7147,7 +7170,7 @@
+@@ -7231,7 +7254,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -325,7 +325,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
-@@ -7167,7 +7190,7 @@
+@@ -7251,7 +7274,7 @@
os2*)
libname_spec='$name'
@@ -334,7 +334,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -7758,31 +7781,23 @@
+@@ -7842,31 +7865,23 @@
;;
cygwin*)
@@ -375,7 +375,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -7821,42 +7836,21 @@
+@@ -7905,42 +7920,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -425,7 +425,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
-@@ -7885,9 +7879,6 @@
+@@ -7969,9 +7963,6 @@
;;
osf3* | osf4* | osf5*)
@@ -435,7 +435,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -7897,7 +7888,6 @@
+@@ -7981,7 +7972,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -443,7 +443,7 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -8163,7 +8153,7 @@
+@@ -8247,7 +8237,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 +452,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
-@@ -8213,7 +8203,7 @@
+@@ -8297,7 +8287,7 @@
fi
;;
@@ -461,7 +461,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -8223,29 +8213,29 @@
+@@ -8307,29 +8297,29 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -505,7 +505,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8253,8 +8243,8 @@
+@@ -8337,8 +8327,8 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -516,7 +516,7 @@
esac
AC_MSG_RESULT([$enable_shared])
-@@ -8362,8 +8352,8 @@
+@@ -8446,8 +8436,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 +527,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -8389,7 +8379,7 @@
+@@ -8473,7 +8463,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 +536,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -8419,8 +8409,22 @@
+@@ -8503,8 +8493,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -561,7 +561,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -8466,15 +8470,16 @@
+@@ -8550,15 +8554,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -582,7 +582,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.
-@@ -8483,13 +8488,12 @@
+@@ -8567,13 +8572,12 @@
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -598,7 +598,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -8504,7 +8508,7 @@
+@@ -8588,7 +8592,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 +607,7 @@
fi
fi
;;
-@@ -8521,12 +8525,12 @@
+@@ -8605,12 +8609,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 +622,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
-@@ -8535,7 +8539,7 @@
+@@ -8619,7 +8623,7 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -631,7 +631,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -8546,20 +8550,20 @@
+@@ -8630,20 +8634,20 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -662,7 +662,7 @@
fi
;;
esac
-@@ -8569,19 +8573,19 @@
+@@ -8653,19 +8657,19 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -688,7 +688,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8616,7 +8620,7 @@
+@@ -8700,7 +8704,7 @@
freebsd-elf*)
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
;;
@@ -697,7 +697,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8638,7 +8642,7 @@
+@@ -8722,7 +8726,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
aCC)
@@ -706,7 +706,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8647,11 +8651,11 @@
+@@ -8731,11 +8735,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 +720,7 @@
else
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8708,7 +8712,7 @@
+@@ -8792,7 +8796,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -729,7 +729,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -8729,7 +8733,7 @@
+@@ -8813,7 +8817,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -738,7 +738,7 @@
;;
esac
fi
-@@ -8744,7 +8748,7 @@
+@@ -8828,7 +8832,7 @@
case $cc_basename in
CC)
# SGI C++
@@ -747,7 +747,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -8755,9 +8759,9 @@
+@@ -8839,9 +8843,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -759,7 +759,7 @@
fi
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -8774,8 +8778,8 @@
+@@ -8858,8 +8862,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 +770,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8797,16 +8801,16 @@
+@@ -8881,16 +8885,16 @@
# Intel C++
with_gnu_ld=yes
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -791,7 +791,7 @@
runpath_var=LD_RUN_PATH
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -8844,7 +8848,7 @@
+@@ -8928,7 +8932,7 @@
;;
esac
;;
@@ -800,7 +800,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=
-@@ -8863,7 +8867,7 @@
+@@ -8947,7 +8951,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 +809,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8880,7 +8884,7 @@
+@@ -8964,7 +8968,7 @@
;;
cxx)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -818,7 +818,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8898,7 +8902,7 @@
+@@ -8982,7 +8986,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -827,7 +827,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8923,7 +8927,7 @@
+@@ -9007,7 +9011,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 +836,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8939,10 +8943,10 @@
+@@ -9023,10 +9027,10 @@
;;
cxx)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
@@ -849,7 +849,7 @@
$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -8961,7 +8965,7 @@
+@@ -9045,7 +9049,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -858,7 +858,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9018,9 +9022,9 @@
+@@ -9102,9 +9106,9 @@
CC)
# Sun C++ 4.2, 5.x and Centerline C++
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -870,7 +870,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -9054,7 +9058,7 @@
+@@ -9138,7 +9142,7 @@
;;
gcx)
# Green Hills C++ Compiler
@@ -879,7 +879,7 @@
# The C++ compiler must be used to create the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9064,9 +9068,9 @@
+@@ -9148,9 +9152,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 +891,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9075,9 +9079,9 @@
+@@ -9159,9 +9163,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -903,7 +903,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9245,7 +9249,7 @@
+@@ -9329,7 +9333,7 @@
fi
;;
@@ -912,7 +912,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -9354,7 +9358,7 @@
+@@ -9438,7 +9442,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -921,7 +921,7 @@
test "$enable_shared" = yes && enable_static=no
;;
esac
-@@ -9496,11 +9500,12 @@
+@@ -9580,11 +9584,12 @@
# without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
@@ -936,7 +936,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 \
-@@ -9550,7 +9555,7 @@
+@@ -9634,7 +9639,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \
@@ -945,7 +945,7 @@
_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
_LT_AC_TAGVAR(export_symbols_cmds, $1) | \
extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9681,7 +9686,7 @@
+@@ -9765,7 +9770,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -954,7 +954,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -9712,7 +9717,7 @@
+@@ -9796,7 +9801,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -963,7 +963,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -9956,7 +9961,10 @@
+@@ -10040,7 +10045,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 +975,7 @@
fi
])# AC_LIBTOOL_CONFIG
-@@ -10029,7 +10037,7 @@
+@@ -10113,7 +10121,7 @@
symcode='[[BCDEGQRST]]'
;;
solaris* | sysv5*)
@@ -984,7 +984,7 @@
;;
sysv4)
symcode='[[DFNSTU]]'
-@@ -10047,7 +10055,7 @@
+@@ -10131,7 +10139,7 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -993,7 +993,7 @@
esac
# Try without a prefix undercore, then with it.
-@@ -10262,7 +10270,7 @@
+@@ -10346,7 +10354,7 @@
;;
esac
;;
@@ -1002,7 +1002,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -10313,7 +10321,7 @@
+@@ -10397,7 +10405,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 +1011,7 @@
cxx)
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -10338,7 +10346,7 @@
+@@ -10422,7 +10430,7 @@
;;
esac
;;
@@ -1020,7 +1020,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -10649,6 +10657,9 @@
+@@ -10733,6 +10741,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 +1030,7 @@
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -10673,7 +10684,7 @@
+@@ -10757,7 +10768,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
@@ -1039,7 +1039,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*
-@@ -10747,7 +10758,7 @@
+@@ -10831,7 +10842,7 @@
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -1048,7 +1048,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10757,13 +10768,13 @@
+@@ -10841,13 +10852,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 +1064,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
-@@ -10772,19 +10783,19 @@
+@@ -10856,19 +10867,19 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -1088,7 +1088,7 @@
fi
;;
-@@ -10802,8 +10813,8 @@
+@@ -10886,8 +10897,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -1099,7 +1099,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10816,10 +10827,36 @@
+@@ -10900,10 +10911,36 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
@@ -1138,7 +1138,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10869,9 +10906,20 @@
+@@ -10953,9 +10990,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 +1161,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -10917,29 +10965,29 @@
+@@ -11001,29 +11049,29 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -1200,7 +1200,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -10954,7 +11002,7 @@
+@@ -11038,7 +11086,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 +1209,7 @@
fi
fi
;;
-@@ -10977,13 +11025,13 @@
+@@ -11061,13 +11109,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 +1226,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.
-@@ -10997,21 +11045,21 @@
+@@ -11081,21 +11129,21 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -1261,7 +1261,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -11020,26 +11068,26 @@
+@@ -11104,26 +11152,26 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -1296,7 +1296,7 @@
;;
dgux*)
-@@ -11072,8 +11120,8 @@
+@@ -11156,8 +11204,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -1307,7 +1307,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
-@@ -11081,7 +11129,7 @@
+@@ -11165,7 +11213,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -1316,7 +1316,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
-@@ -11099,10 +11147,10 @@
+@@ -11183,10 +11231,10 @@
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case "$host_cpu" in
hppa*64*|ia64*)
@@ -1329,7 +1329,7 @@
;;
esac
else
-@@ -11149,7 +11197,7 @@
+@@ -11233,7 +11281,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -1338,7 +1338,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'
-@@ -11159,7 +11207,7 @@
+@@ -11243,7 +11291,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -1347,7 +1347,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
-@@ -11182,7 +11230,7 @@
+@@ -11266,7 +11314,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 +1356,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
else
-@@ -11192,7 +11240,7 @@
+@@ -11276,7 +11324,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
;;
*)
@@ -1365,7 +1365,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
;;
esac
-@@ -11203,14 +11251,14 @@
+@@ -11287,14 +11335,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 +1382,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'
-@@ -11222,7 +11270,7 @@
+@@ -11306,7 +11354,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 +1391,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
else
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-@@ -11247,9 +11295,9 @@
+@@ -11331,9 +11379,9 @@
solaris*)
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
if test "$GCC" = yes; then
@@ -1403,7 +1403,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~
-@@ -11269,7 +11317,7 @@
+@@ -11353,7 +11401,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 +1412,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -11329,9 +11377,9 @@
+@@ -11413,9 +11461,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
_LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -1424,7 +1424,7 @@
fi
runpath_var='LD_RUN_PATH'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11389,7 +11437,7 @@
+@@ -11473,7 +11521,7 @@
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -1433,7 +1433,7 @@
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest
lib=conftest
-@@ -11548,8 +11596,8 @@
+@@ -11632,8 +11680,8 @@
fi
done
done
@@ -1443,361 +1443,25 @@
AC_MSG_RESULT([$SED])
])
-diff -Nru kdebase-3.4.0.orig/aclocal.m4 kdebase-3.4.0/aclocal.m4
---- kdebase-3.4.0.orig/aclocal.m4 2005-03-04 08:11:28.000000000 -0500
-+++ kdebase-3.4.0/aclocal.m4 2005-05-07 12:18:16.000000000 -0400
-@@ -1,7 +1,7 @@
--# generated automatically by aclocal 1.9.1 -*- Autoconf -*-
-+# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
-
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
--# Free Software Foundation, Inc.
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-+# 2005 Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -11,23 +11,11 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
-
--# -*- Autoconf -*-
--# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
--# Generated from amversion.in; do not edit by hand.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
- # AM_AUTOMAKE_VERSION(VERSION)
- # ----------------------------
-@@ -40,26 +28,15 @@
- # Call AM_AUTOMAKE_VERSION so it can be traced.
- # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-- [AM_AUTOMAKE_VERSION([1.9.1])])
--
--# AM_AUX_DIR_EXPAND
-+ [AM_AUTOMAKE_VERSION([1.9.5])])
-
--# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-+# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
- # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
- # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
-@@ -106,26 +83,16 @@
- am_aux_dir=`cd $ac_aux_dir && pwd`
- ])
-
--# AM_CONDITIONAL -*- Autoconf -*-
--
--# Copyright (C) 1997, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
-+# AM_CONDITIONAL -*- Autoconf -*-
-
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--# serial 6
-+# serial 7
-
- # AM_CONDITIONAL(NAME, SHELL-CONDITION)
- # -------------------------------------
-@@ -149,26 +116,15 @@
- Usually this means the macro was only invoked conditionally.]])
- fi])])
-
--# serial 7 -*- Autoconf -*-
-
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
- # Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
-+# serial 8
-
- # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
- # written in clear, in which case automake, when reading aclocal.m4,
-@@ -177,7 +133,6 @@
- # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
--
- # _AM_DEPENDENCIES(NAME)
- # ----------------------
- # See how the compiler implements dependency checking.
-@@ -317,27 +272,16 @@
- AC_SUBST([AMDEPBACKSLASH])
- ])
-
--# Generate code to set up dependency tracking. -*- Autoconf -*-
--
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
--# Free Software Foundation, Inc.
-+# Generate code to set up dependency tracking. -*- Autoconf -*-
-
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--#serial 2
-+#serial 3
-
- # _AM_OUTPUT_DEPENDENCY_COMMANDS
- # ------------------------------
-@@ -396,54 +340,31 @@
- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
- ])
-
--# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
--
--# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
--# serial 7
-+# serial 8
-
- # AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
- AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
--# Do all the work for Automake. -*- Autoconf -*-
--
--# This macro actually does too much some checks are only needed if
--# your package does certain things. But this isn't really a big deal.
-+# Do all the work for Automake. -*- Autoconf -*-
-
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
- # Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# serial 12
-
--# serial 11
-+# This macro actually does too much. Some checks are only needed if
-+# your package does certain things. But this isn't really a big deal.
-
- # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
- # AM_INIT_AUTOMAKE([OPTIONS])
-@@ -545,51 +466,27 @@
- done
- echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-
-+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
- # AM_PROG_INSTALL_SH
- # ------------------
- # Define $install_sh.
--
--# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
- AC_DEFUN([AM_PROG_INSTALL_SH],
- [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
- install_sh=${install_sh-"$am_aux_dir/install-sh"}
- AC_SUBST(install_sh)])
-
--# -*- Autoconf -*-
--# Copyright (C) 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--# serial 1
-+# serial 2
-
- # Check whether the underlying file-system supports filenames
- # with a leading dot. For instance MS-DOS doesn't.
-@@ -604,26 +501,44 @@
+diff -rua kdebase-3.4.1.orig/aclocal.m4 kdebase-3.4.1/aclocal.m4
+--- kdebase-3.4.1.orig/aclocal.m4 2005-05-23 18:34:32.000000000 +0200
++++ kdebase-3.4.1/aclocal.m4 2005-05-24 16:23:22.921716585 +0200
+@@ -501,6 +501,35 @@
rmdir .tst 2>/dev/null
AC_SUBST([am__leading_dot])])
--# Check to see how 'make' treats includes. -*- Autoconf -*-
+# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
+# From Jim Meyering
-
--# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
++
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
-
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
++
+# serial 4
-
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
++
+AC_DEFUN([AM_MAINTAINER_MODE],
+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+ dnl maintainer-mode is disabled by default
@@ -1812,244 +1476,15 @@
+ AC_SUBST(MAINT)dnl
+]
+)
-
--# serial 2
++
+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+
-+# Check to see how 'make' treats includes. -*- Autoconf -*-
-+
-+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 3
+ # Check to see how 'make' treats includes. -*- Autoconf -*-
- # AM_MAKE_INCLUDE()
- # -----------------
-@@ -667,27 +582,16 @@
- rm -f confinc confmf
- ])
-
--# -*- Autoconf -*-
-+# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-
-+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
--# serial 3
-+# serial 4
-
- # AM_MISSING_PROG(NAME, PROGRAM)
- # ------------------------------
-@@ -713,27 +617,16 @@
- fi
- ])
-
-+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
- # AM_PROG_MKDIR_P
- # ---------------
- # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
--
--# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
-+#
- # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
- # created by `make install' are always world readable, even if the
- # installer happens to have an overly restrictive umask (e.g. 077).
-@@ -787,26 +680,15 @@
- fi
- AC_SUBST([mkdir_p])])
-
--# Helper functions for option handling. -*- Autoconf -*-
--
--# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
-+# Helper functions for option handling. -*- Autoconf -*-
-
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--# serial 2
-+# serial 3
-
- # _AM_MANGLE_OPTION(NAME)
- # -----------------------
-@@ -831,28 +713,16 @@
- AC_DEFUN([_AM_IF_OPTION],
- [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
--#
--# Check to make sure that the build environment is sane.
--#
--
--# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
-+# Check to make sure that the build environment is sane. -*- Autoconf -*-
-
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--# serial 3
-+# serial 4
-
- # AM_SANITY_CHECK
- # ---------------
-@@ -895,25 +765,14 @@
- fi
- AC_MSG_RESULT(yes)])
-
--# AM_PROG_INSTALL_STRIP
--
--# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
-+# AM_PROG_INSTALL_STRIP
-+# ---------------------
- # One issue with vendor `install' (even GNU) is that you can't
- # specify the program used to strip binaries. This is especially
- # annoying in cross-compiling environments, where the build's strip
-@@ -936,25 +795,13 @@
-
- # Check how to create a tarball. -*- Autoconf -*-
-
--# Copyright (C) 2004 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
--# serial 1
-+# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
-+# serial 2
-
- # _AM_PROG_TAR(FORMAT)
- # --------------------
-diff -Nru kdebase-3.4.0.orig/applnk/compat/Makefile.in kdebase-3.4.0/applnk/compat/Makefile.in
---- kdebase-3.4.0.orig/applnk/compat/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/applnk/compat/Makefile.in 2005-05-07 12:35:01.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+ # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+diff -rua kdebase-3.4.1.orig/applnk/compat/Makefile.in kdebase-3.4.1/applnk/compat/Makefile.in
+--- kdebase-3.4.1.orig/applnk/compat/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/applnk/compat/Makefile.in 2005-05-24 16:27:52.300384117 +0200
@@ -247,6 +247,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -2081,21 +1516,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/applnk/Makefile.in kdebase-3.4.0/applnk/Makefile.in
---- kdebase-3.4.0.orig/applnk/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/applnk/Makefile.in 2005-05-07 12:35:01.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/applnk/Makefile.in kdebase-3.4.1/applnk/Makefile.in
+--- kdebase-3.4.1.orig/applnk/Makefile.in 2005-05-23 18:38:18.000000000 +0200
++++ kdebase-3.4.1/applnk/Makefile.in 2005-05-24 16:27:52.288385201 +0200
@@ -264,6 +264,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -2136,89 +1559,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -708,7 +711,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -720,7 +729,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -728,7 +737,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -749,7 +764,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -988,7 +1003,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=kde-settings-sound.directory kde-settings-desktop.directory kde-settings-accessibility.directory kde-games.directory kde-games-arcade.directory kde-settings-security.directory kde-settings-network.directory kde-settings-components.directory kde-settingsmenu.directory kde-internet.directory kde-settings-power.directory kde-toys.directory kde-system-screensavers.directory kde-internet-terminal.directory kde-games-board.directory kde-essential.menu kde-office.directory kde-information.menu kde-games-card.directory kde-development.directory kde-settings.menu kde-main.directory kde-information.directory old_desktop_files kde-games-kidsgames.directory Makefile.in kde-settings-hardware.directory kde-settings-system.directory hidden.directory kde-graphics.directory kde-utilities.directory kde-games-roguelikes.directory kde-editors.directory kde-more.directory kde-system.directory kde-system-terminal.directory kde-edutainment.directory kde-settings-webbrowsing.directory kde-settings.directory kde-science.directory kde-utilities-xutils.directory kde-settings-looknfeel.directory kde-unknown.directory kde-screensavers.menu Makefile.am kde-multimedia.directory kde-games-strategy.directory kde-settings-peripherals.directory
-+KDE_DIST=kde-settings-sound.directory kde-settings-desktop.directory kde-games.directory kde-games-arcade.directory kde-settings-accessibility.directory kde-settings-network.directory kde-settings-security.directory kde-settings-components.directory kde-settingsmenu.directory kde-internet.directory kde-settings-power.directory kde-system-screensavers.directory kde-toys.directory kde-internet-terminal.directory kde-essential.menu kde-games-board.directory kde-information.menu kde-office.directory kde-development.directory kde-games-card.directory kde-settings.menu kde-main.directory kde-information.directory old_desktop_files kde-games-kidsgames.directory Makefile.in kde-settings-hardware.directory kde-settings-system.directory hidden.directory kde-graphics.directory kde-utilities.directory kde-games-roguelikes.directory kde-editors.directory kde-more.directory kde-system.directory kde-system-terminal.directory kde-edutainment.directory kde-settings-webbrowsing.directory kde-settings.directory kde-science.directory kde-utilities-xutils.directory kde-settings-looknfeel.directory kde-unknown.directory kde-screensavers.menu kde-multimedia.directory Makefile.am kde-games-strategy.directory kde-settings-peripherals.directory
-
- #>+ 2
- docs-am:
-diff -Nru kdebase-3.4.0.orig/config.h.in kdebase-3.4.0/config.h.in
---- kdebase-3.4.0.orig/config.h.in 2005-03-04 08:11:44.000000000 -0500
-+++ kdebase-3.4.0/config.h.in 2005-05-07 12:19:15.000000000 -0400
-@@ -131,9 +131,6 @@
- /* Defines if you have GL (Mesa, OpenGL, ...) */
- #undef HAVE_GL
-
--/* Define if you have a working getifaddrs() */
--#undef HAVE_GOOD_GETIFADDRS
--
- /* Define to 1 if you have the `grantpt' function. */
- #undef HAVE_GRANTPT
-
-@@ -415,6 +412,9 @@
- /* Define to 1 if you have the <sys/ioctl.h> header file. */
- #undef HAVE_SYS_IOCTL_H
-
-+/* Define to 1 if you have the <sys/loadavg.h> header file. */
-+#undef HAVE_SYS_LOADAVG_H
-+
- /* Define to 1 if you have the <sys/mount.h> header file. */
- #undef HAVE_SYS_MOUNT_H
-
-diff -Nru kdebase-3.4.0.orig/configure kdebase-3.4.0/configure
---- kdebase-3.4.0.orig/configure 2005-03-04 08:15:11.000000000 -0500
-+++ kdebase-3.4.0/configure 2005-05-07 12:36:09.000000000 -0400
+diff -rua kdebase-3.4.1.orig/configure kdebase-3.4.1/configure
+--- kdebase-3.4.1.orig/configure 2005-05-23 18:38:35.000000000 +0200
++++ kdebase-3.4.1/configure 2005-05-24 16:28:06.724081302 +0200
@@ -464,7 +464,7 @@
# include <unistd.h>
#endif"
@@ -2378,17 +1721,27 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4296,8 +4313,7 @@
+@@ -4273,8 +4290,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4385,8 +4401,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4385,8 +4401,7 @@
+@@ -4474,8 +4489,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2398,7 +1751,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4488,8 +4503,7 @@
+@@ -4577,8 +4591,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2408,7 +1761,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4588,8 +4602,7 @@
+@@ -4677,8 +4690,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2418,7 +1771,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4673,8 +4686,7 @@
+@@ -4762,8 +4774,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2428,7 +1781,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4763,8 +4775,7 @@
+@@ -4852,8 +4863,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2438,7 +1791,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4851,8 +4862,7 @@
+@@ -4940,8 +4950,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2448,7 +1801,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4939,8 +4949,7 @@
+@@ -5028,8 +5037,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2458,7 +1811,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5046,8 +5055,7 @@
+@@ -5135,8 +5143,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2468,7 +1821,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5134,8 +5142,7 @@
+@@ -5223,8 +5230,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2478,7 +1831,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5222,8 +5229,7 @@
+@@ -5311,8 +5317,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2488,7 +1841,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5310,8 +5316,7 @@
+@@ -5399,8 +5404,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2498,7 +1851,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5442,8 +5447,7 @@
+@@ -5531,8 +5535,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2508,7 +1861,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5531,8 +5535,7 @@
+@@ -5620,8 +5623,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2518,7 +1871,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5619,8 +5622,7 @@
+@@ -5708,8 +5710,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2528,7 +1881,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5707,8 +5709,7 @@
+@@ -5796,8 +5797,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2538,7 +1891,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5795,8 +5796,7 @@
+@@ -5884,8 +5884,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2548,7 +1901,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5883,8 +5883,7 @@
+@@ -5972,8 +5971,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2558,7 +1911,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6307,8 +6306,7 @@
+@@ -6396,8 +6394,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2568,7 +1921,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6434,8 +6432,7 @@
+@@ -6523,8 +6520,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2578,7 +1931,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6523,8 +6520,7 @@
+@@ -6612,8 +6608,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2588,7 +1941,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6607,185 +6603,6 @@
+@@ -6696,185 +6691,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -2774,7 +2127,7 @@
fi
-@@ -6974,10 +6791,10 @@
+@@ -7063,10 +6879,10 @@
fi
done
done
@@ -2786,7 +2139,7 @@
echo "$as_me:$LINENO: result: $SED" >&5
echo "${ECHO_T}$SED" >&6
-@@ -7211,31 +7028,23 @@
+@@ -7300,31 +7116,23 @@
;;
cygwin*)
@@ -2826,7 +2179,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -7274,42 +7083,21 @@
+@@ -7363,42 +7171,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -2876,7 +2229,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
-@@ -7338,9 +7126,6 @@
+@@ -7427,9 +7214,6 @@
;;
osf3* | osf4* | osf5*)
@@ -2886,7 +2239,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -7350,7 +7135,6 @@
+@@ -7439,7 +7223,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -2894,16 +2247,16 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -7427,7 +7211,7 @@
+@@ -7516,7 +7299,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 7430 "configure"' > conftest.$ac_ext
-+ echo '#line 7214 "configure"' > conftest.$ac_ext
+- echo '#line 7519 "configure"' > conftest.$ac_ext
++ echo '#line 7302 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7472,12 +7256,11 @@
+@@ -7561,12 +7344,11 @@
(exit $ac_status); }; then
case "`/usr/bin/file conftest.o`" in
*32-bit*)
@@ -2917,7 +2270,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7489,7 +7272,6 @@
+@@ -7578,7 +7360,6 @@
esac
;;
*64-bit*)
@@ -2925,7 +2278,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7549,8 +7331,7 @@
+@@ -7638,8 +7419,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2935,7 +2288,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7625,8 +7406,7 @@
+@@ -7714,8 +7494,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2945,7 +2298,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7796,8 +7576,7 @@
+@@ -7885,8 +7664,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2955,7 +2308,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7864,8 +7643,7 @@
+@@ -7953,8 +7731,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2965,16 +2318,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8072,7 +7850,7 @@
+@@ -8161,7 +7938,7 @@
# Provide some information about the compiler.
--echo "$as_me:8075:" \
-+echo "$as_me:7853:" \
+-echo "$as_me:8164:" \
++echo "$as_me:7941:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-@@ -8118,8 +7896,7 @@
+@@ -8207,8 +7984,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2984,7 +2337,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8168,8 +7945,7 @@
+@@ -8257,8 +8033,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2994,7 +2347,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8227,7 +8003,7 @@
+@@ -8316,7 +8091,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
i=0
@@ -3003,7 +2356,7 @@
case $build_os in
msdosdjgpp*)
-@@ -8256,20 +8032,26 @@
+@@ -8345,20 +8120,26 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -3035,7 +2388,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.
-@@ -8337,7 +8119,7 @@
+@@ -8426,7 +8207,7 @@
symcode='[BCDEGQRST]'
;;
solaris* | sysv5*)
@@ -3044,7 +2397,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8355,7 +8137,7 @@
+@@ -8444,7 +8225,7 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -3053,35 +2406,35 @@
esac
# Try without a prefix undercore, then with it.
-@@ -9104,11 +8886,11 @@
+@@ -9193,11 +8974,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9107: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8889: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9196: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8977: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9111: \$? = $ac_status" >&5
-+ echo "$as_me:8893: \$? = $ac_status" >&5
+- echo "$as_me:9200: \$? = $ac_status" >&5
++ echo "$as_me:8981: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -9337,11 +9119,11 @@
+@@ -9426,11 +9207,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9340: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9122: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9429: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9210: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9344: \$? = $ac_status" >&5
-+ echo "$as_me:9126: \$? = $ac_status" >&5
+- echo "$as_me:9433: \$? = $ac_status" >&5
++ echo "$as_me:9214: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -9388,13 +9170,6 @@
+@@ -9477,13 +9258,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -3095,21 +2448,21 @@
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.
-@@ -9404,11 +9179,11 @@
+@@ -9493,11 +9267,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9407: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9182: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9496: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9270: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9411: \$? = $ac_status" >&5
-+ echo "$as_me:9186: \$? = $ac_status" >&5
+- echo "$as_me:9500: \$? = $ac_status" >&5
++ echo "$as_me:9274: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -9418,8 +9193,11 @@
+@@ -9507,8 +9281,11 @@
fi
fi
chmod u+w .
@@ -3123,7 +2476,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -9547,7 +9325,7 @@
+@@ -9636,7 +9413,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -3132,7 +2485,7 @@
else
ld_shlibs=no
fi
-@@ -9557,13 +9335,13 @@
+@@ -9646,13 +9423,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
@@ -3148,7 +2501,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -9572,19 +9350,19 @@
+@@ -9661,19 +9438,19 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -3172,7 +2525,7 @@
fi
;;
-@@ -9602,8 +9380,8 @@
+@@ -9691,8 +9468,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -3183,7 +2536,7 @@
else
ld_shlibs=no
fi
-@@ -9616,10 +9394,36 @@
+@@ -9705,10 +9482,36 @@
hardcode_shlibpath_var=no
;;
@@ -3222,7 +2575,7 @@
else
ld_shlibs=no
fi
-@@ -9669,9 +9473,20 @@
+@@ -9758,9 +9561,20 @@
else
export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -3245,7 +2598,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9717,21 +9532,22 @@
+@@ -9806,21 +9620,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -3273,7 +2626,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -9755,8 +9571,7 @@
+@@ -9844,8 +9659,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3283,7 +2636,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -9783,14 +9598,13 @@
+@@ -9872,14 +9686,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -3301,7 +2654,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -9817,8 +9631,7 @@
+@@ -9906,8 +9719,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3311,7 +2664,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -9856,7 +9669,7 @@
+@@ -9945,7 +9757,7 @@
whole_archive_flag_spec=' '
archive_cmds_need_lc=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -3320,7 +2673,7 @@
fi
fi
;;
-@@ -9879,13 +9692,13 @@
+@@ -9968,13 +9780,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -3337,7 +2690,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds='true'
# FIXME: Should let the user specify the lib program.
-@@ -9899,21 +9712,21 @@
+@@ -9988,21 +9800,21 @@
archive_cmds_need_lc=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -3372,7 +2725,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -9922,18 +9735,18 @@
+@@ -10011,18 +9823,18 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -3397,7 +2750,7 @@
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
-@@ -9974,8 +9787,8 @@
+@@ -10063,8 +9875,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -3408,7 +2761,7 @@
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -9983,7 +9796,7 @@
+@@ -10072,7 +9884,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -3417,7 +2770,7 @@
else
archive_cmds='$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
-@@ -10001,10 +9814,10 @@
+@@ -10090,10 +9902,10 @@
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case "$host_cpu" in
hppa*64*|ia64*)
@@ -3430,7 +2783,7 @@
;;
esac
else
-@@ -10051,7 +9864,7 @@
+@@ -10140,7 +9952,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -3439,7 +2792,7 @@
else
archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld='-rpath $libdir'
-@@ -10061,7 +9874,7 @@
+@@ -10150,7 +9962,7 @@
link_all_deplibs=yes
;;
@@ -3448,7 +2801,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10084,7 +9897,7 @@
+@@ -10173,7 +9985,7 @@
hardcode_direct=yes
hardcode_shlibpath_var=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -3457,7 +2810,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10094,7 +9907,7 @@
+@@ -10183,7 +9995,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -3466,7 +2819,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10105,14 +9918,14 @@
+@@ -10194,14 +10006,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -3483,7 +2836,7 @@
else
allow_undefined_flag=' -expect_unresolved \*'
archive_cmds='$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'
-@@ -10124,7 +9937,7 @@
+@@ -10213,7 +10025,7 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -3492,7 +2845,7 @@
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag=' -expect_unresolved \*'
-@@ -10149,9 +9962,9 @@
+@@ -10238,9 +10050,9 @@
solaris*)
no_undefined_flag=' -z text'
if test "$GCC" = yes; then
@@ -3504,7 +2857,7 @@
else
archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -10171,7 +9984,7 @@
+@@ -10260,7 +10072,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.
@@ -3513,7 +2866,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10231,9 +10044,9 @@
+@@ -10320,9 +10132,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -3525,7 +2878,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var=no
-@@ -10339,7 +10152,7 @@
+@@ -10428,7 +10240,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -3534,7 +2887,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10349,7 +10162,20 @@
+@@ -10438,7 +10250,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -3556,7 +2909,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10414,7 +10240,7 @@
+@@ -10503,7 +10328,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -3565,7 +2918,7 @@
;;
beos*)
-@@ -10439,7 +10265,7 @@
+@@ -10528,7 +10353,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -3574,7 +2927,7 @@
need_version=no
need_lib_prefix=no
-@@ -10504,7 +10330,7 @@
+@@ -10593,7 +10418,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -3583,7 +2936,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"`
-@@ -10527,7 +10353,7 @@
+@@ -10616,7 +10441,7 @@
dynamic_linker=no
;;
@@ -3592,7 +2945,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10587,7 +10413,7 @@
+@@ -10676,7 +10501,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -3601,7 +2954,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10602,7 +10428,7 @@
+@@ -10691,7 +10516,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -3610,7 +2963,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10613,7 +10439,7 @@
+@@ -10702,7 +10527,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -3619,7 +2972,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10675,22 +10501,19 @@
+@@ -10764,22 +10589,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'
@@ -3648,7 +3001,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,
-@@ -10700,6 +10523,30 @@
+@@ -10789,6 +10611,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -3679,7 +3032,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10709,7 +10556,7 @@
+@@ -10798,7 +10644,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -3688,7 +3041,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -10738,7 +10585,7 @@
+@@ -10827,7 +10673,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -3697,7 +3050,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
-@@ -10758,7 +10605,7 @@
+@@ -10847,7 +10693,7 @@
os2*)
libname_spec='$name'
@@ -3706,7 +3059,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -10987,8 +10834,7 @@
+@@ -11076,8 +10922,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3716,7 +3069,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11091,8 +10937,7 @@
+@@ -11180,8 +11025,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3726,7 +3079,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11157,8 +11002,7 @@
+@@ -11246,8 +11090,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3736,7 +3089,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11251,8 +11095,7 @@
+@@ -11340,8 +11183,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3746,7 +3099,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11317,8 +11160,7 @@
+@@ -11406,8 +11248,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3756,7 +3109,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11384,8 +11226,7 @@
+@@ -11473,8 +11314,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3766,7 +3119,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11451,8 +11292,7 @@
+@@ -11540,8 +11380,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3776,25 +3129,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11527,7 +11367,7 @@
+@@ -11616,7 +11455,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11530 "configure"
-+#line 11370 "configure"
+-#line 11619 "configure"
++#line 11458 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11625,7 +11465,7 @@
+@@ -11714,7 +11553,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11628 "configure"
-+#line 11468 "configure"
+-#line 11717 "configure"
++#line 11556 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11750,7 +11590,7 @@
+@@ -11839,7 +11678,7 @@
fi
;;
@@ -3803,7 +3156,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -11760,29 +11600,29 @@
+@@ -11849,29 +11688,29 @@
archive_cmds_need_lc=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -3847,7 +3200,7 @@
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
-@@ -11816,7 +11656,8 @@
+@@ -11905,7 +11744,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -3857,7 +3210,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 \
-@@ -11994,7 +11835,7 @@
+@@ -12083,7 +11923,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -3866,7 +3219,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12025,7 +11866,7 @@
+@@ -12114,7 +11954,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -3875,7 +3228,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12267,7 +12108,10 @@
+@@ -12356,7 +12196,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.
@@ -3887,7 +3240,7 @@
fi
-@@ -12535,8 +12379,8 @@
+@@ -12624,8 +12467,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
@@ -3898,7 +3251,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12562,7 +12406,7 @@
+@@ -12651,7 +12494,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.
@@ -3907,7 +3260,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12593,8 +12437,22 @@
+@@ -12682,8 +12525,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -3932,7 +3285,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12640,15 +12498,16 @@
+@@ -12729,15 +12586,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -3953,7 +3306,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.
-@@ -12678,8 +12537,7 @@
+@@ -12767,8 +12625,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3963,7 +3316,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -12708,13 +12566,12 @@
+@@ -12797,13 +12654,12 @@
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -3979,7 +3332,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -12741,8 +12598,7 @@
+@@ -12830,8 +12686,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3989,7 +3342,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -12780,7 +12636,7 @@
+@@ -12869,7 +12724,7 @@
whole_archive_flag_spec_CXX=' '
archive_cmds_need_lc_CXX=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -3998,7 +3351,7 @@
fi
fi
;;
-@@ -12797,12 +12653,12 @@
+@@ -12886,12 +12741,12 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_CXX='-L$libdir'
@@ -4013,7 +3366,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -12811,7 +12667,7 @@
+@@ -12900,7 +12755,7 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -4022,7 +3375,7 @@
else
ld_shlibs_CXX=no
fi
-@@ -12822,20 +12678,20 @@
+@@ -12911,20 +12766,20 @@
archive_cmds_need_lc_CXX=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -4053,7 +3406,7 @@
fi
;;
esac
-@@ -12845,19 +12701,19 @@
+@@ -12934,19 +12789,19 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -4079,7 +3432,7 @@
hardcode_direct_CXX=no
hardcode_automatic_CXX=yes
hardcode_shlibpath_var_CXX=unsupported
-@@ -12892,7 +12748,7 @@
+@@ -12981,7 +12836,7 @@
freebsd-elf*)
archive_cmds_need_lc_CXX=no
;;
@@ -4088,7 +3441,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -12914,7 +12770,7 @@
+@@ -13003,7 +12858,7 @@
ld_shlibs_CXX=no
;;
aCC)
@@ -4097,7 +3450,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -12923,11 +12779,11 @@
+@@ -13012,11 +12867,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.
@@ -4111,7 +3464,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -12984,7 +12840,7 @@
+@@ -13073,7 +12928,7 @@
archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -4120,7 +3473,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -13005,7 +12861,7 @@
+@@ -13094,7 +12949,7 @@
archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -4129,7 +3482,7 @@
;;
esac
fi
-@@ -13020,7 +12876,7 @@
+@@ -13109,7 +12964,7 @@
case $cc_basename in
CC)
# SGI C++
@@ -4138,7 +3491,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13031,9 +12887,9 @@
+@@ -13120,9 +12975,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -4150,7 +3503,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13050,8 +12906,8 @@
+@@ -13139,8 +12994,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.
@@ -4161,7 +3514,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13073,16 +12929,16 @@
+@@ -13162,16 +13017,16 @@
# Intel C++
with_gnu_ld=yes
archive_cmds_need_lc_CXX=no
@@ -4182,7 +3535,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13120,7 +12976,7 @@
+@@ -13209,7 +13064,7 @@
;;
esac
;;
@@ -4191,7 +3544,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -13139,7 +12995,7 @@
+@@ -13228,7 +13083,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.
@@ -4200,7 +3553,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13156,7 +13012,7 @@
+@@ -13245,7 +13100,7 @@
;;
cxx)
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -4209,7 +3562,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13174,7 +13030,7 @@
+@@ -13263,7 +13118,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -4218,7 +3571,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13199,7 +13055,7 @@
+@@ -13288,7 +13143,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.
@@ -4227,7 +3580,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13215,10 +13071,10 @@
+@@ -13304,10 +13159,10 @@
;;
cxx)
allow_undefined_flag_CXX=' -expect_unresolved \*'
@@ -4240,7 +3593,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13237,7 +13093,7 @@
+@@ -13326,7 +13181,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -4249,7 +3602,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13294,9 +13150,9 @@
+@@ -13383,9 +13238,9 @@
CC)
# Sun C++ 4.2, 5.x and Centerline C++
no_undefined_flag_CXX=' -zdefs'
@@ -4261,7 +3614,7 @@
hardcode_libdir_flag_spec_CXX='-R$libdir'
hardcode_shlibpath_var_CXX=no
-@@ -13330,7 +13186,7 @@
+@@ -13419,7 +13274,7 @@
;;
gcx)
# Green Hills C++ Compiler
@@ -4270,7 +3623,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13340,9 +13196,9 @@
+@@ -13429,9 +13284,9 @@
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -4282,7 +3635,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13351,9 +13207,9 @@
+@@ -13440,9 +13295,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -4294,7 +3647,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13468,7 +13324,7 @@
+@@ -13557,7 +13412,7 @@
fi
;;
@@ -4303,7 +3656,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13603,7 +13459,7 @@
+@@ -13692,7 +13547,7 @@
;;
esac
;;
@@ -4312,7 +3665,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -13679,7 +13535,7 @@
+@@ -13768,7 +13623,7 @@
;;
esac
;;
@@ -4321,21 +3674,21 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -13790,11 +13646,11 @@
+@@ -13879,11 +13734,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13793: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13649: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13882: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13737: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:13797: \$? = $ac_status" >&5
-+ echo "$as_me:13653: \$? = $ac_status" >&5
+- echo "$as_me:13886: \$? = $ac_status" >&5
++ echo "$as_me:13741: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -13841,13 +13697,6 @@
+@@ -13930,13 +13785,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -4349,21 +3702,21 @@
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.
-@@ -13857,11 +13706,11 @@
+@@ -13946,11 +13794,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13860: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13709: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13949: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13797: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:13864: \$? = $ac_status" >&5
-+ echo "$as_me:13713: \$? = $ac_status" >&5
+- echo "$as_me:13953: \$? = $ac_status" >&5
++ echo "$as_me:13801: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -13871,8 +13720,11 @@
+@@ -13960,8 +13808,11 @@
fi
fi
chmod u+w .
@@ -4377,7 +3730,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -13924,6 +13776,9 @@
+@@ -14013,6 +13864,9 @@
cygwin* | mingw*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -4387,7 +3740,7 @@
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -14005,7 +13860,7 @@
+@@ -14094,7 +13948,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -4396,7 +3749,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14015,7 +13870,20 @@
+@@ -14104,7 +13958,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -4418,7 +3771,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14080,7 +13948,7 @@
+@@ -14169,7 +14036,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -4427,7 +3780,7 @@
;;
beos*)
-@@ -14105,7 +13973,7 @@
+@@ -14194,7 +14061,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -4436,7 +3789,7 @@
need_version=no
need_lib_prefix=no
-@@ -14170,7 +14038,7 @@
+@@ -14259,7 +14126,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -4445,7 +3798,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"`
-@@ -14193,7 +14061,7 @@
+@@ -14282,7 +14149,7 @@
dynamic_linker=no
;;
@@ -4454,7 +3807,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14253,7 +14121,7 @@
+@@ -14342,7 +14209,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -4463,7 +3816,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14268,7 +14136,7 @@
+@@ -14357,7 +14224,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -4472,7 +3825,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14279,7 +14147,7 @@
+@@ -14368,7 +14235,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -4481,7 +3834,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14341,22 +14209,19 @@
+@@ -14430,22 +14297,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'
@@ -4510,7 +3863,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,
-@@ -14366,6 +14231,30 @@
+@@ -14455,6 +14319,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -4541,7 +3894,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14375,7 +14264,7 @@
+@@ -14464,7 +14352,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -4550,7 +3903,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14404,7 +14293,7 @@
+@@ -14493,7 +14381,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -4559,7 +3912,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
-@@ -14424,7 +14313,7 @@
+@@ -14513,7 +14401,7 @@
os2*)
libname_spec='$name'
@@ -4568,7 +3921,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14653,8 +14542,7 @@
+@@ -14742,8 +14630,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4578,7 +3931,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14757,8 +14645,7 @@
+@@ -14846,8 +14733,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4588,7 +3941,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14823,8 +14710,7 @@
+@@ -14912,8 +14798,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4598,7 +3951,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14917,8 +14803,7 @@
+@@ -15006,8 +14891,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4608,7 +3961,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14983,8 +14868,7 @@
+@@ -15072,8 +14956,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4618,7 +3971,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15050,8 +14934,7 @@
+@@ -15139,8 +15022,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4628,7 +3981,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15117,8 +15000,7 @@
+@@ -15206,8 +15088,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4638,25 +3991,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15193,7 +15075,7 @@
+@@ -15282,7 +15163,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 15196 "configure"
-+#line 15078 "configure"
+-#line 15285 "configure"
++#line 15166 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15291,7 +15173,7 @@
+@@ -15380,7 +15261,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 15294 "configure"
-+#line 15176 "configure"
+-#line 15383 "configure"
++#line 15264 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15408,7 +15290,8 @@
+@@ -15497,7 +15378,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -4666,7 +4019,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 \
-@@ -15538,7 +15421,7 @@
+@@ -15627,7 +15509,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -4675,7 +4028,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -15569,7 +15452,7 @@
+@@ -15658,7 +15540,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -4684,7 +4037,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -15786,7 +15669,10 @@
+@@ -15875,7 +15757,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.
@@ -4696,7 +4049,7 @@
fi
-@@ -15888,7 +15774,7 @@
+@@ -15977,7 +15862,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -4705,21 +4058,21 @@
test "$enable_shared" = yes && enable_static=no
;;
esac
-@@ -16114,11 +16000,11 @@
+@@ -16203,11 +16088,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16117: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16003: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16206: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16091: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:16121: \$? = $ac_status" >&5
-+ echo "$as_me:16007: \$? = $ac_status" >&5
+- echo "$as_me:16210: \$? = $ac_status" >&5
++ echo "$as_me:16095: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -16165,13 +16051,6 @@
+@@ -16254,13 +16139,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -4733,21 +4086,21 @@
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.
-@@ -16181,11 +16060,11 @@
+@@ -16270,11 +16148,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16184: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16063: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16273: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16151: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:16188: \$? = $ac_status" >&5
-+ echo "$as_me:16067: \$? = $ac_status" >&5
+- echo "$as_me:16277: \$? = $ac_status" >&5
++ echo "$as_me:16155: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -16195,8 +16074,11 @@
+@@ -16284,8 +16162,11 @@
fi
fi
chmod u+w .
@@ -4761,7 +4114,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -16324,7 +16206,7 @@
+@@ -16413,7 +16294,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -4770,7 +4123,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16334,13 +16216,13 @@
+@@ -16423,13 +16304,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_F77='-L$libdir'
@@ -4786,7 +4139,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -16349,19 +16231,19 @@
+@@ -16438,19 +16319,19 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -4810,7 +4163,7 @@
fi
;;
-@@ -16379,8 +16261,8 @@
+@@ -16468,8 +16349,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -4821,7 +4174,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16393,10 +16275,36 @@
+@@ -16482,10 +16363,36 @@
hardcode_shlibpath_var_F77=no
;;
@@ -4860,7 +4213,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16446,9 +16354,20 @@
+@@ -16535,9 +16442,20 @@
else
export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -4883,7 +4236,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16494,21 +16413,22 @@
+@@ -16583,21 +16501,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -4911,7 +4264,7 @@
program main
end
-@@ -16522,8 +16442,7 @@
+@@ -16611,8 +16530,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4921,7 +4274,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16550,14 +16469,13 @@
+@@ -16639,14 +16557,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -4939,7 +4292,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16574,8 +16492,7 @@
+@@ -16663,8 +16580,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4949,7 +4302,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16613,7 +16530,7 @@
+@@ -16702,7 +16618,7 @@
whole_archive_flag_spec_F77=' '
archive_cmds_need_lc_F77=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -4958,7 +4311,7 @@
fi
fi
;;
-@@ -16636,13 +16553,13 @@
+@@ -16725,13 +16641,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -4975,7 +4328,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds_F77='true'
# FIXME: Should let the user specify the lib program.
-@@ -16656,21 +16573,21 @@
+@@ -16745,21 +16661,21 @@
archive_cmds_need_lc_F77=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -5010,7 +4363,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -16679,18 +16596,18 @@
+@@ -16768,18 +16684,18 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -5035,7 +4388,7 @@
hardcode_direct_F77=no
hardcode_automatic_F77=yes
hardcode_shlibpath_var_F77=unsupported
-@@ -16731,8 +16648,8 @@
+@@ -16820,8 +16736,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -5046,7 +4399,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -16740,7 +16657,7 @@
+@@ -16829,7 +16745,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -5055,7 +4408,7 @@
else
archive_cmds_F77='$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
-@@ -16758,10 +16675,10 @@
+@@ -16847,10 +16763,10 @@
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case "$host_cpu" in
hppa*64*|ia64*)
@@ -5068,7 +4421,7 @@
;;
esac
else
-@@ -16808,7 +16725,7 @@
+@@ -16897,7 +16813,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -5077,7 +4430,7 @@
else
archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
-@@ -16818,7 +16735,7 @@
+@@ -16907,7 +16823,7 @@
link_all_deplibs_F77=yes
;;
@@ -5086,7 +4439,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -16841,7 +16758,7 @@
+@@ -16930,7 +16846,7 @@
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -5095,7 +4448,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -16851,7 +16768,7 @@
+@@ -16940,7 +16856,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -5104,7 +4457,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -16862,14 +16779,14 @@
+@@ -16951,14 +16867,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -5121,7 +4474,7 @@
else
allow_undefined_flag_F77=' -expect_unresolved \*'
archive_cmds_F77='$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'
-@@ -16881,7 +16798,7 @@
+@@ -16970,7 +16886,7 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -5130,7 +4483,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag_F77=' -expect_unresolved \*'
-@@ -16906,9 +16823,9 @@
+@@ -16995,9 +16911,9 @@
solaris*)
no_undefined_flag_F77=' -z text'
if test "$GCC" = yes; then
@@ -5142,7 +4495,7 @@
else
archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -16928,7 +16845,7 @@
+@@ -17017,7 +16933,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.
@@ -5151,7 +4504,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -16988,9 +16905,9 @@
+@@ -17077,9 +16993,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_F77='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -5163,7 +4516,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_F77=no
-@@ -17096,7 +17013,7 @@
+@@ -17185,7 +17101,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -5172,7 +4525,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17106,7 +17023,20 @@
+@@ -17195,7 +17111,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -5194,7 +4547,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17171,7 +17101,7 @@
+@@ -17260,7 +17189,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -5203,7 +4556,7 @@
;;
beos*)
-@@ -17196,7 +17126,7 @@
+@@ -17285,7 +17214,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -5212,7 +4565,7 @@
need_version=no
need_lib_prefix=no
-@@ -17261,7 +17191,7 @@
+@@ -17350,7 +17279,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -5221,7 +4574,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"`
-@@ -17284,7 +17214,7 @@
+@@ -17373,7 +17302,7 @@
dynamic_linker=no
;;
@@ -5230,7 +4583,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17344,7 +17274,7 @@
+@@ -17433,7 +17362,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -5239,7 +4592,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17359,7 +17289,7 @@
+@@ -17448,7 +17377,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -5248,7 +4601,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17370,7 +17300,7 @@
+@@ -17459,7 +17388,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -5257,7 +4610,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17432,22 +17362,19 @@
+@@ -17521,22 +17450,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'
@@ -5286,7 +4639,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,
-@@ -17457,6 +17384,30 @@
+@@ -17546,6 +17472,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -5317,7 +4670,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17466,7 +17417,7 @@
+@@ -17555,7 +17505,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -5326,7 +4679,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17495,7 +17446,7 @@
+@@ -17584,7 +17534,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -5335,7 +4688,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
-@@ -17515,7 +17466,7 @@
+@@ -17604,7 +17554,7 @@
os2*)
libname_spec='$name'
@@ -5344,7 +4697,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17694,7 +17645,8 @@
+@@ -17783,7 +17733,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -5354,7 +4707,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 \
-@@ -17824,7 +17776,7 @@
+@@ -17913,7 +17864,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -5363,7 +4716,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -17855,7 +17807,7 @@
+@@ -17944,7 +17895,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -5372,7 +4725,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -18072,7 +18024,10 @@
+@@ -18161,7 +18112,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.
@@ -5384,35 +4737,35 @@
fi
-@@ -18154,11 +18109,11 @@
+@@ -18243,11 +18197,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18157: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18112: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18246: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18200: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18161: \$? = $ac_status" >&5
-+ echo "$as_me:18116: \$? = $ac_status" >&5
+- echo "$as_me:18250: \$? = $ac_status" >&5
++ echo "$as_me:18204: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -18387,11 +18342,11 @@
+@@ -18476,11 +18430,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18390: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18345: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18479: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18433: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18394: \$? = $ac_status" >&5
-+ echo "$as_me:18349: \$? = $ac_status" >&5
+- echo "$as_me:18483: \$? = $ac_status" >&5
++ echo "$as_me:18437: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -18438,13 +18393,6 @@
+@@ -18527,13 +18481,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -5426,21 +4779,21 @@
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.
-@@ -18454,11 +18402,11 @@
+@@ -18543,11 +18490,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18457: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18405: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18546: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18493: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:18461: \$? = $ac_status" >&5
-+ echo "$as_me:18409: \$? = $ac_status" >&5
+- echo "$as_me:18550: \$? = $ac_status" >&5
++ echo "$as_me:18497: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -18468,8 +18416,11 @@
+@@ -18557,8 +18504,11 @@
fi
fi
chmod u+w .
@@ -5454,7 +4807,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -18597,7 +18548,7 @@
+@@ -18686,7 +18636,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -5463,7 +4816,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18607,13 +18558,13 @@
+@@ -18696,13 +18646,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_GCJ='-L$libdir'
@@ -5479,7 +4832,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -18622,19 +18573,19 @@
+@@ -18711,19 +18661,19 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -5503,7 +4856,7 @@
fi
;;
-@@ -18652,8 +18603,8 @@
+@@ -18741,8 +18691,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -5514,7 +4867,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18666,10 +18617,36 @@
+@@ -18755,10 +18705,36 @@
hardcode_shlibpath_var_GCJ=no
;;
@@ -5553,7 +4906,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18719,9 +18696,20 @@
+@@ -18808,9 +18784,20 @@
else
export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -5576,7 +4929,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -18767,21 +18755,22 @@
+@@ -18856,21 +18843,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -5604,7 +4957,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -18805,8 +18794,7 @@
+@@ -18894,8 +18882,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5614,7 +4967,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -18833,14 +18821,13 @@
+@@ -18922,14 +18909,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -5632,7 +4985,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -18867,8 +18854,7 @@
+@@ -18956,8 +18942,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5642,7 +4995,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -18906,7 +18892,7 @@
+@@ -18995,7 +18980,7 @@
whole_archive_flag_spec_GCJ=' '
archive_cmds_need_lc_GCJ=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -5651,7 +5004,7 @@
fi
fi
;;
-@@ -18929,13 +18915,13 @@
+@@ -19018,13 +19003,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -5668,7 +5021,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds_GCJ='true'
# FIXME: Should let the user specify the lib program.
-@@ -18949,21 +18935,21 @@
+@@ -19038,21 +19023,21 @@
archive_cmds_need_lc_GCJ=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -5703,7 +5056,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -18972,18 +18958,18 @@
+@@ -19061,18 +19046,18 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -5728,7 +5081,7 @@
hardcode_direct_GCJ=no
hardcode_automatic_GCJ=yes
hardcode_shlibpath_var_GCJ=unsupported
-@@ -19024,8 +19010,8 @@
+@@ -19113,8 +19098,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -5739,7 +5092,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -19033,7 +19019,7 @@
+@@ -19122,7 +19107,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -5748,7 +5101,7 @@
else
archive_cmds_GCJ='$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
-@@ -19051,10 +19037,10 @@
+@@ -19140,10 +19125,10 @@
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case "$host_cpu" in
hppa*64*|ia64*)
@@ -5761,7 +5114,7 @@
;;
esac
else
-@@ -19101,7 +19087,7 @@
+@@ -19190,7 +19175,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -5770,7 +5123,7 @@
else
archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
-@@ -19111,7 +19097,7 @@
+@@ -19200,7 +19185,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -5779,7 +5132,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -19134,7 +19120,7 @@
+@@ -19223,7 +19208,7 @@
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -5788,7 +5141,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19144,7 +19130,7 @@
+@@ -19233,7 +19218,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -5797,7 +5150,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19155,14 +19141,14 @@
+@@ -19244,14 +19229,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -5814,7 +5167,7 @@
else
allow_undefined_flag_GCJ=' -expect_unresolved \*'
archive_cmds_GCJ='$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'
-@@ -19174,7 +19160,7 @@
+@@ -19263,7 +19248,7 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -5823,7 +5176,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag_GCJ=' -expect_unresolved \*'
-@@ -19199,9 +19185,9 @@
+@@ -19288,9 +19273,9 @@
solaris*)
no_undefined_flag_GCJ=' -z text'
if test "$GCC" = yes; then
@@ -5835,7 +5188,7 @@
else
archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -19221,7 +19207,7 @@
+@@ -19310,7 +19295,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.
@@ -5844,7 +5197,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19281,9 +19267,9 @@
+@@ -19370,9 +19355,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_GCJ='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -5856,7 +5209,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_GCJ=no
-@@ -19389,7 +19375,7 @@
+@@ -19478,7 +19463,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -5865,7 +5218,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19399,7 +19385,20 @@
+@@ -19488,7 +19473,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -5887,7 +5240,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19464,7 +19463,7 @@
+@@ -19553,7 +19551,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -5896,7 +5249,7 @@
;;
beos*)
-@@ -19489,7 +19488,7 @@
+@@ -19578,7 +19576,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -5905,7 +5258,7 @@
need_version=no
need_lib_prefix=no
-@@ -19554,7 +19553,7 @@
+@@ -19643,7 +19641,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -5914,7 +5267,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"`
-@@ -19577,7 +19576,7 @@
+@@ -19666,7 +19664,7 @@
dynamic_linker=no
;;
@@ -5923,7 +5276,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19637,7 +19636,7 @@
+@@ -19726,7 +19724,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -5932,7 +5285,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -19652,7 +19651,7 @@
+@@ -19741,7 +19739,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -5941,7 +5294,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19663,7 +19662,7 @@
+@@ -19752,7 +19750,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -5950,7 +5303,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19725,22 +19724,19 @@
+@@ -19814,22 +19812,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'
@@ -5979,7 +5332,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,
-@@ -19750,6 +19746,30 @@
+@@ -19839,6 +19834,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -6010,7 +5363,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -19759,7 +19779,7 @@
+@@ -19848,7 +19867,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -6019,7 +5372,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -19788,7 +19808,7 @@
+@@ -19877,7 +19896,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -6028,7 +5381,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
-@@ -19808,7 +19828,7 @@
+@@ -19897,7 +19916,7 @@
os2*)
libname_spec='$name'
@@ -6037,7 +5390,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -20037,8 +20057,7 @@
+@@ -20126,8 +20145,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6047,7 +5400,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20141,8 +20160,7 @@
+@@ -20230,8 +20248,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6057,7 +5410,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20207,8 +20225,7 @@
+@@ -20296,8 +20313,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6067,7 +5420,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20301,8 +20318,7 @@
+@@ -20390,8 +20406,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6077,7 +5430,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20367,8 +20383,7 @@
+@@ -20456,8 +20471,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6087,7 +5440,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20434,8 +20449,7 @@
+@@ -20523,8 +20537,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6097,7 +5450,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20501,8 +20515,7 @@
+@@ -20590,8 +20603,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6107,25 +5460,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20577,7 +20590,7 @@
+@@ -20666,7 +20678,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 20580 "configure"
-+#line 20593 "configure"
+-#line 20669 "configure"
++#line 20681 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20675,7 +20688,7 @@
+@@ -20764,7 +20776,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 20678 "configure"
-+#line 20691 "configure"
+-#line 20767 "configure"
++#line 20779 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20792,7 +20805,8 @@
+@@ -20881,7 +20893,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -6135,7 +5488,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 \
-@@ -20922,7 +20936,7 @@
+@@ -21011,7 +21024,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -6144,7 +5497,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -20953,7 +20967,7 @@
+@@ -21042,7 +21055,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -6153,7 +5506,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21170,7 +21184,10 @@
+@@ -21259,7 +21272,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.
@@ -6165,7 +5518,7 @@
fi
-@@ -21233,7 +21250,8 @@
+@@ -21322,7 +21338,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -6175,7 +5528,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 \
-@@ -21363,7 +21381,7 @@
+@@ -21452,7 +21469,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -6184,7 +5537,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21394,7 +21412,7 @@
+@@ -21483,7 +21500,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -6193,7 +5546,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21611,7 +21629,10 @@
+@@ -21700,7 +21717,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.
@@ -6205,7 +5558,7 @@
fi
-@@ -21658,7 +21679,7 @@
+@@ -21747,7 +21767,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -6214,7 +5567,7 @@
# Prevent multiple expansion
-@@ -21895,8 +21916,7 @@
+@@ -21984,8 +22004,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6224,7 +5577,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -21970,9 +21990,6 @@
+@@ -22059,9 +22078,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -6234,7 +5587,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22006,8 +22023,7 @@
+@@ -22095,8 +22111,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6244,7 +5597,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22111,8 +22127,7 @@
+@@ -22200,8 +22215,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6254,7 +5607,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22191,9 +22206,6 @@
+@@ -22280,9 +22294,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -6264,7 +5617,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22226,8 +22238,7 @@
+@@ -22315,8 +22326,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6274,7 +5627,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22330,8 +22341,7 @@
+@@ -22419,8 +22429,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6284,7 +5637,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22421,8 +22431,7 @@
+@@ -22510,8 +22519,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6294,7 +5647,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22483,8 +22492,7 @@
+@@ -22572,8 +22580,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6304,7 +5657,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22552,8 +22560,7 @@
+@@ -22641,8 +22648,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6314,7 +5667,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22619,8 +22626,7 @@
+@@ -22708,8 +22714,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6324,7 +5677,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22713,8 +22719,7 @@
+@@ -22802,8 +22807,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6334,7 +5687,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22792,8 +22797,7 @@
+@@ -22881,8 +22885,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6344,7 +5697,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22877,8 +22881,7 @@
+@@ -22966,8 +22969,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6354,7 +5707,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22946,8 +22949,7 @@
+@@ -23035,8 +23037,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6364,7 +5717,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23042,8 +23044,7 @@
+@@ -23131,8 +23132,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6374,7 +5727,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23107,8 +23108,7 @@
+@@ -23196,8 +23196,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6384,7 +5737,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23203,8 +23203,7 @@
+@@ -23292,8 +23291,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6394,7 +5747,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23268,8 +23267,7 @@
+@@ -23357,8 +23355,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6404,7 +5757,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23365,8 +23363,7 @@
+@@ -23454,8 +23451,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6414,7 +5767,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23430,8 +23427,7 @@
+@@ -23519,8 +23515,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6424,7 +5777,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23528,8 +23524,7 @@
+@@ -23617,8 +23612,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6434,7 +5787,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23594,8 +23589,7 @@
+@@ -23683,8 +23677,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6444,7 +5797,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23663,8 +23657,7 @@
+@@ -23752,8 +23745,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6454,7 +5807,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23815,8 +23808,7 @@
+@@ -23904,8 +23896,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6464,7 +5817,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23971,8 +23963,7 @@
+@@ -24060,8 +24051,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6474,7 +5827,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24037,8 +24028,7 @@
+@@ -24126,8 +24116,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6484,7 +5837,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24185,8 +24175,7 @@
+@@ -24274,8 +24263,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6494,7 +5847,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24341,8 +24330,7 @@
+@@ -24430,8 +24418,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6504,7 +5857,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24398,9 +24386,6 @@
+@@ -24487,9 +24474,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -6514,7 +5867,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24434,8 +24419,7 @@
+@@ -24523,8 +24507,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6524,7 +5877,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24539,8 +24523,7 @@
+@@ -24628,8 +24611,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6534,7 +5887,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24640,8 +24623,7 @@
+@@ -24729,8 +24711,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6544,7 +5897,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24715,8 +24697,7 @@
+@@ -24804,8 +24785,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6554,7 +5907,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24779,8 +24760,7 @@
+@@ -24868,8 +24848,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6564,7 +5917,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24842,8 +24822,7 @@
+@@ -24931,8 +24910,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6574,7 +5927,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24883,8 +24862,7 @@
+@@ -24972,8 +24950,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6584,7 +5937,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24940,8 +24918,7 @@
+@@ -25029,8 +25006,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6594,7 +5947,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24981,8 +24958,7 @@
+@@ -25070,8 +25046,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6604,7 +5957,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25046,8 +25022,7 @@
+@@ -25135,8 +25110,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6614,7 +5967,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25078,10 +25053,8 @@
+@@ -25167,10 +25141,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -6627,7 +5980,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -25192,8 +25165,7 @@
+@@ -25281,8 +25253,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6637,7 +5990,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25255,8 +25227,7 @@
+@@ -25344,8 +25315,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6647,7 +6000,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25296,8 +25267,7 @@
+@@ -25385,8 +25355,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6657,7 +6010,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25353,8 +25323,7 @@
+@@ -25442,8 +25411,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6667,7 +6020,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25394,8 +25363,7 @@
+@@ -25483,8 +25451,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6677,7 +6030,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25459,8 +25427,7 @@
+@@ -25548,8 +25515,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6687,7 +6040,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25491,10 +25458,8 @@
+@@ -25580,10 +25546,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -6700,7 +6053,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -25605,8 +25570,7 @@
+@@ -25694,8 +25658,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6710,7 +6063,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25668,8 +25632,7 @@
+@@ -25757,8 +25720,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6720,7 +6073,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25709,8 +25672,7 @@
+@@ -25798,8 +25760,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6730,7 +6083,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25766,8 +25728,7 @@
+@@ -25855,8 +25816,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6740,7 +6093,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25807,8 +25768,7 @@
+@@ -25896,8 +25856,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6750,7 +6103,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25872,8 +25832,7 @@
+@@ -25961,8 +25920,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6760,7 +6113,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25904,10 +25863,8 @@
+@@ -25993,10 +25951,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -6773,7 +6126,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -26018,8 +25975,7 @@
+@@ -26107,8 +26063,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6783,7 +6136,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26081,8 +26037,7 @@
+@@ -26170,8 +26125,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6793,7 +6146,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26122,8 +26077,7 @@
+@@ -26211,8 +26165,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6803,7 +6156,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26179,8 +26133,7 @@
+@@ -26268,8 +26221,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6813,7 +6166,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26220,8 +26173,7 @@
+@@ -26309,8 +26261,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6823,7 +6176,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26285,8 +26237,7 @@
+@@ -26374,8 +26325,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6833,7 +6186,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26317,10 +26268,8 @@
+@@ -26406,10 +26356,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -6846,7 +6199,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -26439,8 +26388,7 @@
+@@ -26528,8 +26476,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6856,7 +6209,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26511,8 +26459,7 @@
+@@ -26600,8 +26547,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6866,7 +6219,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26582,8 +26529,7 @@
+@@ -26671,8 +26617,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6876,7 +6229,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26645,8 +26591,7 @@
+@@ -26734,8 +26679,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6886,7 +6239,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26686,8 +26631,7 @@
+@@ -26775,8 +26719,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6896,7 +6249,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26743,8 +26687,7 @@
+@@ -26832,8 +26775,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6906,7 +6259,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26784,8 +26727,7 @@
+@@ -26873,8 +26815,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6916,7 +6269,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26849,8 +26791,7 @@
+@@ -26938,8 +26879,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6926,7 +6279,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26881,10 +26822,8 @@
+@@ -26970,10 +26910,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -6939,7 +6292,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -26996,8 +26935,7 @@
+@@ -27085,8 +27023,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6949,7 +6302,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27059,8 +26997,7 @@
+@@ -27148,8 +27085,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6959,7 +6312,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27100,8 +27037,7 @@
+@@ -27189,8 +27125,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6969,7 +6322,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27157,8 +27093,7 @@
+@@ -27246,8 +27181,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6979,7 +6332,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27198,8 +27133,7 @@
+@@ -27287,8 +27221,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6989,7 +6342,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27263,8 +27197,7 @@
+@@ -27352,8 +27285,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6999,7 +6352,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27295,10 +27228,8 @@
+@@ -27384,10 +27316,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -7012,7 +6365,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -27409,8 +27340,7 @@
+@@ -27498,8 +27428,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7022,7 +6375,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27480,8 +27410,7 @@
+@@ -27569,8 +27498,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7032,7 +6385,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27661,8 +27590,7 @@
+@@ -27750,8 +27678,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7042,7 +6395,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27771,8 +27699,7 @@
+@@ -27860,8 +27787,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7052,7 +6405,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27996,8 +27923,7 @@
+@@ -28085,8 +28011,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7062,7 +6415,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28220,8 +28146,7 @@
+@@ -28309,8 +28234,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7072,7 +6425,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28297,8 +28222,7 @@
+@@ -28386,8 +28310,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7082,7 +6435,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28521,8 +28445,7 @@
+@@ -28610,8 +28533,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7092,7 +6445,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28597,8 +28520,7 @@
+@@ -28686,8 +28608,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7102,7 +6455,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28658,8 +28580,7 @@
+@@ -28747,8 +28668,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7112,7 +6465,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28742,8 +28663,7 @@
+@@ -28831,8 +28751,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7122,7 +6475,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28836,8 +28756,7 @@
+@@ -28925,8 +28844,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7132,7 +6485,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29011,8 +28930,7 @@
+@@ -29100,8 +29018,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7142,7 +6495,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29110,8 +29028,7 @@
+@@ -29199,8 +29116,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7152,7 +6505,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29204,8 +29121,7 @@
+@@ -29293,8 +29209,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7162,7 +6515,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29288,8 +29204,7 @@
+@@ -29377,8 +29292,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7172,25 +6525,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29342,7 +29257,7 @@
+@@ -29431,7 +29345,7 @@
do
for j in jpeglib.h;
do
-- echo "configure: 29345: $i/$j" >&5
-+ echo "configure: 29260: $i/$j" >&5
+- echo "configure: 29434: $i/$j" >&5
++ echo "configure: 29348: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -29650,7 +29565,7 @@
+@@ -29739,7 +29653,7 @@
do
for j in $kde_qt_header;
do
-- echo "configure: 29653: $i/$j" >&5
-+ echo "configure: 29568: $i/$j" >&5
+- echo "configure: 29742: $i/$j" >&5
++ echo "configure: 29656: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -30327,8 +30242,7 @@
+@@ -30416,8 +30330,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7200,43 +6553,43 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30487,7 +30401,7 @@
+@@ -30576,7 +30489,7 @@
do
for j in $kde_check_header;
do
-- echo "configure: 30490: $i/$j" >&5
-+ echo "configure: 30404: $i/$j" >&5
+- echo "configure: 30579: $i/$j" >&5
++ echo "configure: 30492: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -30517,7 +30431,7 @@
+@@ -30606,7 +30519,7 @@
do
for j in $kde_check_lib;
do
-- echo "configure: 30520: $i/$j" >&5
-+ echo "configure: 30434: $i/$j" >&5
+- echo "configure: 30609: $i/$j" >&5
++ echo "configure: 30522: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -30535,7 +30449,7 @@
+@@ -30624,7 +30537,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
-- echo "configure: 30538: $i/$j" >&5
-+ echo "configure: 30452: $i/$j" >&5
+- echo "configure: 30627: $i/$j" >&5
++ echo "configure: 30540: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -32037,7 +31951,7 @@
+@@ -32142,7 +32055,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
-- echo "configure: 32040: $i/$j" >&5
-+ echo "configure: 31954: $i/$j" >&5
+- echo "configure: 32145: $i/$j" >&5
++ echo "configure: 32058: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -32234,8 +32148,7 @@
+@@ -32339,8 +32252,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7246,7 +6599,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32322,8 +32235,7 @@
+@@ -32427,8 +32339,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7256,7 +6609,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32410,8 +32322,7 @@
+@@ -32515,8 +32426,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7266,7 +6619,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32498,8 +32409,7 @@
+@@ -32603,8 +32513,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7276,17 +6629,27 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32618,8 +32528,7 @@
+@@ -32697,8 +32606,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -32823,8 +32731,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32676,8 +32585,7 @@
+@@ -32881,8 +32788,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7296,7 +6659,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32816,8 +32724,7 @@
+@@ -33021,8 +32927,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7306,7 +6669,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33057,8 +32964,7 @@
+@@ -33262,8 +33167,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7316,7 +6679,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33126,8 +33032,7 @@
+@@ -33331,8 +33235,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7326,7 +6689,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33222,8 +33127,7 @@
+@@ -33427,8 +33330,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7336,7 +6699,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33466,8 +33370,7 @@
+@@ -33671,8 +33573,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7346,7 +6709,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33539,8 +33442,7 @@
+@@ -33744,8 +33645,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7356,7 +6719,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33594,8 +33496,7 @@
+@@ -33799,8 +33699,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7366,7 +6729,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33666,8 +33567,7 @@
+@@ -33871,8 +33770,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7376,7 +6739,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33721,8 +33621,7 @@
+@@ -33926,8 +33824,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7386,7 +6749,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33789,8 +33688,7 @@
+@@ -33994,8 +33891,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7396,7 +6759,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33996,8 +33894,7 @@
+@@ -34201,8 +34097,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7406,7 +6769,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34142,8 +34039,7 @@
+@@ -34347,8 +34242,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7416,7 +6779,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34316,8 +34212,7 @@
+@@ -34521,8 +34415,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7426,7 +6789,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34376,8 +34271,7 @@
+@@ -34581,8 +34474,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7436,7 +6799,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34472,8 +34366,7 @@
+@@ -34677,8 +34569,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7446,7 +6809,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34539,8 +34432,7 @@
+@@ -34744,8 +34635,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7456,7 +6819,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34605,8 +34497,7 @@
+@@ -34810,8 +34700,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7466,7 +6829,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34669,8 +34560,7 @@
+@@ -34874,8 +34763,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7476,7 +6839,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34731,8 +34621,7 @@
+@@ -34936,8 +34824,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7486,7 +6849,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34802,8 +34691,7 @@
+@@ -35007,8 +34894,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7496,7 +6859,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34869,8 +34757,7 @@
+@@ -35074,8 +34960,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7506,7 +6869,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34936,8 +34823,7 @@
+@@ -35141,8 +35026,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7516,7 +6879,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35022,8 +34908,7 @@
+@@ -35227,8 +35111,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7526,7 +6889,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35128,8 +35013,7 @@
+@@ -35333,8 +35216,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7536,7 +6899,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35194,8 +35078,7 @@
+@@ -35399,8 +35281,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7546,7 +6909,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35270,8 +35153,7 @@
+@@ -35475,8 +35356,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7556,7 +6919,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35350,8 +35232,7 @@
+@@ -35555,8 +35435,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7566,7 +6929,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35540,8 +35421,7 @@
+@@ -35745,8 +35624,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7576,7 +6939,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35603,8 +35483,7 @@
+@@ -35808,8 +35686,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7586,7 +6949,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35644,8 +35523,7 @@
+@@ -35849,8 +35726,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7596,7 +6959,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35701,8 +35579,7 @@
+@@ -35906,8 +35782,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7606,7 +6969,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35742,8 +35619,7 @@
+@@ -35947,8 +35822,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7616,7 +6979,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35807,8 +35683,7 @@
+@@ -36012,8 +35886,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7626,7 +6989,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35839,10 +35714,8 @@
+@@ -36044,10 +35917,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -7639,7 +7002,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -35954,8 +35827,7 @@
+@@ -36159,8 +36030,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7649,7 +7012,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36017,8 +35889,7 @@
+@@ -36222,8 +36092,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7659,7 +7022,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36058,8 +35929,7 @@
+@@ -36263,8 +36132,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7669,7 +7032,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36115,8 +35985,7 @@
+@@ -36320,8 +36188,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7679,7 +7042,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36156,8 +36025,7 @@
+@@ -36361,8 +36228,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7689,7 +7052,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36221,8 +36089,7 @@
+@@ -36426,8 +36292,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7699,7 +7062,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36253,10 +36120,8 @@
+@@ -36458,10 +36323,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -7712,7 +7075,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -36368,8 +36233,7 @@
+@@ -36573,8 +36436,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7722,7 +7085,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36431,8 +36295,7 @@
+@@ -36636,8 +36498,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7732,7 +7095,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36472,8 +36335,7 @@
+@@ -36677,8 +36538,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7742,7 +7105,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36529,8 +36391,7 @@
+@@ -36734,8 +36594,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7752,7 +7115,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36570,8 +36431,7 @@
+@@ -36775,8 +36634,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7762,7 +7125,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36635,8 +36495,7 @@
+@@ -36840,8 +36698,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7772,7 +7135,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36667,10 +36526,8 @@
+@@ -36872,10 +36729,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -7785,7 +7148,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -36782,8 +36639,7 @@
+@@ -36987,8 +36842,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7795,7 +7158,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36845,8 +36701,7 @@
+@@ -37050,8 +36904,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7805,7 +7168,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36886,8 +36741,7 @@
+@@ -37091,8 +36944,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7815,7 +7178,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36943,8 +36797,7 @@
+@@ -37148,8 +37000,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7825,7 +7188,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36984,8 +36837,7 @@
+@@ -37189,8 +37040,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7835,7 +7198,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37049,8 +36901,7 @@
+@@ -37254,8 +37104,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7845,7 +7208,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37081,10 +36932,8 @@
+@@ -37286,10 +37135,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -7858,7 +7221,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -37199,8 +37048,7 @@
+@@ -37404,8 +37251,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7868,7 +7231,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37242,8 +37090,7 @@
+@@ -37447,8 +37293,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7878,7 +7241,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37300,8 +37147,7 @@
+@@ -37505,8 +37350,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7888,7 +7251,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37482,8 +37328,7 @@
+@@ -37687,8 +37531,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7898,7 +7261,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37537,9 +37382,6 @@
+@@ -37742,9 +37585,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7908,7 +7271,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37573,8 +37415,7 @@
+@@ -37778,8 +37618,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7918,7 +7281,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37678,8 +37519,7 @@
+@@ -37883,8 +37722,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7928,7 +7291,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37758,9 +37598,6 @@
+@@ -37963,9 +37801,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7938,7 +7301,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37791,8 +37628,7 @@
+@@ -37996,8 +37831,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7948,7 +7311,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37893,8 +37729,7 @@
+@@ -38098,8 +37932,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7958,7 +7321,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37973,9 +37808,6 @@
+@@ -38178,9 +38011,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7968,7 +7331,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38006,8 +37838,7 @@
+@@ -38211,8 +38041,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7978,7 +7341,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38108,8 +37939,7 @@
+@@ -38313,8 +38142,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7988,7 +7351,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38188,9 +38018,6 @@
+@@ -38393,9 +38221,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7998,7 +7361,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38226,8 +38053,7 @@
+@@ -38431,8 +38256,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8008,7 +7371,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38334,8 +38160,7 @@
+@@ -38539,8 +38363,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8018,7 +7381,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38414,9 +38239,6 @@
+@@ -38619,9 +38442,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -8028,7 +7391,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38451,8 +38273,7 @@
+@@ -38656,8 +38476,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8038,7 +7401,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38557,8 +38378,7 @@
+@@ -38762,8 +38581,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8048,7 +7411,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38637,9 +38457,6 @@
+@@ -38842,9 +38660,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -8058,7 +7421,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38672,8 +38489,7 @@
+@@ -38877,8 +38692,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8068,7 +7431,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38776,8 +38592,7 @@
+@@ -38981,8 +38795,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8078,7 +7441,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38856,9 +38671,6 @@
+@@ -39061,9 +38874,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -8088,7 +7451,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38891,8 +38703,7 @@
+@@ -39096,8 +38906,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8098,7 +7461,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38995,8 +38806,7 @@
+@@ -39200,8 +39009,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8108,7 +7471,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39074,9 +38884,6 @@
+@@ -39279,9 +39087,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -8118,7 +7481,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39109,8 +38916,7 @@
+@@ -39314,8 +39119,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8128,7 +7491,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39213,8 +39019,7 @@
+@@ -39418,8 +39222,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8138,7 +7501,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39308,8 +39113,7 @@
+@@ -39513,8 +39316,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8148,7 +7511,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39496,8 +39300,7 @@
+@@ -39701,8 +39503,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8158,7 +7521,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39567,8 +39370,7 @@
+@@ -39772,8 +39573,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8168,7 +7531,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39721,8 +39523,7 @@
+@@ -39926,8 +39726,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8178,7 +7541,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40256,8 +40057,7 @@
+@@ -40461,8 +40260,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8188,7 +7551,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40549,8 +40349,7 @@
+@@ -40754,8 +40552,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8198,7 +7561,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40695,8 +40494,7 @@
+@@ -40900,8 +40697,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8208,7 +7571,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40782,8 +40580,7 @@
+@@ -40987,8 +40783,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8218,7 +7581,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40845,8 +40642,7 @@
+@@ -41050,8 +40845,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8228,7 +7591,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40917,8 +40713,7 @@
+@@ -41122,8 +40916,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8238,7 +7601,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41008,8 +40803,7 @@
+@@ -41213,8 +41006,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8248,7 +7611,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41083,8 +40877,7 @@
+@@ -41288,8 +41080,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8258,7 +7621,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41194,8 +40987,7 @@
+@@ -41399,8 +41190,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8268,7 +7631,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41364,8 +41156,7 @@
+@@ -41569,8 +41359,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8278,16 +7641,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41427,7 +41218,7 @@
+@@ -41632,7 +41421,7 @@
do
for j in qsql.html;
do
-- echo "configure: 41430: $i/$j" >&5
-+ echo "configure: 41221: $i/$j" >&5
+- echo "configure: 41635: $i/$j" >&5
++ echo "configure: 41424: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
QTDOCDIR=$i
-@@ -41637,8 +41428,7 @@
+@@ -41842,8 +41631,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8297,7 +7660,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41731,8 +41521,7 @@
+@@ -41936,8 +41724,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8307,16 +7670,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41904,7 +41693,7 @@
+@@ -42109,7 +41896,7 @@
do
for j in openssl/ssl.h;
do
-- echo "configure: 41907: $i/$j" >&5
-+ echo "configure: 41696: $i/$j" >&5
+- echo "configure: 42112: $i/$j" >&5
++ echo "configure: 41899: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ssl_incdir=$i
-@@ -41959,8 +41748,7 @@
+@@ -42164,8 +41951,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8326,7 +7689,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42208,8 +41996,7 @@
+@@ -42413,8 +42199,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8336,7 +7699,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42263,8 +42050,7 @@
+@@ -42468,8 +42253,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8346,7 +7709,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42366,8 +42152,7 @@
+@@ -42571,8 +42355,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8356,7 +7719,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42432,8 +42217,7 @@
+@@ -42637,8 +42420,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8366,7 +7729,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42691,8 +42475,7 @@
+@@ -42896,8 +42678,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8376,7 +7739,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42757,8 +42540,7 @@
+@@ -42962,8 +42743,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8386,7 +7749,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42908,8 +42690,7 @@
+@@ -43113,8 +42893,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8396,7 +7759,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43062,8 +42843,7 @@
+@@ -43267,8 +43046,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8406,7 +7769,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43165,8 +42945,7 @@
+@@ -43370,8 +43148,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8416,7 +7779,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43284,8 +43063,7 @@
+@@ -43489,8 +43266,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8426,7 +7789,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43410,8 +43188,7 @@
+@@ -43615,8 +43391,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8436,7 +7799,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43798,8 +43575,7 @@
+@@ -44003,8 +43778,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8446,7 +7809,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43969,8 +43745,7 @@
+@@ -44174,8 +43948,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8456,7 +7819,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44022,13 +43797,13 @@
+@@ -44227,13 +44000,13 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -8474,7 +7837,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -44060,8 +43835,7 @@
+@@ -44265,8 +44038,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8484,7 +7847,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44073,20 +43847,20 @@
+@@ -44278,20 +44050,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -8510,7 +7873,7 @@
ac_font_enc_lib=1
else
ac_font_enc_lib=0
-@@ -44096,7 +43870,7 @@
+@@ -44301,7 +44073,7 @@
LIBS="$kde_save_LIBS"
if test "$ac_font_enc_lib" = "1"; then
@@ -8519,7 +7882,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_FONT_ENC 1
-@@ -44147,8 +43921,7 @@
+@@ -44352,8 +44124,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8529,7 +7892,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44378,8 +44151,7 @@
+@@ -44583,8 +44354,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8539,7 +7902,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44445,8 +44217,7 @@
+@@ -44650,8 +44420,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8549,7 +7912,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44492,8 +44263,7 @@
+@@ -44697,8 +44466,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8559,7 +7922,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44573,8 +44343,7 @@
+@@ -44778,8 +44546,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8569,7 +7932,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44664,8 +44433,7 @@
+@@ -44869,8 +44636,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8579,7 +7942,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44768,8 +44536,7 @@
+@@ -44973,8 +44739,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8589,7 +7952,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44966,8 +44733,7 @@
+@@ -45171,8 +44936,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8599,7 +7962,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45168,8 +44934,7 @@
+@@ -45373,8 +45137,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8609,7 +7972,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45247,8 +45012,7 @@
+@@ -45452,8 +45215,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8619,7 +7982,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45311,8 +45075,7 @@
+@@ -45516,8 +45278,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8629,7 +7992,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45396,8 +45159,7 @@
+@@ -45601,8 +45362,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8639,7 +8002,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45439,13 +45201,13 @@
+@@ -45644,13 +45404,13 @@
fi
@@ -8657,7 +8020,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -45477,8 +45239,7 @@
+@@ -45682,8 +45442,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8667,7 +8030,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45490,27 +45251,27 @@
+@@ -45695,27 +45454,27 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -8701,7 +8064,7 @@
fi
-@@ -45579,8 +45340,7 @@
+@@ -45784,8 +45543,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8711,7 +8074,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45605,13 +45365,13 @@
+@@ -45810,13 +45568,13 @@
echo "${ECHO_T}$ac_cv_header_X11_extensions_xf86misc_h" >&6
if test $ac_cv_header_X11_extensions_xf86misc_h = yes; then
@@ -8729,7 +8092,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -45643,8 +45403,7 @@
+@@ -45848,8 +45606,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8739,7 +8102,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45656,27 +45415,27 @@
+@@ -45861,27 +45618,27 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -8773,7 +8136,7 @@
fi
-@@ -45695,13 +45454,13 @@
+@@ -45900,13 +45657,13 @@
if test -n "$LIB_XF86MISC"; then
@@ -8791,7 +8154,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -45733,8 +45492,7 @@
+@@ -45938,8 +45695,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8801,7 +8164,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45746,20 +45504,20 @@
+@@ -45951,20 +45707,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -8827,7 +8190,7 @@
cat >>confdefs.h <<\_ACEOF
-@@ -45962,8 +45720,7 @@
+@@ -46167,8 +45923,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8837,25 +8200,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46102,7 +45859,7 @@
-
- echo "$as_me:$LINENO: checking X paths" >&5
- echo $ECHO_N "checking X paths... $ECHO_C" >&6
--imkv=7
-+imkv=8
- test "$kde_cv_defines_imake_version" = $imkv || unset kde_cv_defines_imake
- if test "${kde_cv_defines_imake+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -46118,7 +45875,7 @@
-
- EOF
- if $XMKMF >&5 2>&1 && test -f Makefile; then
-- kde_cv_defines_imake=`${MAKE-make} acimake 2> /dev/null`
-+ kde_cv_defines_imake=`${MAKE-make} acimake 2> /dev/null | grep -v "^make"`
- kde_cv_defines_imake_version=$imkv
- else
- echo "$as_me:$LINENO: result: failed" >&5
-@@ -46234,8 +45991,7 @@
+@@ -46439,8 +46194,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8865,15 +8210,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46269,6 +46025,7 @@
-
- case $host_os in
- linux*) ac_cv_func_getutxent=no;;
-+ darwin*) ac_cv_func_getutxent=no;;
- *) echo "$as_me:$LINENO: checking for getutxent" >&5
- echo $ECHO_N "checking for getutxent... $ECHO_C" >&6
- if test "${ac_cv_func_getutxent+set}" = set; then
-@@ -46334,8 +46091,7 @@
+@@ -46540,8 +46294,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8883,7 +8220,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46433,8 +46189,7 @@
+@@ -46639,8 +46392,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8893,7 +8230,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46502,8 +46257,7 @@
+@@ -46708,8 +46460,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8903,7 +8240,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46547,8 +46301,7 @@
+@@ -46753,8 +46504,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8913,7 +8250,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46614,8 +46367,7 @@
+@@ -46820,8 +46570,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8923,7 +8260,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46659,8 +46411,7 @@
+@@ -46865,8 +46614,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8933,7 +8270,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46729,8 +46480,7 @@
+@@ -46935,8 +46683,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8943,7 +8280,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46777,8 +46527,7 @@
+@@ -46983,8 +46730,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8953,7 +8290,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46888,8 +46637,7 @@
+@@ -47094,8 +46840,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8963,17 +8300,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46927,7 +46675,8 @@
-
-
-
--for ac_func in mkstemp setproctitle sysinfo strnlen
-+
-+for ac_func in mkstemp setproctitle sysinfo strnlen getifaddrs
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
- echo "$as_me:$LINENO: checking for $ac_func" >&5
-@@ -46995,8 +46744,7 @@
+@@ -47202,8 +46947,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8983,97 +8310,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47029,89 +46777,6 @@
- done
-
-
--echo "$as_me:$LINENO: checking for working getifaddrs" >&5
--echo $ECHO_N "checking for working getifaddrs... $ECHO_C" >&6
--if test "${ac_cv_func_getifaddrs_ok+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test "$cross_compiling" = yes; then
-- ac_cv_func_getifaddrs_ok=no
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--#include <stdio.h>
--#include <string.h>
--#include <sys/types.h>
--#include <sys/socket.h>
--#include <ifaddrs.h>
--
--int
--main ()
--{
--
-- struct ifaddrs *ifr;
-- if (getifaddrs(&ifr) < 0) {
-- fprintf(stderr, "getifaddrs failed\n");
-- return 1;
-- }
-- for (; ifr; ifr = ifr->ifa_next)
-- if (!strcmp(ifr->ifa_name, "lo"))
-- switch (ifr->ifa_addr->sa_family) {
-- case AF_INET:
--#ifdef AF_INET6
-- case AF_INET6:
--#endif
-- return 0;
-- default:
-- fprintf(stderr, "getifaddrs returns nonsense\n");
-- return 1;
-- }
-- fprintf(stderr, "getifaddrs returned no loopback interface\n");
-- return 1;
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_func_getifaddrs_ok=yes
--else
-- echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--ac_cv_func_getifaddrs_ok=no
--fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--
--fi
--echo "$as_me:$LINENO: result: $ac_cv_func_getifaddrs_ok" >&5
--echo "${ECHO_T}$ac_cv_func_getifaddrs_ok" >&6
--if test $ac_cv_func_getifaddrs_ok = yes; then
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GOOD_GETIFADDRS 1
--_ACEOF
--
--fi
--
-
- for ac_func in arc4random
- do
-@@ -47181,8 +46846,7 @@
+@@ -47305,8 +47049,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9083,7 +8320,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47293,8 +46957,7 @@
+@@ -47417,8 +47160,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9093,7 +8330,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47328,13 +46991,13 @@
+@@ -47452,13 +47194,13 @@
fi
@@ -9111,7 +8348,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -47360,8 +47023,7 @@
+@@ -47484,8 +47226,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9121,7 +8358,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47373,20 +47035,20 @@
+@@ -47497,20 +47238,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -9147,7 +8384,7 @@
:
else
-@@ -47406,13 +47068,13 @@
+@@ -47530,13 +47271,13 @@
with_xdmcp=yes
fi;
if test "x$with_xdmcp" = xyes; then
@@ -9165,7 +8402,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -47438,8 +47100,7 @@
+@@ -47562,8 +47303,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9175,7 +8412,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47451,21 +47112,21 @@
+@@ -47575,21 +47315,21 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -9203,7 +8440,7 @@
fi
if test -n "$LIBXDMCP"; then
-@@ -47495,8 +47156,7 @@
+@@ -47619,8 +47359,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9213,7 +8450,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47605,8 +47265,7 @@
+@@ -47729,8 +47468,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9223,7 +8460,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47715,8 +47374,7 @@
+@@ -47839,8 +47577,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9233,7 +8470,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47819,8 +47477,7 @@
+@@ -47943,8 +47680,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9243,7 +8480,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47888,8 +47545,7 @@
+@@ -48012,8 +47748,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9253,7 +8490,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47979,8 +47635,7 @@
+@@ -48103,8 +47838,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9263,7 +8500,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48156,8 +47811,7 @@
+@@ -48280,8 +48014,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9273,7 +8510,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48463,8 +48117,7 @@
+@@ -48587,8 +48320,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9283,174 +8520,26 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48514,6 +48167,157 @@
-
-
-
-+for ac_header in sys/loadavg.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+else
-+ # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
+@@ -48671,8 +48403,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_header_compiler=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <$ac_header>
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+ ac_header_preproc=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
-+
-+# So? What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
-+ ;;
-+ no:yes:* )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------------ ##
-+## Report this to the AC_PACKAGE_NAME lists. ##
-+## ------------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
-+esac
-+echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ eval "$as_ac_Header=\$ac_header_preproc"
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+
-+
-+
- LIBSSL="-lssl -lcrypto"
-
-
-@@ -48555,7 +48359,7 @@
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -48831,7 +48562,7 @@
do
for j in openssl/ssl.h;
do
-- echo "configure: 48558: $i/$j" >&5
-+ echo "configure: 48362: $i/$j" >&5
+- echo "configure: 48834: $i/$j" >&5
++ echo "configure: 48565: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ssl_incdir=$i
-@@ -48610,8 +48414,7 @@
+@@ -48886,8 +48617,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9460,7 +8549,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48848,8 +48651,7 @@
+@@ -49124,8 +48854,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9470,7 +8559,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49021,8 +48823,7 @@
+@@ -49297,8 +49026,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9480,7 +8569,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49193,8 +48994,7 @@
+@@ -49469,8 +49197,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9490,7 +8579,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49286,8 +49086,7 @@
+@@ -49562,8 +49289,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9500,7 +8589,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49376,8 +49175,7 @@
+@@ -49652,8 +49378,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9510,7 +8599,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49466,8 +49264,7 @@
+@@ -49742,8 +49467,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9520,7 +8609,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49561,8 +49358,7 @@
+@@ -49837,8 +49561,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9530,7 +8619,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49667,8 +49463,7 @@
+@@ -49943,8 +49666,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9540,7 +8629,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49857,8 +49652,7 @@
+@@ -50133,8 +49855,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9550,25 +8639,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49916,7 +49710,7 @@
+@@ -50192,7 +49913,7 @@
do
for j in ldap.h;
do
-- echo "configure: 49919: $i/$j" >&5
-+ echo "configure: 49713: $i/$j" >&5
+- echo "configure: 50195: $i/$j" >&5
++ echo "configure: 49916: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ldap_incdir=$i
-@@ -49938,7 +49732,7 @@
+@@ -50214,7 +49935,7 @@
do
for j in libldap.$ext;
do
-- echo "configure: 49941: $i/$j" >&5
-+ echo "configure: 49735: $i/$j" >&5
+- echo "configure: 50217: $i/$j" >&5
++ echo "configure: 49938: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ldap_libdir=$i
-@@ -50035,8 +49829,7 @@
+@@ -50311,8 +50032,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9578,7 +8667,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50133,8 +49926,7 @@
+@@ -50409,8 +50129,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9588,100 +8677,70 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50276,10 +50068,10 @@
-
- if test "x$hal_test" = "xyes" ; then
-
--########### Check for the HAL
-+########### Check for the HAL, version 0.4.x
-
-- echo "$as_me:$LINENO: checking for the HAL" >&5
--echo $ECHO_N "checking for the HAL... $ECHO_C" >&6
-+ echo "$as_me:$LINENO: checking for the HAL 0.4" >&5
-+echo $ECHO_N "checking for the HAL 0.4... $ECHO_C" >&6
-
- hal_inc=NOTFOUND
- hal_lib=NOTFOUND
-@@ -50292,7 +50084,7 @@
+@@ -50568,7 +50287,7 @@
do
for j in libhal.h libhal-storage.h;
do
-- echo "configure: 50295: $i/$j" >&5
-+ echo "configure: 50087: $i/$j" >&5
+- echo "configure: 50571: $i/$j" >&5
++ echo "configure: 50290: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
hal_incdir=$i
-@@ -50314,7 +50106,7 @@
+@@ -50590,7 +50309,7 @@
do
for j in libhal.so libhal-storage.so;
do
-- echo "configure: 50317: $i/$j" >&5
-+ echo "configure: 50109: $i/$j" >&5
+- echo "configure: 50593: $i/$j" >&5
++ echo "configure: 50312: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
hal_libdir=$i
-@@ -50329,6 +50121,15 @@
- hal_lib=FOUND
- fi
-
-+ if test -r $hal_incdir/libhal.h ; then
-+ hal_version=5
-+ grep LibHalFunctions $hal_incdir/libhal.h \
-+ > /dev/null 2>&1 && hal_version=4
-+ if test $hal_version = 5 ; then
-+ hal_lib=NOT_FOUND
-+ fi
-+ fi
-+
-
- if test $hal_inc = FOUND && test $hal_lib = FOUND ; then
- echo "$as_me:$LINENO: result: headers $hal_incdir libraries $hal_libdir" >&5
-@@ -50359,7 +50160,7 @@
+@@ -50644,7 +50363,7 @@
do
for j in dbus/dbus.h;
do
-- echo "configure: 50362: $i/$j" >&5
-+ echo "configure: 50163: $i/$j" >&5
+- echo "configure: 50647: $i/$j" >&5
++ echo "configure: 50366: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbus_incdir=$i
-@@ -50376,7 +50177,7 @@
+@@ -50661,7 +50380,7 @@
do
for j in dbus/dbus-arch-deps.h;
do
-- echo "configure: 50379: $i/$j" >&5
-+ echo "configure: 50180: $i/$j" >&5
+- echo "configure: 50664: $i/$j" >&5
++ echo "configure: 50383: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbus_incdir_arch_deps=$i
-@@ -50398,7 +50199,7 @@
+@@ -50683,7 +50402,7 @@
do
for j in libdbus-1.so;
do
-- echo "configure: 50401: $i/$j" >&5
-+ echo "configure: 50202: $i/$j" >&5
+- echo "configure: 50686: $i/$j" >&5
++ echo "configure: 50405: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbus_libdir=$i
-@@ -50441,7 +50242,7 @@
+@@ -50726,7 +50445,7 @@
do
for j in dbus/connection.h;
do
-- echo "configure: 50444: $i/$j" >&5
-+ echo "configure: 50245: $i/$j" >&5
+- echo "configure: 50729: $i/$j" >&5
++ echo "configure: 50448: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbusqt_incdir=$i
-@@ -50468,7 +50269,7 @@
+@@ -50753,7 +50472,7 @@
do
for j in libdbus-qt-1.so;
do
-- echo "configure: 50471: $i/$j" >&5
-+ echo "configure: 50272: $i/$j" >&5
+- echo "configure: 50756: $i/$j" >&5
++ echo "configure: 50475: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbusqt_libdir=$i
-@@ -50582,8 +50383,7 @@
+@@ -50867,8 +50586,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9691,7 +8750,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50612,8 +50412,7 @@
+@@ -50897,8 +50615,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9701,7 +8760,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50683,8 +50482,7 @@
+@@ -50968,8 +50685,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9711,7 +8770,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50736,8 +50534,7 @@
+@@ -51021,8 +50737,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9721,7 +8780,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50808,8 +50605,7 @@
+@@ -51093,8 +50808,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9731,7 +8790,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50861,8 +50657,7 @@
+@@ -51146,8 +50860,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9741,7 +8800,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50952,8 +50747,7 @@
+@@ -51237,8 +50950,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9751,7 +8810,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51122,8 +50916,7 @@
+@@ -51407,8 +51119,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9761,7 +8820,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51240,8 +51033,7 @@
+@@ -51525,8 +51236,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9771,7 +8830,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51316,8 +51108,7 @@
+@@ -51601,8 +51311,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9781,7 +8840,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51577,8 +51368,7 @@
+@@ -51862,8 +51571,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9791,7 +8850,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51700,8 +51490,7 @@
+@@ -51985,8 +51693,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9801,7 +8860,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51787,8 +51576,7 @@
+@@ -52072,8 +51779,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9811,7 +8870,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51856,8 +51644,7 @@
+@@ -52141,8 +51847,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9821,7 +8880,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51912,8 +51699,7 @@
+@@ -52197,8 +51902,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9831,7 +8890,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52537,8 +52323,7 @@
+@@ -52822,8 +52526,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9841,7 +8900,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52617,8 +52402,7 @@
+@@ -52902,8 +52605,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9851,7 +8910,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52681,8 +52465,7 @@
+@@ -52966,8 +52668,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9861,7 +8920,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52879,8 +52662,7 @@
+@@ -53164,8 +52865,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9871,7 +8930,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52982,8 +52764,7 @@
+@@ -53267,8 +52967,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9881,7 +8940,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53152,8 +52933,7 @@
+@@ -53437,8 +53136,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9891,7 +8950,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53239,8 +53019,7 @@
+@@ -53524,8 +53222,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9901,7 +8960,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53326,8 +53105,7 @@
+@@ -53611,8 +53308,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9911,7 +8970,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53425,8 +53203,7 @@
+@@ -53710,8 +53406,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9921,7 +8980,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53582,8 +53359,7 @@
+@@ -53867,8 +53562,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9931,7 +8990,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53663,8 +53439,7 @@
+@@ -53948,8 +53642,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9941,7 +9000,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -55229,6 +55004,13 @@
+@@ -55514,6 +55207,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -9955,7 +9014,7 @@
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -56806,6 +56588,9 @@
+@@ -57091,6 +56791,9 @@
s,@AMTAR@,$AMTAR,;t t
s,@am__tar@,$am__tar,;t t
s,@am__untar@,$am__untar,;t t
@@ -9965,7 +9024,7 @@
s,@KDECONFIG@,$KDECONFIG,;t t
s,@kde_libs_prefix@,$kde_libs_prefix,;t t
s,@kde_libs_htmldir@,$kde_libs_htmldir,;t t
-@@ -57374,11 +57159,6 @@
+@@ -57659,11 +57362,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
@@ -9977,7 +9036,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. */
-@@ -57417,6 +57197,12 @@
+@@ -57702,6 +57400,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
@@ -9990,23 +9049,12 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
-diff -Nru kdebase-3.4.0.orig/configure.files kdebase-3.4.0/configure.files
---- kdebase-3.4.0.orig/configure.files 2005-03-04 08:11:04.000000000 -0500
-+++ kdebase-3.4.0/configure.files 2005-05-07 12:16:52.000000000 -0400
-@@ -26,6 +26,7 @@
- ./kdm/configure.in.in
- ./khotkeys/configure.in.in
- ./kicker/applets/naughty/configure.in.in
-+./kicker/extensions/kasbar/configure.in.in
- ./kioslave/configure.in.bot
- ./kioslave/configure.in.in
- ./kioslave/filter/configure.in.in
-diff -Nru kdebase-3.4.0.orig/configure.in kdebase-3.4.0/configure.in
---- kdebase-3.4.0.orig/configure.in 2005-03-04 08:11:05.000000000 -0500
-+++ kdebase-3.4.0/configure.in 2005-05-07 12:16:59.000000000 -0400
+diff -rua kdebase-3.4.1.orig/configure.in kdebase-3.4.1/configure.in
+--- kdebase-3.4.1.orig/configure.in 2005-05-23 18:34:16.000000000 +0200
++++ kdebase-3.4.1/configure.in 2005-05-24 16:23:02.749538776 +0200
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdebase, "3.4.0") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdebase, "3.4.1") dnl searches for some needed programs
+AM_MAINTAINER_MODE
+
@@ -10060,82 +9108,7 @@
[
AC_DEFINE(HAVE_XF86MISCSETGRABKEYSSTATE, 1, [Define if you have XF86MiscSetGrabKeysState()])
],
-@@ -806,7 +808,7 @@
-
- dnl ask imake about various X settings
- AC_MSG_CHECKING([X paths])
--imkv=7
-+imkv=8
- test "$kde_cv_defines_imake_version" = $imkv || unset kde_cv_defines_imake
- AC_CACHE_VAL(kde_cv_defines_imake, [
- rm -fr conftestdir
-@@ -819,7 +821,7 @@
-
- ]EOF
- if $XMKMF >&5 2>&1 && test -f Makefile; then
-- kde_cv_defines_imake=`${MAKE-make} acimake 2> /dev/null`
-+ kde_cv_defines_imake=`${MAKE-make} acimake 2> /dev/null | grep -v "^make"`
- kde_cv_defines_imake_version=$imkv
- else
- AC_MSG_RESULT([failed])
-@@ -846,6 +848,7 @@
- AC_CHECK_FUNCS([getttyent])
- case $host_os in
- linux*) ac_cv_func_getutxent=no;;
-+ darwin*) ac_cv_func_getutxent=no;;
- *) AC_CHECK_FUNC([getutxent]);;
- esac
- if test $ac_cv_func_getutxent = yes; then
-@@ -867,46 +870,8 @@
- AC_CHECK_FUNCS([setlogin setusercontext getusershell login_getclass auth_timeok])
- LIBS=$ac_save_libs
-
--AC_CHECK_FUNCS([mkstemp setproctitle sysinfo strnlen])
--
--dnl is this always available without additional libs?
--dnl my linux glibc 2.3.2 getifaddrs() returns nonsense, so ignore it
--AC_CACHE_CHECK([for working getifaddrs], ac_cv_func_getifaddrs_ok,
-- [AC_RUN_IFELSE(
-- [AC_LANG_PROGRAM([
--#include <stdio.h>
--#include <string.h>
--#include <sys/types.h>
--#include <sys/socket.h>
--#include <ifaddrs.h>
-- ],[[
-- struct ifaddrs *ifr;
-- if (getifaddrs(&ifr) < 0) {
-- fprintf(stderr, "getifaddrs failed\n");
-- return 1;
-- }
-- for (; ifr; ifr = ifr->ifa_next)
-- if (!strcmp(ifr->ifa_name, "lo"))
-- switch (ifr->ifa_addr->sa_family) {
-- case AF_INET:
--#ifdef AF_INET6
-- case AF_INET6:
--#endif
-- return 0;
-- default:
-- fprintf(stderr, "getifaddrs returns nonsense\n");
-- return 1;
-- }
-- fprintf(stderr, "getifaddrs returned no loopback interface\n");
-- return 1;
-- ]])],
-- [ac_cv_func_getifaddrs_ok=yes],
-- [ac_cv_func_getifaddrs_ok=no],
-- [ac_cv_func_getifaddrs_ok=no])
-- ])
--if test $ac_cv_func_getifaddrs_ok = yes; then
-- AC_DEFINE(HAVE_GOOD_GETIFADDRS, 1, [Define if you have a working getifaddrs()])
--fi
-+dnl is getifaddrs always available without additional libs?
-+AC_CHECK_FUNCS([mkstemp setproctitle sysinfo strnlen getifaddrs])
-
- AC_CHECK_FUNCS([arc4random], ,
- [
-@@ -922,7 +887,7 @@
+@@ -885,7 +887,7 @@
AC_CHECK_FUNC(vsyslog, [
AC_DEFINE(USE_SYSLOG, 1, [Define if kdm should be built with syslog support])])
@@ -10144,7 +9117,7 @@
[
AC_MSG_WARN([Cannot build KDM! Make sure that libXau.a is installed!])
DO_NOT_COMPILE="$DO_NOT_COMPILE kdm"
-@@ -933,7 +898,7 @@
+@@ -896,7 +898,7 @@
AC_HELP_STRING([--without-xdmcp],[build kdm without xdmcp support [default=with xdmcp]]), ,
[with_xdmcp=yes])
if test "x$with_xdmcp" = xyes; then
@@ -10153,62 +9126,9 @@
if test -n "$LIBXDMCP"; then
cppflags_safe=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $X_INCLUDES"
-@@ -1168,6 +1133,12 @@
- AC_SUBST(LIB_KVM)
-
- dnl =======================================================
-+dnl FILE: ./kicker/extensions/kasbar/configure.in.in
-+dnl =======================================================
-+
-+AC_CHECK_HEADERS(sys/loadavg.h)
-+
-+dnl =======================================================
- dnl FILE: ./kioslave/configure.in.in
- dnl =======================================================
-
-@@ -1330,9 +1301,9 @@
-
- if test "x$hal_test" = "xyes" ; then
-
--########### Check for the HAL
-+########### Check for the HAL, version 0.4.x
-
-- AC_MSG_CHECKING(for the HAL)
-+ AC_MSG_CHECKING(for the HAL 0.4)
-
- hal_inc=NOTFOUND
- hal_lib=NOTFOUND
-@@ -1354,6 +1325,15 @@
- hal_lib=FOUND
- fi
-
-+ if test -r $hal_incdir/libhal.h ; then
-+ hal_version=5
-+ grep LibHalFunctions $hal_incdir/libhal.h \
-+ > /dev/null 2>&1 && hal_version=4
-+ if test $hal_version = 5 ; then
-+ hal_lib=NOT_FOUND
-+ fi
-+ fi
-+
-
- if [test $hal_inc = FOUND] && [test $hal_lib = FOUND] ; then
- AC_MSG_RESULT(headers $hal_incdir libraries $hal_libdir)
-diff -Nru kdebase-3.4.0.orig/doc/faq/Makefile.in kdebase-3.4.0/doc/faq/Makefile.in
---- kdebase-3.4.0.orig/doc/faq/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/faq/Makefile.in 2005-05-07 12:35:01.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/faq/Makefile.in kdebase-3.4.1/doc/faq/Makefile.in
+--- kdebase-3.4.1.orig/doc/faq/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/faq/Makefile.in 2005-05-24 16:27:52.331381317 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10240,54 +9160,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -712,7 +715,7 @@
- KDE_DIST=desktop.docbook about.docbook winmng.docbook tips.docbook nonkdeapps.docbook intro.docbook getkde.docbook index.docbook sound.docbook kdeapps.docbook misc.docbook moreinfo.docbook install.docbook configkde.docbook Makefile.in contrib.docbook questions.docbook webbrowse.docbook notrelated.docbook panel.docbook filemng.docbook Makefile.am index.cache.bz2
-
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) TODO about.docbook configkde.docbook contrib.docbook desktop.docbook filemng.docbook getkde.docbook index.docbook install.docbook intro.docbook kdeapps.docbook misc.docbook moreinfo.docbook nonkdeapps.docbook notrelated.docbook panel.docbook tips.docbook winmng.docbook questions.docbook sound.docbook webbrowse.docbook
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) TODO configkde.docbook tips.docbook getkde.docbook filemng.docbook contrib.docbook webbrowse.docbook about.docbook misc.docbook panel.docbook sound.docbook questions.docbook moreinfo.docbook notrelated.docbook intro.docbook kdeapps.docbook install.docbook desktop.docbook winmng.docbook nonkdeapps.docbook index.docbook
- @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
-
- docs-am: index.cache.bz2
-@@ -739,20 +742,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/faq
-- @for base in TODO about.docbook configkde.docbook contrib.docbook desktop.docbook filemng.docbook getkde.docbook index.docbook install.docbook intro.docbook kdeapps.docbook misc.docbook moreinfo.docbook nonkdeapps.docbook notrelated.docbook panel.docbook tips.docbook winmng.docbook questions.docbook sound.docbook webbrowse.docbook ; do \
-+ @for base in TODO configkde.docbook tips.docbook getkde.docbook filemng.docbook contrib.docbook webbrowse.docbook about.docbook misc.docbook panel.docbook sound.docbook questions.docbook moreinfo.docbook notrelated.docbook intro.docbook kdeapps.docbook install.docbook desktop.docbook winmng.docbook nonkdeapps.docbook index.docbook ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/faq/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/faq/$$base ;\
- done
-
- uninstall-nls:
-- for base in TODO about.docbook configkde.docbook contrib.docbook desktop.docbook filemng.docbook getkde.docbook index.docbook install.docbook intro.docbook kdeapps.docbook misc.docbook moreinfo.docbook nonkdeapps.docbook notrelated.docbook panel.docbook tips.docbook winmng.docbook questions.docbook sound.docbook webbrowse.docbook ; do \
-+ for base in TODO configkde.docbook tips.docbook getkde.docbook filemng.docbook contrib.docbook webbrowse.docbook about.docbook misc.docbook panel.docbook sound.docbook questions.docbook moreinfo.docbook notrelated.docbook intro.docbook kdeapps.docbook install.docbook desktop.docbook winmng.docbook nonkdeapps.docbook index.docbook ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/faq/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in TODO about.docbook configkde.docbook contrib.docbook desktop.docbook filemng.docbook getkde.docbook index.docbook install.docbook intro.docbook kdeapps.docbook misc.docbook moreinfo.docbook nonkdeapps.docbook notrelated.docbook panel.docbook tips.docbook winmng.docbook questions.docbook sound.docbook webbrowse.docbook ; do \
-+ for file in TODO configkde.docbook tips.docbook getkde.docbook filemng.docbook contrib.docbook webbrowse.docbook about.docbook misc.docbook panel.docbook sound.docbook questions.docbook moreinfo.docbook notrelated.docbook intro.docbook kdeapps.docbook install.docbook desktop.docbook winmng.docbook nonkdeapps.docbook index.docbook ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
-diff -Nru kdebase-3.4.0.orig/doc/glossary/Makefile.in kdebase-3.4.0/doc/glossary/Makefile.in
---- kdebase-3.4.0.orig/doc/glossary/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/glossary/Makefile.in 2005-05-07 12:35:01.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/glossary/Makefile.in kdebase-3.4.1/doc/glossary/Makefile.in
+--- kdebase-3.4.1.orig/doc/glossary/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/glossary/Makefile.in 2005-05-24 16:27:52.344380143 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10319,21 +9194,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kappfinder/Makefile.in kdebase-3.4.0/doc/kappfinder/Makefile.in
---- kdebase-3.4.0.orig/doc/kappfinder/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kappfinder/Makefile.in 2005-05-07 12:35:01.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kappfinder/Makefile.in kdebase-3.4.1/doc/kappfinder/Makefile.in
+--- kdebase-3.4.1.orig/doc/kappfinder/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kappfinder/Makefile.in 2005-05-24 16:27:52.357378969 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10365,21 +9228,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kate/Makefile.in kdebase-3.4.0/doc/kate/Makefile.in
---- kdebase-3.4.0.orig/doc/kate/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kate/Makefile.in 2005-05-07 12:35:01.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kate/Makefile.in kdebase-3.4.1/doc/kate/Makefile.in
+--- kdebase-3.4.1.orig/doc/kate/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kate/Makefile.in 2005-05-24 16:27:52.372377614 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10411,58 +9262,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -709,10 +712,10 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=configuring.docbook plugins.docbook index.docbook regular-expressions.docbook mdi.docbook configdialog02.png fundamentals.docbook Makefile.in unhighlighted.png part.docbook highlighting.docbook menus.docbook configdialog01.png advanced.docbook highlighted.png kate.png Makefile.am mimetypechooser.png index.cache.bz2
-+KDE_DIST=configuring.docbook plugins.docbook index.docbook regular-expressions.docbook mdi.docbook configdialog02.png fundamentals.docbook Makefile.in unhighlighted.png part.docbook highlighting.docbook menus.docbook configdialog01.png advanced.docbook highlighted.png Makefile.am kate.png mimetypechooser.png index.cache.bz2
-
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) TODO advanced.docbook configdialog01.png configdialog02.png configuring.docbook fundamentals.docbook highlighted.png highlighting.docbook index.docbook kate.png mdi.docbook menus.docbook mimetypechooser.png part.docbook plugins.docbook regular-expressions.docbook unhighlighted.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) configdialog02.png TODO mimetypechooser.png unhighlighted.png plugins.docbook regular-expressions.docbook highlighting.docbook kate.png menus.docbook configuring.docbook advanced.docbook fundamentals.docbook part.docbook index.docbook highlighted.png mdi.docbook configdialog01.png
- @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
-
- docs-am: index.cache.bz2
-@@ -739,20 +742,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kate
-- @for base in TODO advanced.docbook configdialog01.png configdialog02.png configuring.docbook fundamentals.docbook highlighted.png highlighting.docbook index.docbook kate.png mdi.docbook menus.docbook mimetypechooser.png part.docbook plugins.docbook regular-expressions.docbook unhighlighted.png ; do \
-+ @for base in configdialog02.png TODO mimetypechooser.png unhighlighted.png plugins.docbook regular-expressions.docbook highlighting.docbook kate.png menus.docbook configuring.docbook advanced.docbook fundamentals.docbook part.docbook index.docbook highlighted.png mdi.docbook configdialog01.png ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kate/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kate/$$base ;\
- done
-
- uninstall-nls:
-- for base in TODO advanced.docbook configdialog01.png configdialog02.png configuring.docbook fundamentals.docbook highlighted.png highlighting.docbook index.docbook kate.png mdi.docbook menus.docbook mimetypechooser.png part.docbook plugins.docbook regular-expressions.docbook unhighlighted.png ; do \
-+ for base in configdialog02.png TODO mimetypechooser.png unhighlighted.png plugins.docbook regular-expressions.docbook highlighting.docbook kate.png menus.docbook configuring.docbook advanced.docbook fundamentals.docbook part.docbook index.docbook highlighted.png mdi.docbook configdialog01.png ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kate/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in TODO advanced.docbook configdialog01.png configdialog02.png configuring.docbook fundamentals.docbook highlighted.png highlighting.docbook index.docbook kate.png mdi.docbook menus.docbook mimetypechooser.png part.docbook plugins.docbook regular-expressions.docbook unhighlighted.png ; do \
-+ for file in configdialog02.png TODO mimetypechooser.png unhighlighted.png plugins.docbook regular-expressions.docbook highlighting.docbook kate.png menus.docbook configuring.docbook advanced.docbook fundamentals.docbook part.docbook index.docbook highlighted.png mdi.docbook configdialog01.png ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/arts/Makefile.in kdebase-3.4.0/doc/kcontrol/arts/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/arts/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/arts/Makefile.in 2005-05-07 12:35:01.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/arts/Makefile.in kdebase-3.4.1/doc/kcontrol/arts/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/arts/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/arts/Makefile.in 2005-05-24 16:27:52.404374724 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10494,54 +9296,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -712,7 +715,7 @@
- KDE_DIST=midi.docbook index.docbook Makefile.in Makefile.am index.cache.bz2
-
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook midi.docbook
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) midi.docbook index.docbook
- @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
-
- docs-am: index.cache.bz2
-@@ -739,20 +742,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/arts
-- @for base in index.docbook midi.docbook ; do \
-+ @for base in midi.docbook index.docbook ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/arts/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/arts/$$base ;\
- done
-
- uninstall-nls:
-- for base in index.docbook midi.docbook ; do \
-+ for base in midi.docbook index.docbook ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/arts/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in index.docbook midi.docbook ; do \
-+ for file in midi.docbook index.docbook ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/background/Makefile.in kdebase-3.4.0/doc/kcontrol/background/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/background/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/background/Makefile.in 2005-05-07 12:35:01.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/background/Makefile.in kdebase-3.4.1/doc/kcontrol/background/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/background/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/background/Makefile.in 2005-05-24 16:27:52.419373369 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10573,21 +9330,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/bell/Makefile.in kdebase-3.4.0/doc/kcontrol/bell/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/bell/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/bell/Makefile.in 2005-05-07 12:35:01.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/bell/Makefile.in kdebase-3.4.1/doc/kcontrol/bell/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/bell/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/bell/Makefile.in 2005-05-24 16:27:52.431372285 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10619,21 +9364,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/cache/Makefile.in kdebase-3.4.0/doc/kcontrol/cache/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/cache/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/cache/Makefile.in 2005-05-07 12:35:02.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/cache/Makefile.in kdebase-3.4.1/doc/kcontrol/cache/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/cache/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/cache/Makefile.in 2005-05-24 16:27:52.442371292 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10665,21 +9398,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/clock/Makefile.in kdebase-3.4.0/doc/kcontrol/clock/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/clock/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/clock/Makefile.in 2005-05-07 12:35:02.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/clock/Makefile.in kdebase-3.4.1/doc/kcontrol/clock/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/clock/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/clock/Makefile.in 2005-05-24 16:27:52.460369666 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10711,21 +9432,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/colors/Makefile.in kdebase-3.4.0/doc/kcontrol/colors/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/colors/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/colors/Makefile.in 2005-05-07 12:35:02.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/colors/Makefile.in kdebase-3.4.1/doc/kcontrol/colors/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/colors/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/colors/Makefile.in 2005-05-24 16:27:52.469368853 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10757,21 +9466,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/cookies/Makefile.in kdebase-3.4.0/doc/kcontrol/cookies/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/cookies/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/cookies/Makefile.in 2005-05-07 12:35:02.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/cookies/Makefile.in kdebase-3.4.1/doc/kcontrol/cookies/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/cookies/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/cookies/Makefile.in 2005-05-24 16:27:52.478368040 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10803,21 +9500,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/crypto/Makefile.in kdebase-3.4.0/doc/kcontrol/crypto/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/crypto/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/crypto/Makefile.in 2005-05-07 12:35:02.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/crypto/Makefile.in kdebase-3.4.1/doc/kcontrol/crypto/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/crypto/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/crypto/Makefile.in 2005-05-24 16:27:52.488367137 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10849,21 +9534,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/desktop/Makefile.in kdebase-3.4.0/doc/kcontrol/desktop/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/desktop/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/desktop/Makefile.in 2005-05-07 12:35:02.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/desktop/Makefile.in kdebase-3.4.1/doc/kcontrol/desktop/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/desktop/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/desktop/Makefile.in 2005-05-24 16:27:52.501365963 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10895,21 +9568,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/desktopbehavior/Makefile.in kdebase-3.4.0/doc/kcontrol/desktopbehavior/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/desktopbehavior/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/desktopbehavior/Makefile.in 2005-05-07 12:35:02.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/desktopbehavior/Makefile.in kdebase-3.4.1/doc/kcontrol/desktopbehavior/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/desktopbehavior/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/desktopbehavior/Makefile.in 2005-05-24 16:27:52.515364699 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10941,21 +9602,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/ebrowsing/Makefile.in kdebase-3.4.0/doc/kcontrol/ebrowsing/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/ebrowsing/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/ebrowsing/Makefile.in 2005-05-07 12:35:02.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/ebrowsing/Makefile.in kdebase-3.4.1/doc/kcontrol/ebrowsing/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/ebrowsing/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/ebrowsing/Makefile.in 2005-05-24 16:27:52.528363525 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10987,21 +9636,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/email/Makefile.in kdebase-3.4.0/doc/kcontrol/email/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/email/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/email/Makefile.in 2005-05-07 12:35:02.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/email/Makefile.in kdebase-3.4.1/doc/kcontrol/email/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/email/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/email/Makefile.in 2005-05-24 16:27:52.542362260 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11033,21 +9670,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/energy/Makefile.in kdebase-3.4.0/doc/kcontrol/energy/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/energy/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/energy/Makefile.in 2005-05-07 12:35:02.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/energy/Makefile.in kdebase-3.4.1/doc/kcontrol/energy/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/energy/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/energy/Makefile.in 2005-05-24 16:27:52.556360996 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11079,21 +9704,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/filemanager/Makefile.in kdebase-3.4.0/doc/kcontrol/filemanager/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/filemanager/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/filemanager/Makefile.in 2005-05-07 12:35:02.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/filemanager/Makefile.in kdebase-3.4.1/doc/kcontrol/filemanager/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/filemanager/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/filemanager/Makefile.in 2005-05-24 16:27:52.569359822 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11125,54 +9738,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -712,7 +715,7 @@
- KDE_DIST=kfileman1.png index.docbook Makefile.in kfileman2.png Makefile.am index.cache.bz2
-
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook kfileman1.png kfileman2.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kfileman1.png kfileman2.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
-@@ -739,20 +742,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/filemanager
-- @for base in index.docbook kfileman1.png kfileman2.png ; do \
-+ @for base in kfileman1.png kfileman2.png index.docbook ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/filemanager/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/filemanager/$$base ;\
- done
-
- uninstall-nls:
-- for base in index.docbook kfileman1.png kfileman2.png ; do \
-+ for base in kfileman1.png kfileman2.png index.docbook ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/filemanager/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in index.docbook kfileman1.png kfileman2.png ; do \
-+ for file in kfileman1.png kfileman2.png index.docbook ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/filetypes/Makefile.in kdebase-3.4.0/doc/kcontrol/filetypes/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/filetypes/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/filetypes/Makefile.in 2005-05-07 12:35:03.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/filetypes/Makefile.in kdebase-3.4.1/doc/kcontrol/filetypes/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/filetypes/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/filetypes/Makefile.in 2005-05-24 16:27:52.582358648 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11204,21 +9772,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/fonts/Makefile.in kdebase-3.4.0/doc/kcontrol/fonts/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/fonts/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/fonts/Makefile.in 2005-05-07 12:35:03.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/fonts/Makefile.in kdebase-3.4.1/doc/kcontrol/fonts/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/fonts/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/fonts/Makefile.in 2005-05-24 16:27:52.595357473 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11250,21 +9806,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/helpindex/Makefile.in kdebase-3.4.0/doc/kcontrol/helpindex/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/helpindex/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/helpindex/Makefile.in 2005-05-07 12:35:03.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/helpindex/Makefile.in kdebase-3.4.1/doc/kcontrol/helpindex/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/helpindex/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/helpindex/Makefile.in 2005-05-24 16:27:52.608356299 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11296,21 +9840,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/icons/Makefile.in kdebase-3.4.0/doc/kcontrol/icons/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/icons/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/icons/Makefile.in 2005-05-07 12:35:03.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/icons/Makefile.in kdebase-3.4.1/doc/kcontrol/icons/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/icons/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/icons/Makefile.in 2005-05-24 16:27:52.621355125 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11342,21 +9874,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/kcmaccess/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmaccess/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/kcmaccess/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/kcmaccess/Makefile.in 2005-05-07 12:35:03.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/kcmaccess/Makefile.in kdebase-3.4.1/doc/kcontrol/kcmaccess/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/kcmaccess/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/kcmaccess/Makefile.in 2005-05-24 16:27:52.634353951 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11388,21 +9908,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/kcmcss/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmcss/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/kcmcss/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/kcmcss/Makefile.in 2005-05-07 12:35:03.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/kcmcss/Makefile.in kdebase-3.4.1/doc/kcontrol/kcmcss/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/kcmcss/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/kcmcss/Makefile.in 2005-05-24 16:27:52.647352777 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11434,21 +9942,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/kcmfontinst/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmfontinst/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/kcmfontinst/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/kcmfontinst/Makefile.in 2005-05-07 12:35:03.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/kcmfontinst/Makefile.in kdebase-3.4.1/doc/kcontrol/kcmfontinst/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/kcmfontinst/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/kcmfontinst/Makefile.in 2005-05-24 16:27:52.661351513 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11480,21 +9976,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/kcmkonsole/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmkonsole/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/kcmkonsole/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/kcmkonsole/Makefile.in 2005-05-07 12:35:03.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/kcmkonsole/Makefile.in kdebase-3.4.1/doc/kcontrol/kcmkonsole/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/kcmkonsole/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/kcmkonsole/Makefile.in 2005-05-24 16:27:52.674350338 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11526,21 +10010,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/kcmlaunch/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmlaunch/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/kcmlaunch/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/kcmlaunch/Makefile.in 2005-05-07 12:35:03.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/kcmlaunch/Makefile.in kdebase-3.4.1/doc/kcontrol/kcmlaunch/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/kcmlaunch/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/kcmlaunch/Makefile.in 2005-05-24 16:27:52.686349255 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11572,21 +10044,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/kcmnotify/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmnotify/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/kcmnotify/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/kcmnotify/Makefile.in 2005-05-07 12:35:03.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/kcmnotify/Makefile.in kdebase-3.4.1/doc/kcontrol/kcmnotify/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/kcmnotify/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/kcmnotify/Makefile.in 2005-05-24 16:27:52.697348261 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11618,21 +10078,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/kcmsmserver/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmsmserver/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/kcmsmserver/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/kcmsmserver/Makefile.in 2005-05-07 12:35:03.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/kcmsmserver/Makefile.in kdebase-3.4.1/doc/kcontrol/kcmsmserver/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/kcmsmserver/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/kcmsmserver/Makefile.in 2005-05-24 16:27:52.706347448 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11664,21 +10112,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/kcmstyle/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmstyle/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/kcmstyle/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/kcmstyle/Makefile.in 2005-05-07 12:35:03.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/kcmstyle/Makefile.in kdebase-3.4.1/doc/kcontrol/kcmstyle/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/kcmstyle/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/kcmstyle/Makefile.in 2005-05-24 16:27:52.716346545 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11710,21 +10146,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/kcmtaskbar/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmtaskbar/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/kcmtaskbar/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/kcmtaskbar/Makefile.in 2005-05-07 12:35:03.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/kcmtaskbar/Makefile.in kdebase-3.4.1/doc/kcontrol/kcmtaskbar/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/kcmtaskbar/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/kcmtaskbar/Makefile.in 2005-05-24 16:27:52.725345732 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11756,21 +10180,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/kdm/Makefile.in kdebase-3.4.0/doc/kcontrol/kdm/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/kdm/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/kdm/Makefile.in 2005-05-07 12:35:03.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/kdm/Makefile.in kdebase-3.4.1/doc/kcontrol/kdm/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/kdm/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/kdm/Makefile.in 2005-05-24 16:27:52.735344829 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11802,21 +10214,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/keyboard/Makefile.in kdebase-3.4.0/doc/kcontrol/keyboard/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/keyboard/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/keyboard/Makefile.in 2005-05-07 12:35:03.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/keyboard/Makefile.in kdebase-3.4.1/doc/kcontrol/keyboard/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/keyboard/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/keyboard/Makefile.in 2005-05-24 16:27:52.744344016 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11848,21 +10248,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/keys/Makefile.in kdebase-3.4.0/doc/kcontrol/keys/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/keys/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/keys/Makefile.in 2005-05-07 12:35:03.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/keys/Makefile.in kdebase-3.4.1/doc/kcontrol/keys/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/keys/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/keys/Makefile.in 2005-05-24 16:27:52.756342932 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11894,21 +10282,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/khtml/Makefile.in kdebase-3.4.0/doc/kcontrol/khtml/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/khtml/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/khtml/Makefile.in 2005-05-07 12:35:03.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/khtml/Makefile.in kdebase-3.4.1/doc/kcontrol/khtml/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/khtml/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/khtml/Makefile.in 2005-05-24 16:27:52.770341668 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11940,54 +10316,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -712,7 +715,7 @@
- KDE_DIST=index.docbook nsplugin.docbook Makefile.in Makefile.am index.cache.bz2
-
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook nsplugin.docbook
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) nsplugin.docbook index.docbook
- @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
-
- docs-am: index.cache.bz2
-@@ -739,20 +742,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/khtml
-- @for base in index.docbook nsplugin.docbook ; do \
-+ @for base in nsplugin.docbook index.docbook ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/khtml/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/khtml/$$base ;\
- done
-
- uninstall-nls:
-- for base in index.docbook nsplugin.docbook ; do \
-+ for base in nsplugin.docbook index.docbook ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/khtml/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in index.docbook nsplugin.docbook ; do \
-+ for file in nsplugin.docbook index.docbook ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/kwindecoration/Makefile.in kdebase-3.4.0/doc/kcontrol/kwindecoration/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/kwindecoration/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/kwindecoration/Makefile.in 2005-05-07 12:35:03.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/kwindecoration/Makefile.in kdebase-3.4.1/doc/kcontrol/kwindecoration/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/kwindecoration/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/kwindecoration/Makefile.in 2005-05-24 16:27:52.785340313 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12019,21 +10350,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/language/Makefile.in kdebase-3.4.0/doc/kcontrol/language/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/language/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/language/Makefile.in 2005-05-07 12:35:03.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/language/Makefile.in kdebase-3.4.1/doc/kcontrol/language/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/language/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/language/Makefile.in 2005-05-24 16:27:52.798339139 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12065,21 +10384,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/Makefile.in kdebase-3.4.0/doc/kcontrol/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/Makefile.in 2005-05-07 12:35:01.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/Makefile.in kdebase-3.4.1/doc/kcontrol/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/Makefile.in 2005-05-24 16:27:52.391375898 +0200
@@ -251,6 +251,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12090,15 +10397,6 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
- xdg_menudir = @xdg_menudir@
- #>- SUBDIRS = $(AUTODIRS)
- #>+ 1
--SUBDIRS =. arts bell background cache clock colors cookies crypto desktop desktopbehavior ebrowsing email energy filemanager filetypes fonts helpindex icons kcmaccess kcmcss kcmfontinst kcmkonsole kcmlaunch kcmnotify kcmsmserver kcmstyle kcmtaskbar kdm keyboard keys khtml kwindecoration language mouse netpref panel panelappearance passwords proxy screensaver smb spellchecking useragent windowmanagement
-+SUBDIRS =. kdm smb spellchecking bell arts keys cookies filetypes desktop cache clock email fonts icons khtml filemanager mouse panel proxy desktopbehavior passwords panelappearance ebrowsing background kcmaccess colors crypto energy kcmstyle netpref kcmlaunch kcmcss kcmnotify kcmsmserver screensaver windowmanagement kwindecoration kcmkonsole language useragent helpindex keyboard kcmtaskbar kcmfontinst
- KDE_LANG = en
- KDE_DOCS = AUTO
- #>- all: all-recursive
@@ -543,7 +546,7 @@
all: docs-am all-recursive
@@ -12120,102 +10418,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -603,7 +606,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -615,7 +624,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -623,7 +632,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -644,7 +659,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -867,7 +882,7 @@
- KDE_DIST=screenshot.png index.docbook Makefile.in Makefile.am index.cache.bz2
-
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook screenshot.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) screenshot.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
-@@ -894,20 +909,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol
-- @for base in index.docbook screenshot.png ; do \
-+ @for base in screenshot.png index.docbook ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/$$base ;\
- done
-
- uninstall-nls:
-- for base in index.docbook screenshot.png ; do \
-+ for base in screenshot.png index.docbook ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in index.docbook screenshot.png ; do \
-+ for file in screenshot.png index.docbook ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/mouse/Makefile.in kdebase-3.4.0/doc/kcontrol/mouse/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/mouse/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/mouse/Makefile.in 2005-05-07 12:35:03.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/mouse/Makefile.in kdebase-3.4.1/doc/kcontrol/mouse/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/mouse/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/mouse/Makefile.in 2005-05-24 16:27:52.812337875 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12247,21 +10452,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/netpref/Makefile.in kdebase-3.4.0/doc/kcontrol/netpref/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/netpref/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/netpref/Makefile.in 2005-05-07 12:35:04.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/netpref/Makefile.in kdebase-3.4.1/doc/kcontrol/netpref/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/netpref/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/netpref/Makefile.in 2005-05-24 16:27:52.825336701 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12293,21 +10486,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/panel/Makefile.in kdebase-3.4.0/doc/kcontrol/panel/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/panel/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/panel/Makefile.in 2005-05-07 12:35:04.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/panel/Makefile.in kdebase-3.4.1/doc/kcontrol/panel/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/panel/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/panel/Makefile.in 2005-05-24 16:27:52.838335526 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12339,21 +10520,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/panelappearance/Makefile.in kdebase-3.4.0/doc/kcontrol/panelappearance/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/panelappearance/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/panelappearance/Makefile.in 2005-05-07 12:35:04.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/panelappearance/Makefile.in kdebase-3.4.1/doc/kcontrol/panelappearance/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/panelappearance/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/panelappearance/Makefile.in 2005-05-24 16:27:52.851334352 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12385,21 +10554,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/passwords/Makefile.in kdebase-3.4.0/doc/kcontrol/passwords/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/passwords/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/passwords/Makefile.in 2005-05-07 12:35:04.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/passwords/Makefile.in kdebase-3.4.1/doc/kcontrol/passwords/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/passwords/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/passwords/Makefile.in 2005-05-24 16:27:52.864333178 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12431,21 +10588,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/proxy/Makefile.in kdebase-3.4.0/doc/kcontrol/proxy/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/proxy/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/proxy/Makefile.in 2005-05-07 12:35:04.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/proxy/Makefile.in kdebase-3.4.1/doc/kcontrol/proxy/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/proxy/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/proxy/Makefile.in 2005-05-24 16:27:52.877332004 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12477,54 +10622,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -712,7 +715,7 @@
- KDE_DIST=socks.docbook index.docbook Makefile.in Makefile.am index.cache.bz2
-
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook socks.docbook
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) socks.docbook index.docbook
- @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
-
- docs-am: index.cache.bz2
-@@ -739,20 +742,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/proxy
-- @for base in index.docbook socks.docbook ; do \
-+ @for base in socks.docbook index.docbook ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/proxy/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/proxy/$$base ;\
- done
-
- uninstall-nls:
-- for base in index.docbook socks.docbook ; do \
-+ for base in socks.docbook index.docbook ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/proxy/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in index.docbook socks.docbook ; do \
-+ for file in socks.docbook index.docbook ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/screensaver/Makefile.in kdebase-3.4.0/doc/kcontrol/screensaver/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/screensaver/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/screensaver/Makefile.in 2005-05-07 12:35:04.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/screensaver/Makefile.in kdebase-3.4.1/doc/kcontrol/screensaver/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/screensaver/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/screensaver/Makefile.in 2005-05-24 16:27:52.890330830 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12556,21 +10656,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/smb/Makefile.in kdebase-3.4.0/doc/kcontrol/smb/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/smb/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/smb/Makefile.in 2005-05-07 12:35:04.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/smb/Makefile.in kdebase-3.4.1/doc/kcontrol/smb/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/smb/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/smb/Makefile.in 2005-05-24 16:27:52.903329656 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12602,21 +10690,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/spellchecking/Makefile.in kdebase-3.4.0/doc/kcontrol/spellchecking/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/spellchecking/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/spellchecking/Makefile.in 2005-05-07 12:35:04.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/spellchecking/Makefile.in kdebase-3.4.1/doc/kcontrol/spellchecking/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/spellchecking/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/spellchecking/Makefile.in 2005-05-24 16:27:52.916328482 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12648,21 +10724,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/useragent/Makefile.in kdebase-3.4.0/doc/kcontrol/useragent/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/useragent/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/useragent/Makefile.in 2005-05-07 12:35:04.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/useragent/Makefile.in kdebase-3.4.1/doc/kcontrol/useragent/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/useragent/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/useragent/Makefile.in 2005-05-24 16:27:52.929327308 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12694,21 +10758,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kcontrol/windowmanagement/Makefile.in kdebase-3.4.0/doc/kcontrol/windowmanagement/Makefile.in
---- kdebase-3.4.0.orig/doc/kcontrol/windowmanagement/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/windowmanagement/Makefile.in 2005-05-07 12:35:04.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kcontrol/windowmanagement/Makefile.in kdebase-3.4.1/doc/kcontrol/windowmanagement/Makefile.in
+--- kdebase-3.4.1.orig/doc/kcontrol/windowmanagement/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kcontrol/windowmanagement/Makefile.in 2005-05-24 16:27:52.943326043 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12740,21 +10792,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kdcop/Makefile.in kdebase-3.4.0/doc/kdcop/Makefile.in
---- kdebase-3.4.0.orig/doc/kdcop/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kdcop/Makefile.in 2005-05-07 12:35:04.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kdcop/Makefile.in kdebase-3.4.1/doc/kdcop/Makefile.in
+--- kdebase-3.4.1.orig/doc/kdcop/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kdcop/Makefile.in 2005-05-24 16:27:52.955324959 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12786,21 +10826,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kdebugdialog/Makefile.in kdebase-3.4.0/doc/kdebugdialog/Makefile.in
---- kdebase-3.4.0.orig/doc/kdebugdialog/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kdebugdialog/Makefile.in 2005-05-07 12:35:04.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kdebugdialog/Makefile.in kdebase-3.4.1/doc/kdebugdialog/Makefile.in
+--- kdebase-3.4.1.orig/doc/kdebugdialog/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kdebugdialog/Makefile.in 2005-05-24 16:27:52.964324147 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12832,21 +10860,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kdeprint/Makefile.in kdebase-3.4.0/doc/kdeprint/Makefile.in
---- kdebase-3.4.0.orig/doc/kdeprint/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kdeprint/Makefile.in 2005-05-07 12:35:04.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kdeprint/Makefile.in kdebase-3.4.1/doc/kdeprint/Makefile.in
+--- kdebase-3.4.1.orig/doc/kdeprint/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kdeprint/Makefile.in 2005-05-24 16:27:52.977322972 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12878,58 +10894,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -709,10 +712,10 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=lpr-bsd.docbook steinbruch_scaled.png cupsserverconfiguration_securityoverview.png tech-overview.docbook kcontrol-icon.png cupsserverconfiguration12_browsingtimeouts.png cupsserverconfiguration11_browsingconnections.png highlights.docbook cupsaddprinterwizard4_networkscan_config.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png cr32-action-wizard.png kprinter-as-netscape-printcommand.png kprinter.png lprng.docbook cupsserverconfiguration_resourceadminaddprinters_defineaccess.png kprinter_called_from_run_command.png index.docbook cups-filterarchitecture-kivio-70Percent-scaled.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png cupsoptions.docbook cupsserverconfiguration_resourceadminaccessmasks.png cupsaddprinterwizard3_networkscan_results.png ps-boxes.png cupsaddprinterwizard3_networkscan.png final-word.docbook cupsserverconfiguration4_directories.png cupsserverconfiguration10_browsinggeneral.png external-command.docbook getting-started.docbook kdeprint-jobviewer.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfiguration14_browsingrelay.png Makefile.in cupsserverconfiguration7_miscellanious.png cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration5_HTTP.png cupsaddprinterwizard1.png cups-config.docbook cupsserverconfiguration9_networkclients.png cupsserverconfig_browse_relay_add_button.png add-printer-wiz.docbook cupsserverconfiguration_resourceadminauthorization.png rlpr.docbook kprinter_with_kcron_developer_special.png cupsserverconfiguration8_networkgeneral.png lpd.docbook cupsserverconfiguration1_welcome.png cupsserverconfiguration15c_resourceallprinters_defineaccess.png cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfiguration3_logging.png cupsserverconfiguration11_browsingmasks.png kprinter-kivio.png cupsserverconfiguration6_encryption.png theory.docbook kcron_to_be_printed.png extensions.docbook Makefile.am cupsserverconfiguration2_general.png index.cache.bz2
-+KDE_DIST=lpr-bsd.docbook steinbruch_scaled.png cupsserverconfiguration_securityoverview.png tech-overview.docbook kcontrol-icon.png cupsserverconfiguration12_browsingtimeouts.png cupsserverconfiguration11_browsingconnections.png highlights.docbook cupsaddprinterwizard4_networkscan_config.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png cr32-action-wizard.png kprinter-as-netscape-printcommand.png kprinter.png lprng.docbook cupsserverconfiguration_resourceadminaddprinters_defineaccess.png index.docbook kprinter_called_from_run_command.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png cupsoptions.docbook cupsaddprinterwizard3_networkscan_results.png cupsserverconfiguration_resourceadminaccessmasks.png ps-boxes.png cupsaddprinterwizard3_networkscan.png final-word.docbook cupsserverconfiguration4_directories.png cupsserverconfiguration10_browsinggeneral.png external-command.docbook getting-started.docbook kcontrolcenter-printmanager-jobcontrol-2.png kdeprint-jobviewer.png cupsserverconfiguration14_browsingrelay.png Makefile.in cupsserverconfiguration7_miscellanious.png cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration5_HTTP.png cups-config.docbook cupsaddprinterwizard1.png cupsserverconfiguration9_networkclients.png cupsserverconfig_browse_relay_add_button.png add-printer-wiz.docbook cupsserverconfiguration_resourceadminauthorization.png kprinter_with_kcron_developer_special.png rlpr.docbook cupsserverconfiguration8_networkgeneral.png cupsserverconfiguration1_welcome.png cupsserverconfiguration15c_resourceallprinters_defineaccess.png lpd.docbook cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfiguration3_logging.png cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration6_encryption.png kprinter-kivio.png theory.docbook kcron_to_be_printed.png Makefile.am extensions.docbook cupsserverconfiguration2_general.png index.cache.bz2
-
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) add-printer-wiz.docbook cr32-action-wizard.png cups-config.docbook cups-filterarchitecture-kivio-70Percent-scaled.png cupsaddprinterwizard1.png cupsaddprinterwizard2_backendselection.png cupsaddprinterwizard3_networkscan.png cupsaddprinterwizard3_networkscan_results.png cupsaddprinterwizard4_networkscan_config.png cupsoptions.docbook cupsserverconfig_browse_relay_add_button.png cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration10_browsinggeneral.png cupsserverconfiguration11_browsingconnections.png cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration12_browsingtimeouts.png cupsserverconfiguration14_browsingrelay.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png cupsserverconfiguration15c_resourceallprinters_defineaccess.png cupsserverconfiguration1_welcome.png cupsserverconfiguration2_general.png cupsserverconfiguration3_logging.png cupsserverconfiguration4_directories.png cupsserverconfiguration5_HTTP.png cupsserverconfiguration6_encryption.png cupsserverconfiguration7_miscellanious.png cupsserverconfiguration8_networkgeneral.png cupsserverconfiguration9_networkclients.png cupsserverconfiguration_resourceadminaccessmasks.png cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration_resourceadminauthorization.png cupsserverconfiguration_securityoverview.png extensions.docbook external-command.docbook final-word.docbook getting-started.docbook highlights.docbook index.docbook kcontrol-icon.png kcontrolcenter-printmanager-jobcontrol-2.png kcron_to_be_printed.png kdeprint-jobviewer.png kprinter-as-netscape-printcommand.png kprinter-kivio.png kprinter.png kprinter_called_from_run_command.png kprinter_with_kcron_developer_special.png lpd.docbook lpr-bsd.docbook lprng.docbook ps-boxes.png rlpr.docbook steinbruch_scaled.png tech-overview.docbook theory.docbook
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfiguration5_HTTP.png cupsaddprinterwizard3_networkscan.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png ps-boxes.png kcontrol-icon.png tech-overview.docbook cupsserverconfig_browsingmasks_add_button.png kprinter_called_from_run_command.png kcron_to_be_printed.png kdeprint-jobviewer.png cupsserverconfiguration8_networkgeneral.png theory.docbook cupsaddprinterwizard1.png cupsoptions.docbook cupsaddprinterwizard4_networkscan_config.png external-command.docbook kprinter.png cupsserverconfiguration10_browsinggeneral.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsserverconfiguration3_logging.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration7_miscellanious.png cupsserverconfiguration4_directories.png extensions.docbook kprinter-kivio.png cupsserverconfiguration_securityoverview.png lpd.docbook cupsserverconfiguration14_browsingrelay.png cupsserverconfiguration15c_resourceallprinters_defineaccess.png cr32-action-wizard.png cupsserverconfiguration_resourceadminaccessmasks.png rlpr.docbook kprinter-as-netscape-printcommand.png cupsserverconfiguration1_welcome.png highlights.docbook getting-started.docbook kprinter_with_kcron_developer_special.png cupsserverconfiguration12_browsingtimeouts.png add-printer-wiz.docbook cupsaddprinterwizard3_networkscan_results.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png final-word.docbook cupsserverconfiguration2_general.png cups-config.docbook steinbruch_scaled.png cupsserverconfiguration11_browsingconnections.png index.docbook cupsserverconfiguration_resourceadminauthorization.png cupsserverconfiguration11_browsingmasks.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfig_browse_relay_add_button.png lpr-bsd.docbook cupsserverconfiguration6_encryption.png lprng.docbook cupsserverconfiguration9_networkclients.png
- @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
-
- docs-am: index.cache.bz2
-@@ -739,20 +742,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdeprint
-- @for base in add-printer-wiz.docbook cr32-action-wizard.png cups-config.docbook cups-filterarchitecture-kivio-70Percent-scaled.png cupsaddprinterwizard1.png cupsaddprinterwizard2_backendselection.png cupsaddprinterwizard3_networkscan.png cupsaddprinterwizard3_networkscan_results.png cupsaddprinterwizard4_networkscan_config.png cupsoptions.docbook cupsserverconfig_browse_relay_add_button.png cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration10_browsinggeneral.png cupsserverconfiguration11_browsingconnections.png cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration12_browsingtimeouts.png cupsserverconfiguration14_browsingrelay.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png cupsserverconfiguration15c_resourceallprinters_defineaccess.png cupsserverconfiguration1_welcome.png cupsserverconfiguration2_general.png cupsserverconfiguration3_logging.png cupsserverconfiguration4_directories.png cupsserverconfiguration5_HTTP.png cupsserverconfiguration6_encryption.png cupsserverconfiguration7_miscellanious.png cupsserverconfiguration8_networkgeneral.png cupsserverconfiguration9_networkclients.png cupsserverconfiguration_resourceadminaccessmasks.png cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration_resourceadminauthorization.png cupsserverconfiguration_securityoverview.png extensions.docbook external-command.docbook final-word.docbook getting-started.docbook highlights.docbook index.docbook kcontrol-icon.png kcontrolcenter-printmanager-jobcontrol-2.png kcron_to_be_printed.png kdeprint-jobviewer.png kprinter-as-netscape-printcommand.png kprinter-kivio.png kprinter.png kprinter_called_from_run_command.png kprinter_with_kcron_developer_special.png lpd.docbook lpr-bsd.docbook lprng.docbook ps-boxes.png rlpr.docbook steinbruch_scaled.png tech-overview.docbook theory.docbook ; do \
-+ @for base in cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfiguration5_HTTP.png cupsaddprinterwizard3_networkscan.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png ps-boxes.png kcontrol-icon.png tech-overview.docbook cupsserverconfig_browsingmasks_add_button.png kprinter_called_from_run_command.png kcron_to_be_printed.png kdeprint-jobviewer.png cupsserverconfiguration8_networkgeneral.png theory.docbook cupsaddprinterwizard1.png cupsoptions.docbook cupsaddprinterwizard4_networkscan_config.png external-command.docbook kprinter.png cupsserverconfiguration10_browsinggeneral.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsserverconfiguration3_logging.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration7_miscellanious.png cupsserverconfiguration4_directories.png extensions.docbook kprinter-kivio.png cupsserverconfiguration_securityoverview.png lpd.docbook cupsserverconfiguration14_browsingrelay.png cupsserverconfiguration15c_resourceallprinters_defineaccess.png cr32-action-wizard.png cupsserverconfiguration_resourceadminaccessmasks.png rlpr.docbook kprinter-as-netscape-printcommand.png cupsserverconfiguration1_welcome.png highlights.docbook getting-started.docbook kprinter_with_kcron_developer_special.png cupsserverconfiguration12_browsingtimeouts.png add-printer-wiz.docbook cupsaddprinterwizard3_networkscan_results.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png final-word.docbook cupsserverconfiguration2_general.png cups-config.docbook steinbruch_scaled.png cupsserverconfiguration11_browsingconnections.png index.docbook cupsserverconfiguration_resourceadminauthorization.png cupsserverconfiguration11_browsingmasks.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfig_browse_relay_add_button.png lpr-bsd.docbook cupsserverconfiguration6_encryption.png lprng.docbook cupsserverconfiguration9_networkclients.png ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdeprint/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdeprint/$$base ;\
- done
-
- uninstall-nls:
-- for base in add-printer-wiz.docbook cr32-action-wizard.png cups-config.docbook cups-filterarchitecture-kivio-70Percent-scaled.png cupsaddprinterwizard1.png cupsaddprinterwizard2_backendselection.png cupsaddprinterwizard3_networkscan.png cupsaddprinterwizard3_networkscan_results.png cupsaddprinterwizard4_networkscan_config.png cupsoptions.docbook cupsserverconfig_browse_relay_add_button.png cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration10_browsinggeneral.png cupsserverconfiguration11_browsingconnections.png cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration12_browsingtimeouts.png cupsserverconfiguration14_browsingrelay.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png cupsserverconfiguration15c_resourceallprinters_defineaccess.png cupsserverconfiguration1_welcome.png cupsserverconfiguration2_general.png cupsserverconfiguration3_logging.png cupsserverconfiguration4_directories.png cupsserverconfiguration5_HTTP.png cupsserverconfiguration6_encryption.png cupsserverconfiguration7_miscellanious.png cupsserverconfiguration8_networkgeneral.png cupsserverconfiguration9_networkclients.png cupsserverconfiguration_resourceadminaccessmasks.png cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration_resourceadminauthorization.png cupsserverconfiguration_securityoverview.png extensions.docbook external-command.docbook final-word.docbook getting-started.docbook highlights.docbook index.docbook kcontrol-icon.png kcontrolcenter-printmanager-jobcontrol-2.png kcron_to_be_printed.png kdeprint-jobviewer.png kprinter-as-netscape-printcommand.png kprinter-kivio.png kprinter.png kprinter_called_from_run_command.png kprinter_with_kcron_developer_special.png lpd.docbook lpr-bsd.docbook lprng.docbook ps-boxes.png rlpr.docbook steinbruch_scaled.png tech-overview.docbook theory.docbook ; do \
-+ for base in cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfiguration5_HTTP.png cupsaddprinterwizard3_networkscan.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png ps-boxes.png kcontrol-icon.png tech-overview.docbook cupsserverconfig_browsingmasks_add_button.png kprinter_called_from_run_command.png kcron_to_be_printed.png kdeprint-jobviewer.png cupsserverconfiguration8_networkgeneral.png theory.docbook cupsaddprinterwizard1.png cupsoptions.docbook cupsaddprinterwizard4_networkscan_config.png external-command.docbook kprinter.png cupsserverconfiguration10_browsinggeneral.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsserverconfiguration3_logging.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration7_miscellanious.png cupsserverconfiguration4_directories.png extensions.docbook kprinter-kivio.png cupsserverconfiguration_securityoverview.png lpd.docbook cupsserverconfiguration14_browsingrelay.png cupsserverconfiguration15c_resourceallprinters_defineaccess.png cr32-action-wizard.png cupsserverconfiguration_resourceadminaccessmasks.png rlpr.docbook kprinter-as-netscape-printcommand.png cupsserverconfiguration1_welcome.png highlights.docbook getting-started.docbook kprinter_with_kcron_developer_special.png cupsserverconfiguration12_browsingtimeouts.png add-printer-wiz.docbook cupsaddprinterwizard3_networkscan_results.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png final-word.docbook cupsserverconfiguration2_general.png cups-config.docbook steinbruch_scaled.png cupsserverconfiguration11_browsingconnections.png index.docbook cupsserverconfiguration_resourceadminauthorization.png cupsserverconfiguration11_browsingmasks.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfig_browse_relay_add_button.png lpr-bsd.docbook cupsserverconfiguration6_encryption.png lprng.docbook cupsserverconfiguration9_networkclients.png ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdeprint/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in add-printer-wiz.docbook cr32-action-wizard.png cups-config.docbook cups-filterarchitecture-kivio-70Percent-scaled.png cupsaddprinterwizard1.png cupsaddprinterwizard2_backendselection.png cupsaddprinterwizard3_networkscan.png cupsaddprinterwizard3_networkscan_results.png cupsaddprinterwizard4_networkscan_config.png cupsoptions.docbook cupsserverconfig_browse_relay_add_button.png cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration10_browsinggeneral.png cupsserverconfiguration11_browsingconnections.png cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration12_browsingtimeouts.png cupsserverconfiguration14_browsingrelay.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png cupsserverconfiguration15c_resourceallprinters_defineaccess.png cupsserverconfiguration1_welcome.png cupsserverconfiguration2_general.png cupsserverconfiguration3_logging.png cupsserverconfiguration4_directories.png cupsserverconfiguration5_HTTP.png cupsserverconfiguration6_encryption.png cupsserverconfiguration7_miscellanious.png cupsserverconfiguration8_networkgeneral.png cupsserverconfiguration9_networkclients.png cupsserverconfiguration_resourceadminaccessmasks.png cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration_resourceadminauthorization.png cupsserverconfiguration_securityoverview.png extensions.docbook external-command.docbook final-word.docbook getting-started.docbook highlights.docbook index.docbook kcontrol-icon.png kcontrolcenter-printmanager-jobcontrol-2.png kcron_to_be_printed.png kdeprint-jobviewer.png kprinter-as-netscape-printcommand.png kprinter-kivio.png kprinter.png kprinter_called_from_run_command.png kprinter_with_kcron_developer_special.png lpd.docbook lpr-bsd.docbook lprng.docbook ps-boxes.png rlpr.docbook steinbruch_scaled.png tech-overview.docbook theory.docbook ; do \
-+ for file in cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfiguration5_HTTP.png cupsaddprinterwizard3_networkscan.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png ps-boxes.png kcontrol-icon.png tech-overview.docbook cupsserverconfig_browsingmasks_add_button.png kprinter_called_from_run_command.png kcron_to_be_printed.png kdeprint-jobviewer.png cupsserverconfiguration8_networkgeneral.png theory.docbook cupsaddprinterwizard1.png cupsoptions.docbook cupsaddprinterwizard4_networkscan_config.png external-command.docbook kprinter.png cupsserverconfiguration10_browsinggeneral.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsserverconfiguration3_logging.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration7_miscellanious.png cupsserverconfiguration4_directories.png extensions.docbook kprinter-kivio.png cupsserverconfiguration_securityoverview.png lpd.docbook cupsserverconfiguration14_browsingrelay.png cupsserverconfiguration15c_resourceallprinters_defineaccess.png cr32-action-wizard.png cupsserverconfiguration_resourceadminaccessmasks.png rlpr.docbook kprinter-as-netscape-printcommand.png cupsserverconfiguration1_welcome.png highlights.docbook getting-started.docbook kprinter_with_kcron_developer_special.png cupsserverconfiguration12_browsingtimeouts.png add-printer-wiz.docbook cupsaddprinterwizard3_networkscan_results.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png final-word.docbook cupsserverconfiguration2_general.png cups-config.docbook steinbruch_scaled.png cupsserverconfiguration11_browsingconnections.png index.docbook cupsserverconfiguration_resourceadminauthorization.png cupsserverconfiguration11_browsingmasks.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfig_browse_relay_add_button.png lpr-bsd.docbook cupsserverconfiguration6_encryption.png lprng.docbook cupsserverconfiguration9_networkclients.png ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
-diff -Nru kdebase-3.4.0.orig/doc/kdesu/Makefile.in kdebase-3.4.0/doc/kdesu/Makefile.in
---- kdebase-3.4.0.orig/doc/kdesu/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kdesu/Makefile.in 2005-05-07 12:35:04.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kdesu/Makefile.in kdebase-3.4.1/doc/kdesu/Makefile.in
+--- kdebase-3.4.1.orig/doc/kdesu/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kdesu/Makefile.in 2005-05-24 16:27:52.987322069 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12961,21 +10928,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kdm/Makefile.in kdebase-3.4.0/doc/kdm/Makefile.in
---- kdebase-3.4.0.orig/doc/kdm/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kdm/Makefile.in 2005-05-07 12:35:04.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kdm/Makefile.in kdebase-3.4.1/doc/kdm/Makefile.in
+--- kdebase-3.4.1.orig/doc/kdm/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kdm/Makefile.in 2005-05-24 16:27:52.997321166 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13007,54 +10962,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -716,7 +719,7 @@
- KDE_DIST=index.docbook kdmrc-ref.docbook Makefile.in Makefile.am index.cache.bz2
-
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook kdmrc-ref.docbook
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kdmrc-ref.docbook index.docbook
- @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
-
- docs-am: index.cache.bz2
-@@ -743,20 +746,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdm
-- @for base in index.docbook kdmrc-ref.docbook ; do \
-+ @for base in kdmrc-ref.docbook index.docbook ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdm/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdm/$$base ;\
- done
-
- uninstall-nls:
-- for base in index.docbook kdmrc-ref.docbook ; do \
-+ for base in kdmrc-ref.docbook index.docbook ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdm/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in index.docbook kdmrc-ref.docbook ; do \
-+ for file in kdmrc-ref.docbook index.docbook ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
-diff -Nru kdebase-3.4.0.orig/doc/kfind/Makefile.in kdebase-3.4.0/doc/kfind/Makefile.in
---- kdebase-3.4.0.orig/doc/kfind/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kfind/Makefile.in 2005-05-07 12:35:05.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kfind/Makefile.in kdebase-3.4.1/doc/kfind/Makefile.in
+--- kdebase-3.4.1.orig/doc/kfind/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kfind/Makefile.in 2005-05-24 16:27:53.006320353 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13086,21 +10996,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/khelpcenter/Makefile.in kdebase-3.4.0/doc/khelpcenter/Makefile.in
---- kdebase-3.4.0.orig/doc/khelpcenter/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/khelpcenter/Makefile.in 2005-05-07 12:35:05.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/khelpcenter/Makefile.in kdebase-3.4.1/doc/khelpcenter/Makefile.in
+--- kdebase-3.4.1.orig/doc/khelpcenter/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/khelpcenter/Makefile.in 2005-05-24 16:27:53.020319089 +0200
@@ -251,6 +251,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13132,102 +11030,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -603,7 +606,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -615,7 +624,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -623,7 +632,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -644,7 +659,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -867,7 +882,7 @@
- KDE_DIST=whatiskde.docbook kdelogo2.png support.docbook index.docbook khelpcenter.png shadow1.png pointers.png konq.css Makefile.in lines2.png help.docbook lines.png welcome.docbook contact.docbook Makefile.am background.png index.cache.bz2 bgtable.png
-
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) background.png bgtable.png contact.docbook help.docbook index.docbook kdelogo2.png khelpcenter.png konq.css lines.png lines2.png pointers.png shadow1.png support.docbook welcome.docbook whatiskde.docbook
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) background.png lines2.png konq.css khelpcenter.png support.docbook bgtable.png welcome.docbook help.docbook kdelogo2.png lines.png contact.docbook whatiskde.docbook pointers.png index.docbook shadow1.png
- @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
-
- docs-am: index.cache.bz2
-@@ -894,20 +909,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter
-- @for base in background.png bgtable.png contact.docbook help.docbook index.docbook kdelogo2.png khelpcenter.png konq.css lines.png lines2.png pointers.png shadow1.png support.docbook welcome.docbook whatiskde.docbook ; do \
-+ @for base in background.png lines2.png konq.css khelpcenter.png support.docbook bgtable.png welcome.docbook help.docbook kdelogo2.png lines.png contact.docbook whatiskde.docbook pointers.png index.docbook shadow1.png ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/$$base ;\
- done
-
- uninstall-nls:
-- for base in background.png bgtable.png contact.docbook help.docbook index.docbook kdelogo2.png khelpcenter.png konq.css lines.png lines2.png pointers.png shadow1.png support.docbook welcome.docbook whatiskde.docbook ; do \
-+ for base in background.png lines2.png konq.css khelpcenter.png support.docbook bgtable.png welcome.docbook help.docbook kdelogo2.png lines.png contact.docbook whatiskde.docbook pointers.png index.docbook shadow1.png ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in background.png bgtable.png contact.docbook help.docbook index.docbook kdelogo2.png khelpcenter.png konq.css lines.png lines2.png pointers.png shadow1.png support.docbook welcome.docbook whatiskde.docbook ; do \
-+ for file in background.png lines2.png konq.css khelpcenter.png support.docbook bgtable.png welcome.docbook help.docbook kdelogo2.png lines.png contact.docbook whatiskde.docbook pointers.png index.docbook shadow1.png ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
-diff -Nru kdebase-3.4.0.orig/doc/kicker/Makefile.in kdebase-3.4.0/doc/kicker/Makefile.in
---- kdebase-3.4.0.orig/doc/kicker/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kicker/Makefile.in 2005-05-07 12:35:05.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kicker/Makefile.in kdebase-3.4.1/doc/kicker/Makefile.in
+--- kdebase-3.4.1.orig/doc/kicker/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kicker/Makefile.in 2005-05-24 16:27:53.034317824 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13259,58 +11064,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -709,10 +712,10 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=k_menu_icon.png screenshot_right.png bookmarks_icon.png index.docbook recent_docs_icon.png desktop_icon.png screenshot_left.png windowlist_icon.png Makefile.in quickbrowser_icon.png terminals_icon.png printsys_icon.png Makefile.am taskbar_group.png index.cache.bz2
-+KDE_DIST=k_menu_icon.png bookmarks_icon.png screenshot_right.png index.docbook recent_docs_icon.png desktop_icon.png screenshot_left.png windowlist_icon.png Makefile.in quickbrowser_icon.png terminals_icon.png printsys_icon.png Makefile.am taskbar_group.png index.cache.bz2
-
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) bookmarks_icon.png desktop_icon.png index.docbook k_menu_icon.png printsys_icon.png quickbrowser_icon.png recent_docs_icon.png screenshot_left.png screenshot_right.png taskbar_group.png terminals_icon.png windowlist_icon.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) quickbrowser_icon.png taskbar_group.png printsys_icon.png terminals_icon.png screenshot_right.png windowlist_icon.png k_menu_icon.png screenshot_left.png desktop_icon.png recent_docs_icon.png index.docbook bookmarks_icon.png
- @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
-
- docs-am: index.cache.bz2
-@@ -739,20 +742,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kicker
-- @for base in bookmarks_icon.png desktop_icon.png index.docbook k_menu_icon.png printsys_icon.png quickbrowser_icon.png recent_docs_icon.png screenshot_left.png screenshot_right.png taskbar_group.png terminals_icon.png windowlist_icon.png ; do \
-+ @for base in quickbrowser_icon.png taskbar_group.png printsys_icon.png terminals_icon.png screenshot_right.png windowlist_icon.png k_menu_icon.png screenshot_left.png desktop_icon.png recent_docs_icon.png index.docbook bookmarks_icon.png ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kicker/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kicker/$$base ;\
- done
-
- uninstall-nls:
-- for base in bookmarks_icon.png desktop_icon.png index.docbook k_menu_icon.png printsys_icon.png quickbrowser_icon.png recent_docs_icon.png screenshot_left.png screenshot_right.png taskbar_group.png terminals_icon.png windowlist_icon.png ; do \
-+ for base in quickbrowser_icon.png taskbar_group.png printsys_icon.png terminals_icon.png screenshot_right.png windowlist_icon.png k_menu_icon.png screenshot_left.png desktop_icon.png recent_docs_icon.png index.docbook bookmarks_icon.png ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kicker/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in bookmarks_icon.png desktop_icon.png index.docbook k_menu_icon.png printsys_icon.png quickbrowser_icon.png recent_docs_icon.png screenshot_left.png screenshot_right.png taskbar_group.png terminals_icon.png windowlist_icon.png ; do \
-+ for file in quickbrowser_icon.png taskbar_group.png printsys_icon.png terminals_icon.png screenshot_right.png windowlist_icon.png k_menu_icon.png screenshot_left.png desktop_icon.png recent_docs_icon.png index.docbook bookmarks_icon.png ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
-diff -Nru kdebase-3.4.0.orig/doc/kinfocenter/devices/Makefile.in kdebase-3.4.0/doc/kinfocenter/devices/Makefile.in
---- kdebase-3.4.0.orig/doc/kinfocenter/devices/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/devices/Makefile.in 2005-05-07 12:35:05.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kinfocenter/devices/Makefile.in kdebase-3.4.1/doc/kinfocenter/devices/Makefile.in
+--- kdebase-3.4.1.orig/doc/kinfocenter/devices/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kinfocenter/devices/Makefile.in 2005-05-24 16:27:53.064315115 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13342,21 +11098,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kinfocenter/dma/Makefile.in kdebase-3.4.0/doc/kinfocenter/dma/Makefile.in
---- kdebase-3.4.0.orig/doc/kinfocenter/dma/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/dma/Makefile.in 2005-05-07 12:35:05.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kinfocenter/dma/Makefile.in kdebase-3.4.1/doc/kinfocenter/dma/Makefile.in
+--- kdebase-3.4.1.orig/doc/kinfocenter/dma/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kinfocenter/dma/Makefile.in 2005-05-24 16:27:53.077313941 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13388,21 +11132,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kinfocenter/interrupts/Makefile.in kdebase-3.4.0/doc/kinfocenter/interrupts/Makefile.in
---- kdebase-3.4.0.orig/doc/kinfocenter/interrupts/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/interrupts/Makefile.in 2005-05-07 12:35:05.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kinfocenter/interrupts/Makefile.in kdebase-3.4.1/doc/kinfocenter/interrupts/Makefile.in
+--- kdebase-3.4.1.orig/doc/kinfocenter/interrupts/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kinfocenter/interrupts/Makefile.in 2005-05-24 16:27:53.092312586 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13434,21 +11166,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kinfocenter/ioports/Makefile.in kdebase-3.4.0/doc/kinfocenter/ioports/Makefile.in
---- kdebase-3.4.0.orig/doc/kinfocenter/ioports/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/ioports/Makefile.in 2005-05-07 12:35:05.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kinfocenter/ioports/Makefile.in kdebase-3.4.1/doc/kinfocenter/ioports/Makefile.in
+--- kdebase-3.4.1.orig/doc/kinfocenter/ioports/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kinfocenter/ioports/Makefile.in 2005-05-24 16:27:53.106311322 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13480,21 +11200,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kinfocenter/Makefile.in kdebase-3.4.0/doc/kinfocenter/Makefile.in
---- kdebase-3.4.0.orig/doc/kinfocenter/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/Makefile.in 2005-05-07 12:35:05.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kinfocenter/Makefile.in kdebase-3.4.1/doc/kinfocenter/Makefile.in
+--- kdebase-3.4.1.orig/doc/kinfocenter/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kinfocenter/Makefile.in 2005-05-24 16:27:53.051316289 +0200
@@ -251,6 +251,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13505,15 +11213,6 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
- xdg_menudir = @xdg_menudir@
- #>- SUBDIRS = $(AUTODIRS)
- #>+ 1
--SUBDIRS =. devices dma interrupts ioports memory nics opengl partitions pci pcmcia processor protocols samba scsi sound usb xserver
-+SUBDIRS =. dma pci usb nics scsi interrupts devices xserver samba sound partitions memory pcmcia opengl processor ioports protocols
- KDE_LANG = en
- KDE_DOCS = AUTO
- #>- all: all-recursive
@@ -543,7 +546,7 @@
all: docs-am all-recursive
@@ -13535,69 +11234,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -603,7 +606,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -615,7 +624,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -623,7 +632,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -644,7 +659,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/doc/kinfocenter/memory/Makefile.in kdebase-3.4.0/doc/kinfocenter/memory/Makefile.in
---- kdebase-3.4.0.orig/doc/kinfocenter/memory/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/memory/Makefile.in 2005-05-07 12:35:05.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kinfocenter/memory/Makefile.in kdebase-3.4.1/doc/kinfocenter/memory/Makefile.in
+--- kdebase-3.4.1.orig/doc/kinfocenter/memory/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kinfocenter/memory/Makefile.in 2005-05-24 16:27:53.120310057 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13629,21 +11268,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kinfocenter/nics/Makefile.in kdebase-3.4.0/doc/kinfocenter/nics/Makefile.in
---- kdebase-3.4.0.orig/doc/kinfocenter/nics/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/nics/Makefile.in 2005-05-07 12:35:05.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kinfocenter/nics/Makefile.in kdebase-3.4.1/doc/kinfocenter/nics/Makefile.in
+--- kdebase-3.4.1.orig/doc/kinfocenter/nics/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kinfocenter/nics/Makefile.in 2005-05-24 16:27:53.135308702 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13675,21 +11302,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kinfocenter/opengl/Makefile.in kdebase-3.4.0/doc/kinfocenter/opengl/Makefile.in
---- kdebase-3.4.0.orig/doc/kinfocenter/opengl/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/opengl/Makefile.in 2005-05-07 12:35:05.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kinfocenter/opengl/Makefile.in kdebase-3.4.1/doc/kinfocenter/opengl/Makefile.in
+--- kdebase-3.4.1.orig/doc/kinfocenter/opengl/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kinfocenter/opengl/Makefile.in 2005-05-24 16:27:53.150307348 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13721,21 +11336,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kinfocenter/partitions/Makefile.in kdebase-3.4.0/doc/kinfocenter/partitions/Makefile.in
---- kdebase-3.4.0.orig/doc/kinfocenter/partitions/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/partitions/Makefile.in 2005-05-07 12:35:05.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kinfocenter/partitions/Makefile.in kdebase-3.4.1/doc/kinfocenter/partitions/Makefile.in
+--- kdebase-3.4.1.orig/doc/kinfocenter/partitions/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kinfocenter/partitions/Makefile.in 2005-05-24 16:27:53.162306264 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13767,21 +11370,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kinfocenter/pci/Makefile.in kdebase-3.4.0/doc/kinfocenter/pci/Makefile.in
---- kdebase-3.4.0.orig/doc/kinfocenter/pci/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/pci/Makefile.in 2005-05-07 12:35:05.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kinfocenter/pci/Makefile.in kdebase-3.4.1/doc/kinfocenter/pci/Makefile.in
+--- kdebase-3.4.1.orig/doc/kinfocenter/pci/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kinfocenter/pci/Makefile.in 2005-05-24 16:27:53.177304909 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13813,21 +11404,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kinfocenter/pcmcia/Makefile.in kdebase-3.4.0/doc/kinfocenter/pcmcia/Makefile.in
---- kdebase-3.4.0.orig/doc/kinfocenter/pcmcia/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/pcmcia/Makefile.in 2005-05-07 12:35:05.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kinfocenter/pcmcia/Makefile.in kdebase-3.4.1/doc/kinfocenter/pcmcia/Makefile.in
+--- kdebase-3.4.1.orig/doc/kinfocenter/pcmcia/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kinfocenter/pcmcia/Makefile.in 2005-05-24 16:27:53.190303735 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13859,21 +11438,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kinfocenter/processor/Makefile.in kdebase-3.4.0/doc/kinfocenter/processor/Makefile.in
---- kdebase-3.4.0.orig/doc/kinfocenter/processor/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/processor/Makefile.in 2005-05-07 12:35:05.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kinfocenter/processor/Makefile.in kdebase-3.4.1/doc/kinfocenter/processor/Makefile.in
+--- kdebase-3.4.1.orig/doc/kinfocenter/processor/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kinfocenter/processor/Makefile.in 2005-05-24 16:27:53.203302561 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13905,21 +11472,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kinfocenter/protocols/Makefile.in kdebase-3.4.0/doc/kinfocenter/protocols/Makefile.in
---- kdebase-3.4.0.orig/doc/kinfocenter/protocols/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/protocols/Makefile.in 2005-05-07 12:35:05.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kinfocenter/protocols/Makefile.in kdebase-3.4.1/doc/kinfocenter/protocols/Makefile.in
+--- kdebase-3.4.1.orig/doc/kinfocenter/protocols/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kinfocenter/protocols/Makefile.in 2005-05-24 16:27:53.216301387 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13951,21 +11506,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kinfocenter/samba/Makefile.in kdebase-3.4.0/doc/kinfocenter/samba/Makefile.in
---- kdebase-3.4.0.orig/doc/kinfocenter/samba/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/samba/Makefile.in 2005-05-07 12:35:05.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kinfocenter/samba/Makefile.in kdebase-3.4.1/doc/kinfocenter/samba/Makefile.in
+--- kdebase-3.4.1.orig/doc/kinfocenter/samba/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kinfocenter/samba/Makefile.in 2005-05-24 16:27:53.229300213 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13997,21 +11540,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kinfocenter/scsi/Makefile.in kdebase-3.4.0/doc/kinfocenter/scsi/Makefile.in
---- kdebase-3.4.0.orig/doc/kinfocenter/scsi/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/scsi/Makefile.in 2005-05-07 12:35:05.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kinfocenter/scsi/Makefile.in kdebase-3.4.1/doc/kinfocenter/scsi/Makefile.in
+--- kdebase-3.4.1.orig/doc/kinfocenter/scsi/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kinfocenter/scsi/Makefile.in 2005-05-24 16:27:53.242299039 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -14043,21 +11574,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kinfocenter/sound/Makefile.in kdebase-3.4.0/doc/kinfocenter/sound/Makefile.in
---- kdebase-3.4.0.orig/doc/kinfocenter/sound/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/sound/Makefile.in 2005-05-07 12:35:05.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kinfocenter/sound/Makefile.in kdebase-3.4.1/doc/kinfocenter/sound/Makefile.in
+--- kdebase-3.4.1.orig/doc/kinfocenter/sound/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kinfocenter/sound/Makefile.in 2005-05-24 16:27:53.255297864 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -14089,21 +11608,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kinfocenter/usb/Makefile.in kdebase-3.4.0/doc/kinfocenter/usb/Makefile.in
---- kdebase-3.4.0.orig/doc/kinfocenter/usb/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/usb/Makefile.in 2005-05-07 12:35:05.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kinfocenter/usb/Makefile.in kdebase-3.4.1/doc/kinfocenter/usb/Makefile.in
+--- kdebase-3.4.1.orig/doc/kinfocenter/usb/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kinfocenter/usb/Makefile.in 2005-05-24 16:27:53.268296690 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -14135,21 +11642,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kinfocenter/xserver/Makefile.in kdebase-3.4.0/doc/kinfocenter/xserver/Makefile.in
---- kdebase-3.4.0.orig/doc/kinfocenter/xserver/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/xserver/Makefile.in 2005-05-07 12:35:05.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kinfocenter/xserver/Makefile.in kdebase-3.4.1/doc/kinfocenter/xserver/Makefile.in
+--- kdebase-3.4.1.orig/doc/kinfocenter/xserver/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/kinfocenter/xserver/Makefile.in 2005-05-24 16:27:53.282295426 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -14181,21 +11676,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kioslave/Makefile.in kdebase-3.4.0/doc/kioslave/Makefile.in
---- kdebase-3.4.0.orig/doc/kioslave/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kioslave/Makefile.in 2005-05-07 12:35:05.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kioslave/Makefile.in kdebase-3.4.1/doc/kioslave/Makefile.in
+--- kdebase-3.4.1.orig/doc/kioslave/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/doc/kioslave/Makefile.in 2005-05-24 16:27:53.297294071 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -14227,58 +11710,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -709,10 +712,10 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=finger.docbook smtp.docbook pop3s.docbook bzip2.docbook imap.docbook file.docbook bzip.docbook data.docbook webdavs.docbook cgi.docbook mrml.docbook thumbnail.docbook sftp.docbook pop3.docbook index.docbook floppy.docbook print.docbook telnet.docbook http.docbook nfs.docbook nntp.docbook gopher.docbook mac.docbook news.docbook https.docbook Makefile.in rlogin.docbook man.docbook ldap.docbook mailto.docbook help.docbook gzip.docbook ftp.docbook tar.docbook imaps.docbook info.docbook fish.docbook smb.docbook rlan.docbook Makefile.am webdav.docbook lan.docbook index.cache.bz2
-+KDE_DIST=finger.docbook pop3s.docbook smtp.docbook bzip2.docbook imap.docbook bzip.docbook file.docbook data.docbook webdavs.docbook cgi.docbook mrml.docbook thumbnail.docbook sftp.docbook index.docbook pop3.docbook floppy.docbook print.docbook http.docbook telnet.docbook nfs.docbook gopher.docbook nntp.docbook mac.docbook news.docbook https.docbook Makefile.in rlogin.docbook man.docbook ldap.docbook help.docbook mailto.docbook gzip.docbook ftp.docbook tar.docbook imaps.docbook info.docbook fish.docbook smb.docbook Makefile.am rlan.docbook lan.docbook webdav.docbook index.cache.bz2
-
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) bzip.docbook bzip2.docbook cgi.docbook data.docbook file.docbook finger.docbook fish.docbook floppy.docbook ftp.docbook gopher.docbook gzip.docbook help.docbook http.docbook https.docbook imap.docbook imaps.docbook index.docbook info.docbook lan.docbook ldap.docbook mac.docbook mailto.docbook man.docbook mrml.docbook news.docbook nfs.docbook nntp.docbook pop3.docbook pop3s.docbook print.docbook rlan.docbook rlogin.docbook sftp.docbook smb.docbook smtp.docbook tar.docbook telnet.docbook thumbnail.docbook webdav.docbook webdavs.docbook
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) file.docbook nntp.docbook man.docbook print.docbook gzip.docbook sftp.docbook finger.docbook info.docbook webdav.docbook webdavs.docbook floppy.docbook smtp.docbook bzip2.docbook rlogin.docbook lan.docbook cgi.docbook pop3.docbook telnet.docbook rlan.docbook https.docbook mailto.docbook tar.docbook mrml.docbook fish.docbook smb.docbook imaps.docbook bzip.docbook ldap.docbook http.docbook help.docbook data.docbook gopher.docbook news.docbook mac.docbook pop3s.docbook index.docbook imap.docbook ftp.docbook thumbnail.docbook nfs.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
-@@ -739,20 +742,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kioslave
-- @for base in bzip.docbook bzip2.docbook cgi.docbook data.docbook file.docbook finger.docbook fish.docbook floppy.docbook ftp.docbook gopher.docbook gzip.docbook help.docbook http.docbook https.docbook imap.docbook imaps.docbook index.docbook info.docbook lan.docbook ldap.docbook mac.docbook mailto.docbook man.docbook mrml.docbook news.docbook nfs.docbook nntp.docbook pop3.docbook pop3s.docbook print.docbook rlan.docbook rlogin.docbook sftp.docbook smb.docbook smtp.docbook tar.docbook telnet.docbook thumbnail.docbook webdav.docbook webdavs.docbook ; do \
-+ @for base in file.docbook nntp.docbook man.docbook print.docbook gzip.docbook sftp.docbook finger.docbook info.docbook webdav.docbook webdavs.docbook floppy.docbook smtp.docbook bzip2.docbook rlogin.docbook lan.docbook cgi.docbook pop3.docbook telnet.docbook rlan.docbook https.docbook mailto.docbook tar.docbook mrml.docbook fish.docbook smb.docbook imaps.docbook bzip.docbook ldap.docbook http.docbook help.docbook data.docbook gopher.docbook news.docbook mac.docbook pop3s.docbook index.docbook imap.docbook ftp.docbook thumbnail.docbook nfs.docbook ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kioslave/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kioslave/$$base ;\
- done
-
- uninstall-nls:
-- for base in bzip.docbook bzip2.docbook cgi.docbook data.docbook file.docbook finger.docbook fish.docbook floppy.docbook ftp.docbook gopher.docbook gzip.docbook help.docbook http.docbook https.docbook imap.docbook imaps.docbook index.docbook info.docbook lan.docbook ldap.docbook mac.docbook mailto.docbook man.docbook mrml.docbook news.docbook nfs.docbook nntp.docbook pop3.docbook pop3s.docbook print.docbook rlan.docbook rlogin.docbook sftp.docbook smb.docbook smtp.docbook tar.docbook telnet.docbook thumbnail.docbook webdav.docbook webdavs.docbook ; do \
-+ for base in file.docbook nntp.docbook man.docbook print.docbook gzip.docbook sftp.docbook finger.docbook info.docbook webdav.docbook webdavs.docbook floppy.docbook smtp.docbook bzip2.docbook rlogin.docbook lan.docbook cgi.docbook pop3.docbook telnet.docbook rlan.docbook https.docbook mailto.docbook tar.docbook mrml.docbook fish.docbook smb.docbook imaps.docbook bzip.docbook ldap.docbook http.docbook help.docbook data.docbook gopher.docbook news.docbook mac.docbook pop3s.docbook index.docbook imap.docbook ftp.docbook thumbnail.docbook nfs.docbook ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kioslave/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in bzip.docbook bzip2.docbook cgi.docbook data.docbook file.docbook finger.docbook fish.docbook floppy.docbook ftp.docbook gopher.docbook gzip.docbook help.docbook http.docbook https.docbook imap.docbook imaps.docbook index.docbook info.docbook lan.docbook ldap.docbook mac.docbook mailto.docbook man.docbook mrml.docbook news.docbook nfs.docbook nntp.docbook pop3.docbook pop3s.docbook print.docbook rlan.docbook rlogin.docbook sftp.docbook smb.docbook smtp.docbook tar.docbook telnet.docbook thumbnail.docbook webdav.docbook webdavs.docbook ; do \
-+ for file in file.docbook nntp.docbook man.docbook print.docbook gzip.docbook sftp.docbook finger.docbook info.docbook webdav.docbook webdavs.docbook floppy.docbook smtp.docbook bzip2.docbook rlogin.docbook lan.docbook cgi.docbook pop3.docbook telnet.docbook rlan.docbook https.docbook mailto.docbook tar.docbook mrml.docbook fish.docbook smb.docbook imaps.docbook bzip.docbook ldap.docbook http.docbook help.docbook data.docbook gopher.docbook news.docbook mac.docbook pop3s.docbook index.docbook imap.docbook ftp.docbook thumbnail.docbook nfs.docbook ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
-diff -Nru kdebase-3.4.0.orig/doc/klipper/Makefile.in kdebase-3.4.0/doc/klipper/Makefile.in
---- kdebase-3.4.0.orig/doc/klipper/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/klipper/Makefile.in 2005-05-07 12:35:05.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/klipper/Makefile.in kdebase-3.4.1/doc/klipper/Makefile.in
+--- kdebase-3.4.1.orig/doc/klipper/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/doc/klipper/Makefile.in 2005-05-24 16:27:53.311292807 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -14310,54 +11744,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -712,7 +715,7 @@
- KDE_DIST=screenshot.png index.docbook Makefile.in Makefile.am index.cache.bz2
-
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook screenshot.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) screenshot.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
-@@ -739,20 +742,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/klipper
-- @for base in index.docbook screenshot.png ; do \
-+ @for base in screenshot.png index.docbook ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/klipper/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/klipper/$$base ;\
- done
-
- uninstall-nls:
-- for base in index.docbook screenshot.png ; do \
-+ for base in screenshot.png index.docbook ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/klipper/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in index.docbook screenshot.png ; do \
-+ for file in screenshot.png index.docbook ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
-diff -Nru kdebase-3.4.0.orig/doc/kmenuedit/Makefile.in kdebase-3.4.0/doc/kmenuedit/Makefile.in
---- kdebase-3.4.0.orig/doc/kmenuedit/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kmenuedit/Makefile.in 2005-05-07 12:35:05.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kmenuedit/Makefile.in kdebase-3.4.1/doc/kmenuedit/Makefile.in
+--- kdebase-3.4.1.orig/doc/kmenuedit/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/doc/kmenuedit/Makefile.in 2005-05-24 16:27:53.324291633 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -14389,54 +11778,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -712,7 +715,7 @@
- KDE_DIST=i_paste.png i_delete.png index.docbook i_copy.png i_new_submenu.png Makefile.in i_cut.png i_k_button.png i_new_item.png icon_sets.png Makefile.am index.cache.bz2
-
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) i_copy.png i_cut.png i_delete.png i_k_button.png i_new_item.png i_new_submenu.png i_paste.png icon_sets.png index.docbook
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) i_new_submenu.png i_k_button.png icon_sets.png i_copy.png i_cut.png i_delete.png i_paste.png index.docbook i_new_item.png
- @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
-
- docs-am: index.cache.bz2
-@@ -739,20 +742,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmenuedit
-- @for base in i_copy.png i_cut.png i_delete.png i_k_button.png i_new_item.png i_new_submenu.png i_paste.png icon_sets.png index.docbook ; do \
-+ @for base in i_new_submenu.png i_k_button.png icon_sets.png i_copy.png i_cut.png i_delete.png i_paste.png index.docbook i_new_item.png ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmenuedit/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmenuedit/$$base ;\
- done
-
- uninstall-nls:
-- for base in i_copy.png i_cut.png i_delete.png i_k_button.png i_new_item.png i_new_submenu.png i_paste.png icon_sets.png index.docbook ; do \
-+ for base in i_new_submenu.png i_k_button.png icon_sets.png i_copy.png i_cut.png i_delete.png i_paste.png index.docbook i_new_item.png ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmenuedit/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in i_copy.png i_cut.png i_delete.png i_k_button.png i_new_item.png i_new_submenu.png i_paste.png icon_sets.png index.docbook ; do \
-+ for file in i_new_submenu.png i_k_button.png icon_sets.png i_copy.png i_cut.png i_delete.png i_paste.png index.docbook i_new_item.png ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
-diff -Nru kdebase-3.4.0.orig/doc/knetattach/Makefile.in kdebase-3.4.0/doc/knetattach/Makefile.in
---- kdebase-3.4.0.orig/doc/knetattach/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/knetattach/Makefile.in 2005-05-07 12:35:05.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/knetattach/Makefile.in kdebase-3.4.1/doc/knetattach/Makefile.in
+--- kdebase-3.4.1.orig/doc/knetattach/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/doc/knetattach/Makefile.in 2005-05-24 16:27:53.333290820 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -14468,54 +11812,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -712,7 +715,7 @@
- KDE_DIST=screenshot.png index.docbook Makefile.in Makefile.am index.cache.bz2
-
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook screenshot.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) screenshot.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
-@@ -739,20 +742,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/knetattach
-- @for base in index.docbook screenshot.png ; do \
-+ @for base in screenshot.png index.docbook ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/knetattach/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/knetattach/$$base ;\
- done
-
- uninstall-nls:
-- for base in index.docbook screenshot.png ; do \
-+ for base in screenshot.png index.docbook ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/knetattach/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in index.docbook screenshot.png ; do \
-+ for file in screenshot.png index.docbook ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
-diff -Nru kdebase-3.4.0.orig/doc/konqueror/Makefile.in kdebase-3.4.0/doc/konqueror/Makefile.in
---- kdebase-3.4.0.orig/doc/konqueror/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/konqueror/Makefile.in 2005-05-07 12:35:05.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/konqueror/Makefile.in kdebase-3.4.1/doc/konqueror/Makefile.in
+--- kdebase-3.4.1.orig/doc/konqueror/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/doc/konqueror/Makefile.in 2005-05-24 16:27:53.344289826 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -14547,58 +11846,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -710,10 +713,10 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=shortcut2.png dirtree.png path-complete.docbook plugins.docbook konqorg.png save-settings.docbook index.docbook dragdrop.png bookmarks.docbook basics.docbook shortcut1.png browser.docbook Makefile.in credits.docbook parts.png man-kbookmarkmerger.1.docbook introduction.docbook faq.docbook commands.docbook sidebar.docbook config.docbook cmndline.png Makefile.am index.cache.bz2 filemanager.docbook
-+KDE_DIST=shortcut2.png dirtree.png path-complete.docbook plugins.docbook konqorg.png save-settings.docbook index.docbook bookmarks.docbook dragdrop.png basics.docbook shortcut1.png browser.docbook Makefile.in credits.docbook parts.png introduction.docbook man-kbookmarkmerger.1.docbook faq.docbook commands.docbook sidebar.docbook config.docbook cmndline.png Makefile.am filemanager.docbook index.cache.bz2
-
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) basics.docbook bookmarks.docbook browser.docbook cmndline.png commands.docbook config.docbook credits.docbook dirtree.png dragdrop.png faq.docbook filemanager.docbook index.docbook introduction.docbook konqorg.png parts.png path-complete.docbook plugins.docbook save-settings.docbook shortcut1.png shortcut2.png sidebar.docbook man-kbookmarkmerger.1.docbook
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) dirtree.png sidebar.docbook man-kbookmarkmerger.1.docbook parts.png plugins.docbook konqorg.png introduction.docbook shortcut1.png shortcut2.png config.docbook dragdrop.png commands.docbook cmndline.png browser.docbook faq.docbook basics.docbook bookmarks.docbook path-complete.docbook filemanager.docbook index.docbook save-settings.docbook credits.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
-@@ -740,20 +743,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konqueror
-- @for base in basics.docbook bookmarks.docbook browser.docbook cmndline.png commands.docbook config.docbook credits.docbook dirtree.png dragdrop.png faq.docbook filemanager.docbook index.docbook introduction.docbook konqorg.png parts.png path-complete.docbook plugins.docbook save-settings.docbook shortcut1.png shortcut2.png sidebar.docbook man-kbookmarkmerger.1.docbook ; do \
-+ @for base in dirtree.png sidebar.docbook man-kbookmarkmerger.1.docbook parts.png plugins.docbook konqorg.png introduction.docbook shortcut1.png shortcut2.png config.docbook dragdrop.png commands.docbook cmndline.png browser.docbook faq.docbook basics.docbook bookmarks.docbook path-complete.docbook filemanager.docbook index.docbook save-settings.docbook credits.docbook ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konqueror/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konqueror/$$base ;\
- done
-
- uninstall-nls:
-- for base in basics.docbook bookmarks.docbook browser.docbook cmndline.png commands.docbook config.docbook credits.docbook dirtree.png dragdrop.png faq.docbook filemanager.docbook index.docbook introduction.docbook konqorg.png parts.png path-complete.docbook plugins.docbook save-settings.docbook shortcut1.png shortcut2.png sidebar.docbook man-kbookmarkmerger.1.docbook ; do \
-+ for base in dirtree.png sidebar.docbook man-kbookmarkmerger.1.docbook parts.png plugins.docbook konqorg.png introduction.docbook shortcut1.png shortcut2.png config.docbook dragdrop.png commands.docbook cmndline.png browser.docbook faq.docbook basics.docbook bookmarks.docbook path-complete.docbook filemanager.docbook index.docbook save-settings.docbook credits.docbook ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konqueror/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in basics.docbook bookmarks.docbook browser.docbook cmndline.png commands.docbook config.docbook credits.docbook dirtree.png dragdrop.png faq.docbook filemanager.docbook index.docbook introduction.docbook konqorg.png parts.png path-complete.docbook plugins.docbook save-settings.docbook shortcut1.png shortcut2.png sidebar.docbook man-kbookmarkmerger.1.docbook ; do \
-+ for file in dirtree.png sidebar.docbook man-kbookmarkmerger.1.docbook parts.png plugins.docbook konqorg.png introduction.docbook shortcut1.png shortcut2.png config.docbook dragdrop.png commands.docbook cmndline.png browser.docbook faq.docbook basics.docbook bookmarks.docbook path-complete.docbook filemanager.docbook index.docbook save-settings.docbook credits.docbook ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
-diff -Nru kdebase-3.4.0.orig/doc/konsole/Makefile.in kdebase-3.4.0/doc/konsole/Makefile.in
---- kdebase-3.4.0.orig/doc/konsole/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/doc/konsole/Makefile.in 2005-05-07 12:35:05.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/konsole/Makefile.in kdebase-3.4.1/doc/konsole/Makefile.in
+--- kdebase-3.4.1.orig/doc/konsole/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/doc/konsole/Makefile.in 2005-05-24 16:27:53.353289013 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -14630,54 +11880,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -712,7 +715,7 @@
- KDE_DIST=index.docbook Makefile.in tabbar.png konsole.png Makefile.am index.cache.bz2
-
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook konsole.png tabbar.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) konsole.png index.docbook tabbar.png
- @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
-
- docs-am: index.cache.bz2
-@@ -739,20 +742,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konsole
-- @for base in index.docbook konsole.png tabbar.png ; do \
-+ @for base in konsole.png index.docbook tabbar.png ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konsole/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konsole/$$base ;\
- done
-
- uninstall-nls:
-- for base in index.docbook konsole.png tabbar.png ; do \
-+ for base in konsole.png index.docbook tabbar.png ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konsole/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in index.docbook konsole.png tabbar.png ; do \
-+ for file in konsole.png index.docbook tabbar.png ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
-diff -Nru kdebase-3.4.0.orig/doc/kpager/Makefile.in kdebase-3.4.0/doc/kpager/Makefile.in
---- kdebase-3.4.0.orig/doc/kpager/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/doc/kpager/Makefile.in 2005-05-07 12:35:05.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kpager/Makefile.in kdebase-3.4.1/doc/kpager/Makefile.in
+--- kdebase-3.4.1.orig/doc/kpager/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/doc/kpager/Makefile.in 2005-05-24 16:27:53.363288110 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -14709,54 +11914,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -712,7 +715,7 @@
- KDE_DIST=screenshot.png index.docbook Makefile.in settings.png Makefile.am index.cache.bz2
-
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook screenshot.png settings.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) screenshot.png settings.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
-@@ -739,20 +742,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpager
-- @for base in index.docbook screenshot.png settings.png ; do \
-+ @for base in screenshot.png settings.png index.docbook ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpager/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpager/$$base ;\
- done
-
- uninstall-nls:
-- for base in index.docbook screenshot.png settings.png ; do \
-+ for base in screenshot.png settings.png index.docbook ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpager/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in index.docbook screenshot.png settings.png ; do \
-+ for file in screenshot.png settings.png index.docbook ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
-diff -Nru kdebase-3.4.0.orig/doc/ksplashml/Makefile.in kdebase-3.4.0/doc/ksplashml/Makefile.in
---- kdebase-3.4.0.orig/doc/ksplashml/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/doc/ksplashml/Makefile.in 2005-05-07 12:35:05.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/ksplashml/Makefile.in kdebase-3.4.1/doc/ksplashml/Makefile.in
+--- kdebase-3.4.1.orig/doc/ksplashml/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/doc/ksplashml/Makefile.in 2005-05-24 16:27:53.372287297 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -14788,21 +11948,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/ksysguard/Makefile.in kdebase-3.4.0/doc/ksysguard/Makefile.in
---- kdebase-3.4.0.orig/doc/ksysguard/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/doc/ksysguard/Makefile.in 2005-05-07 12:35:05.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/ksysguard/Makefile.in kdebase-3.4.1/doc/ksysguard/Makefile.in
+--- kdebase-3.4.1.orig/doc/ksysguard/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/doc/ksysguard/Makefile.in 2005-05-24 16:27:53.384286214 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -14834,21 +11982,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kwrite/Makefile.in kdebase-3.4.0/doc/kwrite/Makefile.in
---- kdebase-3.4.0.orig/doc/kwrite/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/doc/kwrite/Makefile.in 2005-05-07 12:35:06.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kwrite/Makefile.in kdebase-3.4.1/doc/kwrite/Makefile.in
+--- kdebase-3.4.1.orig/doc/kwrite/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/doc/kwrite/Makefile.in 2005-05-24 16:27:53.399284859 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -14880,21 +12016,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/kxkb/Makefile.in kdebase-3.4.0/doc/kxkb/Makefile.in
---- kdebase-3.4.0.orig/doc/kxkb/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/doc/kxkb/Makefile.in 2005-05-07 12:35:06.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/kxkb/Makefile.in kdebase-3.4.1/doc/kxkb/Makefile.in
+--- kdebase-3.4.1.orig/doc/kxkb/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/doc/kxkb/Makefile.in 2005-05-24 16:27:53.414283504 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -14926,21 +12050,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/Makefile.in kdebase-3.4.0/doc/Makefile.in
---- kdebase-3.4.0.orig/doc/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/Makefile.in 2005-05-07 12:35:01.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/Makefile.in kdebase-3.4.1/doc/Makefile.in
+--- kdebase-3.4.1.orig/doc/Makefile.in 2005-05-23 18:38:19.000000000 +0200
++++ kdebase-3.4.1/doc/Makefile.in 2005-05-24 16:27:52.317382581 +0200
@@ -251,6 +251,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -14951,14 +12063,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -537,13 +540,13 @@
- KDE_DOCS = AUTO
- #>- SUBDIRS = $(AUTODIRS)
- #>+ 1
--SUBDIRS =. faq kate glossary kappfinder kcontrol kdebugdialog kdcop kdeprint kdesu kdm kfind khelpcenter kicker kinfocenter kioslave klipper kmenuedit konqueror konsole kpager ksplashml ksysguard kwrite kxkb quickstart userguide visualdict knetattach
-+SUBDIRS =. faq kdm kate kxkb ksysguard quickstart kdcop kdesu kfind klipper kappfinder konsole khelpcenter kmenuedit kioslave knetattach glossary kcontrol kdeprint kicker kpager kwrite ksplashml kdebugdialog kinfocenter userguide konqueror visualdict
- #>- all: all-recursive
- #>+ 1
+@@ -543,7 +546,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -14979,69 +12084,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -603,7 +606,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -615,7 +624,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -623,7 +632,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -644,7 +659,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/doc/quickstart/Makefile.in kdebase-3.4.0/doc/quickstart/Makefile.in
---- kdebase-3.4.0.orig/doc/quickstart/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/doc/quickstart/Makefile.in 2005-05-07 12:35:06.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/quickstart/Makefile.in kdebase-3.4.1/doc/quickstart/Makefile.in
+--- kdebase-3.4.1.orig/doc/quickstart/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/doc/quickstart/Makefile.in 2005-05-24 16:27:53.427282330 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -15073,21 +12118,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/doc/userguide/Makefile.in kdebase-3.4.0/doc/userguide/Makefile.in
---- kdebase-3.4.0.orig/doc/userguide/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/doc/userguide/Makefile.in 2005-05-07 12:35:06.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/userguide/Makefile.in kdebase-3.4.1/doc/userguide/Makefile.in
+--- kdebase-3.4.1.orig/doc/userguide/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/doc/userguide/Makefile.in 2005-05-24 16:27:53.446280614 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -15119,58 +12152,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -709,10 +712,10 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=rip.png kde-as-root.docbook konq-simple.png browser-fine-tuning.docbook accessibility.docbook your-kde-account.docbook programs-controlling.docbook knode-mail-account.png kcontrol.png kaboodle-icon.png pdf-files.docbook a-window.png amarok-icon.png juk-icon.png kde-edutainment.docbook index.docbook open-file-dialog.png the-filemanager.docbook services.png control-center.docbook troubleshooting-network-x.docbook migrator-dictionary.docbook glossary.docbook networking-with-windows.docbook credits-and-license.docbook where-next.docbook amarok.png removable-disks.docbook oggfolder.png getting-help.docbook noatun.png kmouth2.png screen-captures.docbook font-installation.docbook standard-menu-entries.docbook panel-and-desktop.docbook knode-identity.png email.docbook knode-start.png desktop.png playing-audiocds.docbook index.cache.bz2 kaboodle.png file-sharing.docbook playing-movies.docbook troubleshooting-no-open.docbook base-kde-applications.docbook kmouth3.png ripsettings.png messaging-intro.docbook playing-music.docbook programs-and-documents.docbook kppp-wizard.png usenet.docbook kde-for-admins.docbook kmouth.png juk.png net-connection-setup.docbook kmag.png groupware-kontact.docbook internet-shortcuts.docbook burning-cds.docbook creating-graphics.docbook konsole-intro.docbook kmousetool.png windows-how-to.docbook Makefile.in kde-office.docbook kppp-dialer-tab.png printer-setup.docbook under-the-hood.docbook noatun-icon.png titlebar-menu.png switching-sessions.docbook kopete.png konq-sidebar.png printing-from-apps.docbook Makefile.am shared-sessions.docbook
-+KDE_DIST=kde-as-root.docbook rip.png konq-simple.png browser-fine-tuning.docbook accessibility.docbook your-kde-account.docbook programs-controlling.docbook knode-mail-account.png kcontrol.png kaboodle-icon.png pdf-files.docbook a-window.png amarok-icon.png juk-icon.png kde-edutainment.docbook index.docbook the-filemanager.docbook open-file-dialog.png services.png control-center.docbook troubleshooting-network-x.docbook migrator-dictionary.docbook glossary.docbook networking-with-windows.docbook credits-and-license.docbook amarok.png where-next.docbook removable-disks.docbook oggfolder.png getting-help.docbook noatun.png kmouth2.png font-installation.docbook screen-captures.docbook standard-menu-entries.docbook panel-and-desktop.docbook knode-identity.png email.docbook knode-start.png desktop.png playing-audiocds.docbook index.cache.bz2 kaboodle.png file-sharing.docbook playing-movies.docbook troubleshooting-no-open.docbook base-kde-applications.docbook kmouth3.png ripsettings.png messaging-intro.docbook playing-music.docbook programs-and-documents.docbook kppp-wizard.png usenet.docbook kde-for-admins.docbook kmouth.png juk.png net-connection-setup.docbook kmag.png groupware-kontact.docbook internet-shortcuts.docbook burning-cds.docbook creating-graphics.docbook konsole-intro.docbook kmousetool.png windows-how-to.docbook Makefile.in kde-office.docbook kppp-dialer-tab.png printer-setup.docbook under-the-hood.docbook noatun-icon.png titlebar-menu.png switching-sessions.docbook kopete.png konq-sidebar.png printing-from-apps.docbook Makefile.am shared-sessions.docbook
-
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) accessibility.docbook font-installation.docbook glossary.docbook juk-icon.png index.docbook juk.png kaboodle-icon.png net-connection-setup.docbook oggfolder.png standard-menu-entries.docbook under-the-hood.docbook a-window.png amarok-icon.png amarok.png base-kde-applications.docbook browser-fine-tuning.docbook burning-cds.docbook control-center.docbook creating-graphics.docbook credits-and-license.docbook desktop.png email.docbook file-sharing.docbook getting-help.docbook internet-shortcuts.docbook kaboodle.png kcontrol.png kde-as-root.docbook kde-edutainment.docbook kde-for-admins.docbook kmag.png kmousetool.png kmouth.png kmouth2.png kmouth3.png knode-identity.png knode-mail-account.png knode-start.png konq-sidebar.png konq-simple.png konsole-intro.docbook kopete.png kppp-dialer-tab.png kppp-wizard.png messaging-intro.docbook migrator-dictionary.docbook networking-with-windows.docbook noatun-icon.png noatun.png panel-and-desktop.docbook pdf-files.docbook playing-movies.docbook playing-music.docbook printer-setup.docbook printing-from-apps.docbook programs-and-documents.docbook programs-controlling.docbook removable-disks.docbook rip.png ripsettings.png screen-captures.docbook services.png shared-sessions.docbook switching-sessions.docbook the-filemanager.docbook titlebar-menu.png troubleshooting-no-open.docbook usenet.docbook where-next.docbook windows-how-to.docbook your-kde-account.docbook open-file-dialog.png troubleshooting-network-x.docbook groupware-kontact.docbook kde-office.docbook playing-audiocds.docbook
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) internet-shortcuts.docbook kaboodle.png playing-audiocds.docbook migrator-dictionary.docbook knode-mail-account.png kde-office.docbook kmousetool.png your-kde-account.docbook open-file-dialog.png switching-sessions.docbook creating-graphics.docbook programs-controlling.docbook juk.png oggfolder.png accessibility.docbook standard-menu-entries.docbook rip.png kaboodle-icon.png kmouth.png juk-icon.png file-sharing.docbook panel-and-desktop.docbook kmouth2.png kmouth3.png where-next.docbook noatun-icon.png credits-and-license.docbook konq-simple.png kcontrol.png kppp-dialer-tab.png shared-sessions.docbook troubleshooting-no-open.docbook screen-captures.docbook a-window.png amarok-icon.png konq-sidebar.png titlebar-menu.png font-installation.docbook pdf-files.docbook messaging-intro.docbook the-filemanager.docbook desktop.png playing-movies.docbook printer-setup.docbook kde-edutainment.docbook noatun.png base-kde-applications.docbook kde-as-root.docbook windows-how-to.docbook email.docbook services.png net-connection-setup.docbook kopete.png usenet.docbook removable-disks.docbook knode-identity.png printing-from-apps.docbook browser-fine-tuning.docbook kde-for-admins.docbook kmag.png networking-with-windows.docbook knode-start.png glossary.docbook programs-and-documents.docbook amarok.png under-the-hood.docbook index.docbook kppp-wizard.png troubleshooting-network-x.docbook konsole-intro.docbook groupware-kontact.docbook control-center.docbook playing-music.docbook burning-cds.docbook ripsettings.png getting-help.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
-@@ -739,20 +742,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide
-- @for base in accessibility.docbook font-installation.docbook glossary.docbook juk-icon.png index.docbook juk.png kaboodle-icon.png net-connection-setup.docbook oggfolder.png standard-menu-entries.docbook under-the-hood.docbook a-window.png amarok-icon.png amarok.png base-kde-applications.docbook browser-fine-tuning.docbook burning-cds.docbook control-center.docbook creating-graphics.docbook credits-and-license.docbook desktop.png email.docbook file-sharing.docbook getting-help.docbook internet-shortcuts.docbook kaboodle.png kcontrol.png kde-as-root.docbook kde-edutainment.docbook kde-for-admins.docbook kmag.png kmousetool.png kmouth.png kmouth2.png kmouth3.png knode-identity.png knode-mail-account.png knode-start.png konq-sidebar.png konq-simple.png konsole-intro.docbook kopete.png kppp-dialer-tab.png kppp-wizard.png messaging-intro.docbook migrator-dictionary.docbook networking-with-windows.docbook noatun-icon.png noatun.png panel-and-desktop.docbook pdf-files.docbook playing-movies.docbook playing-music.docbook printer-setup.docbook printing-from-apps.docbook programs-and-documents.docbook programs-controlling.docbook removable-disks.docbook rip.png ripsettings.png screen-captures.docbook services.png shared-sessions.docbook switching-sessions.docbook the-filemanager.docbook titlebar-menu.png troubleshooting-no-open.docbook usenet.docbook where-next.docbook windows-how-to.docbook your-kde-account.docbook open-file-dialog.png troubleshooting-network-x.docbook groupware-kontact.docbook kde-office.docbook playing-audiocds.docbook ; do \
-+ @for base in internet-shortcuts.docbook kaboodle.png playing-audiocds.docbook migrator-dictionary.docbook knode-mail-account.png kde-office.docbook kmousetool.png your-kde-account.docbook open-file-dialog.png switching-sessions.docbook creating-graphics.docbook programs-controlling.docbook juk.png oggfolder.png accessibility.docbook standard-menu-entries.docbook rip.png kaboodle-icon.png kmouth.png juk-icon.png file-sharing.docbook panel-and-desktop.docbook kmouth2.png kmouth3.png where-next.docbook noatun-icon.png credits-and-license.docbook konq-simple.png kcontrol.png kppp-dialer-tab.png shared-sessions.docbook troubleshooting-no-open.docbook screen-captures.docbook a-window.png amarok-icon.png konq-sidebar.png titlebar-menu.png font-installation.docbook pdf-files.docbook messaging-intro.docbook the-filemanager.docbook desktop.png playing-movies.docbook printer-setup.docbook kde-edutainment.docbook noatun.png base-kde-applications.docbook kde-as-root.docbook windows-how-to.docbook email.docbook services.png net-connection-setup.docbook kopete.png usenet.docbook removable-disks.docbook knode-identity.png printing-from-apps.docbook browser-fine-tuning.docbook kde-for-admins.docbook kmag.png networking-with-windows.docbook knode-start.png glossary.docbook programs-and-documents.docbook amarok.png under-the-hood.docbook index.docbook kppp-wizard.png troubleshooting-network-x.docbook konsole-intro.docbook groupware-kontact.docbook control-center.docbook playing-music.docbook burning-cds.docbook ripsettings.png getting-help.docbook ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
- done
-
- uninstall-nls:
-- for base in accessibility.docbook font-installation.docbook glossary.docbook juk-icon.png index.docbook juk.png kaboodle-icon.png net-connection-setup.docbook oggfolder.png standard-menu-entries.docbook under-the-hood.docbook a-window.png amarok-icon.png amarok.png base-kde-applications.docbook browser-fine-tuning.docbook burning-cds.docbook control-center.docbook creating-graphics.docbook credits-and-license.docbook desktop.png email.docbook file-sharing.docbook getting-help.docbook internet-shortcuts.docbook kaboodle.png kcontrol.png kde-as-root.docbook kde-edutainment.docbook kde-for-admins.docbook kmag.png kmousetool.png kmouth.png kmouth2.png kmouth3.png knode-identity.png knode-mail-account.png knode-start.png konq-sidebar.png konq-simple.png konsole-intro.docbook kopete.png kppp-dialer-tab.png kppp-wizard.png messaging-intro.docbook migrator-dictionary.docbook networking-with-windows.docbook noatun-icon.png noatun.png panel-and-desktop.docbook pdf-files.docbook playing-movies.docbook playing-music.docbook printer-setup.docbook printing-from-apps.docbook programs-and-documents.docbook programs-controlling.docbook removable-disks.docbook rip.png ripsettings.png screen-captures.docbook services.png shared-sessions.docbook switching-sessions.docbook the-filemanager.docbook titlebar-menu.png troubleshooting-no-open.docbook usenet.docbook where-next.docbook windows-how-to.docbook your-kde-account.docbook open-file-dialog.png troubleshooting-network-x.docbook groupware-kontact.docbook kde-office.docbook playing-audiocds.docbook ; do \
-+ for base in internet-shortcuts.docbook kaboodle.png playing-audiocds.docbook migrator-dictionary.docbook knode-mail-account.png kde-office.docbook kmousetool.png your-kde-account.docbook open-file-dialog.png switching-sessions.docbook creating-graphics.docbook programs-controlling.docbook juk.png oggfolder.png accessibility.docbook standard-menu-entries.docbook rip.png kaboodle-icon.png kmouth.png juk-icon.png file-sharing.docbook panel-and-desktop.docbook kmouth2.png kmouth3.png where-next.docbook noatun-icon.png credits-and-license.docbook konq-simple.png kcontrol.png kppp-dialer-tab.png shared-sessions.docbook troubleshooting-no-open.docbook screen-captures.docbook a-window.png amarok-icon.png konq-sidebar.png titlebar-menu.png font-installation.docbook pdf-files.docbook messaging-intro.docbook the-filemanager.docbook desktop.png playing-movies.docbook printer-setup.docbook kde-edutainment.docbook noatun.png base-kde-applications.docbook kde-as-root.docbook windows-how-to.docbook email.docbook services.png net-connection-setup.docbook kopete.png usenet.docbook removable-disks.docbook knode-identity.png printing-from-apps.docbook browser-fine-tuning.docbook kde-for-admins.docbook kmag.png networking-with-windows.docbook knode-start.png glossary.docbook programs-and-documents.docbook amarok.png under-the-hood.docbook index.docbook kppp-wizard.png troubleshooting-network-x.docbook konsole-intro.docbook groupware-kontact.docbook control-center.docbook playing-music.docbook burning-cds.docbook ripsettings.png getting-help.docbook ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in accessibility.docbook font-installation.docbook glossary.docbook juk-icon.png index.docbook juk.png kaboodle-icon.png net-connection-setup.docbook oggfolder.png standard-menu-entries.docbook under-the-hood.docbook a-window.png amarok-icon.png amarok.png base-kde-applications.docbook browser-fine-tuning.docbook burning-cds.docbook control-center.docbook creating-graphics.docbook credits-and-license.docbook desktop.png email.docbook file-sharing.docbook getting-help.docbook internet-shortcuts.docbook kaboodle.png kcontrol.png kde-as-root.docbook kde-edutainment.docbook kde-for-admins.docbook kmag.png kmousetool.png kmouth.png kmouth2.png kmouth3.png knode-identity.png knode-mail-account.png knode-start.png konq-sidebar.png konq-simple.png konsole-intro.docbook kopete.png kppp-dialer-tab.png kppp-wizard.png messaging-intro.docbook migrator-dictionary.docbook networking-with-windows.docbook noatun-icon.png noatun.png panel-and-desktop.docbook pdf-files.docbook playing-movies.docbook playing-music.docbook printer-setup.docbook printing-from-apps.docbook programs-and-documents.docbook programs-controlling.docbook removable-disks.docbook rip.png ripsettings.png screen-captures.docbook services.png shared-sessions.docbook switching-sessions.docbook the-filemanager.docbook titlebar-menu.png troubleshooting-no-open.docbook usenet.docbook where-next.docbook windows-how-to.docbook your-kde-account.docbook open-file-dialog.png troubleshooting-network-x.docbook groupware-kontact.docbook kde-office.docbook playing-audiocds.docbook ; do \
-+ for file in internet-shortcuts.docbook kaboodle.png playing-audiocds.docbook migrator-dictionary.docbook knode-mail-account.png kde-office.docbook kmousetool.png your-kde-account.docbook open-file-dialog.png switching-sessions.docbook creating-graphics.docbook programs-controlling.docbook juk.png oggfolder.png accessibility.docbook standard-menu-entries.docbook rip.png kaboodle-icon.png kmouth.png juk-icon.png file-sharing.docbook panel-and-desktop.docbook kmouth2.png kmouth3.png where-next.docbook noatun-icon.png credits-and-license.docbook konq-simple.png kcontrol.png kppp-dialer-tab.png shared-sessions.docbook troubleshooting-no-open.docbook screen-captures.docbook a-window.png amarok-icon.png konq-sidebar.png titlebar-menu.png font-installation.docbook pdf-files.docbook messaging-intro.docbook the-filemanager.docbook desktop.png playing-movies.docbook printer-setup.docbook kde-edutainment.docbook noatun.png base-kde-applications.docbook kde-as-root.docbook windows-how-to.docbook email.docbook services.png net-connection-setup.docbook kopete.png usenet.docbook removable-disks.docbook knode-identity.png printing-from-apps.docbook browser-fine-tuning.docbook kde-for-admins.docbook kmag.png networking-with-windows.docbook knode-start.png glossary.docbook programs-and-documents.docbook amarok.png under-the-hood.docbook index.docbook kppp-wizard.png troubleshooting-network-x.docbook konsole-intro.docbook groupware-kontact.docbook control-center.docbook playing-music.docbook burning-cds.docbook ripsettings.png getting-help.docbook ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
-diff -Nru kdebase-3.4.0.orig/doc/visualdict/Makefile.in kdebase-3.4.0/doc/visualdict/Makefile.in
---- kdebase-3.4.0.orig/doc/visualdict/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/doc/visualdict/Makefile.in 2005-05-07 12:35:06.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/doc/visualdict/Makefile.in kdebase-3.4.1/doc/visualdict/Makefile.in
+--- kdebase-3.4.1.orig/doc/visualdict/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/doc/visualdict/Makefile.in 2005-05-24 16:27:53.460279350 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -15202,58 +12186,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -709,10 +712,10 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=pict10.png pict7.png index.docbook pict1.png pict11.png pict17.png pict18.png pict19.png index.cache.bz2 pict2.png pict6.png pict8.png pict14.png pict12.png pict20.png pict16.png pict5.png pict9.png Makefile.in pict15.png pict4.png pict3.png pict13.png Makefile.am
-+KDE_DIST=pict10.png pict7.png index.docbook pict1.png pict11.png pict17.png pict18.png pict19.png index.cache.bz2 pict2.png pict6.png pict8.png pict14.png pict12.png pict16.png pict20.png pict5.png pict9.png Makefile.in pict15.png pict4.png pict13.png pict3.png Makefile.am
-
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook pict1.png pict10.png pict11.png pict12.png pict13.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png pict2.png pict20.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) pict20.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png index.docbook pict10.png pict11.png pict12.png pict13.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png
- @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
-
- docs-am: index.cache.bz2
-@@ -739,20 +742,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/visualdict
-- @for base in index.docbook pict1.png pict10.png pict11.png pict12.png pict13.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png pict2.png pict20.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png ; do \
-+ @for base in pict20.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png index.docbook pict10.png pict11.png pict12.png pict13.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/visualdict/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/visualdict/$$base ;\
- done
-
- uninstall-nls:
-- for base in index.docbook pict1.png pict10.png pict11.png pict12.png pict13.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png pict2.png pict20.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png ; do \
-+ for base in pict20.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png index.docbook pict10.png pict11.png pict12.png pict13.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/visualdict/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in index.docbook pict1.png pict10.png pict11.png pict12.png pict13.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png pict2.png pict20.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png ; do \
-+ for file in pict20.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png index.docbook pict10.png pict11.png pict12.png pict13.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
-diff -Nru kdebase-3.4.0.orig/drkonqi/debuggers/Makefile.in kdebase-3.4.0/drkonqi/debuggers/Makefile.in
---- kdebase-3.4.0.orig/drkonqi/debuggers/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/drkonqi/debuggers/Makefile.in 2005-05-07 12:35:06.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/drkonqi/debuggers/Makefile.in kdebase-3.4.1/drkonqi/debuggers/Makefile.in
+--- kdebase-3.4.1.orig/drkonqi/debuggers/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/drkonqi/debuggers/Makefile.in 2005-05-24 16:27:53.498275917 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -15285,44 +12220,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/drkonqi/Makefile.in kdebase-3.4.0/drkonqi/Makefile.in
---- kdebase-3.4.0.orig/drkonqi/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/drkonqi/Makefile.in 2005-05-07 12:35:06.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -83,18 +83,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(crashtest_SOURCES) $(drkonqi_SOURCES)
- DIST_SOURCES = $(crashtest_SOURCES) $(drkonqi_SOURCES)
+diff -rua kdebase-3.4.1.orig/drkonqi/Makefile.in kdebase-3.4.1/drkonqi/Makefile.in
+--- kdebase-3.4.1.orig/drkonqi/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/drkonqi/Makefile.in 2005-05-24 16:27:53.485277092 +0200
@@ -300,6 +300,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -15354,115 +12254,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -740,7 +743,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -752,7 +761,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -760,7 +769,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -781,7 +796,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1009,13 +1024,6 @@
- .NOEXPORT:
-
- #>+ 3
--toplevel.moc: $(srcdir)/toplevel.h
-- $(MOC) $(srcdir)/toplevel.h -o toplevel.moc
--
--#>+ 2
--mocs: toplevel.moc
--
--#>+ 3
- debugger.moc: $(srcdir)/debugger.h
- $(MOC) $(srcdir)/debugger.h -o debugger.moc
-
-@@ -1030,6 +1038,13 @@
- mocs: backtrace.moc
-
- #>+ 3
-+toplevel.moc: $(srcdir)/toplevel.h
-+ $(MOC) $(srcdir)/toplevel.h -o toplevel.moc
-+
-+#>+ 2
-+mocs: toplevel.moc
-+
-+#>+ 3
- drbugreport.moc: $(srcdir)/drbugreport.h
- $(MOC) $(srcdir)/drbugreport.h -o drbugreport.moc
-
-@@ -1051,7 +1066,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f toplevel.moc debugger.moc backtrace.moc drbugreport.moc krashconf.moc
-+ -rm -f debugger.moc backtrace.moc toplevel.moc drbugreport.moc krashconf.moc
-
- #>+ 2
- KDE_DIST=backtrace.h toplevel.h drbugreport.h Makefile.in krashdcopinterface.h krashconf.h debugger.h Makefile.am
-@@ -1103,7 +1118,7 @@
-
-
- #>+ 11
--drkonqi.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/debugger.cpp $(srcdir)/krashconf.cpp $(srcdir)/drbugreport.cpp $(srcdir)/backtrace.cpp $(srcdir)/toplevel.cpp krashdcopinterface_skel.cpp backtrace.moc debugger.moc toplevel.moc drbugreport.moc krashconf.moc
-+drkonqi.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/debugger.cpp $(srcdir)/krashconf.cpp $(srcdir)/drbugreport.cpp $(srcdir)/backtrace.cpp $(srcdir)/toplevel.cpp krashdcopinterface_skel.cpp toplevel.moc backtrace.moc debugger.moc drbugreport.moc krashconf.moc
- @echo 'creating drkonqi.all_cpp.cpp ...'; \
- rm -f drkonqi.all_cpp.files drkonqi.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> drkonqi.all_cpp.final; \
-diff -Nru kdebase-3.4.0.orig/drkonqi/pics/Makefile.in kdebase-3.4.0/drkonqi/pics/Makefile.in
---- kdebase-3.4.0.orig/drkonqi/pics/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/drkonqi/pics/Makefile.in 2005-05-07 12:35:06.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/drkonqi/pics/Makefile.in kdebase-3.4.1/drkonqi/pics/Makefile.in
+--- kdebase-3.4.1.orig/drkonqi/pics/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/drkonqi/pics/Makefile.in 2005-05-24 16:27:53.511274743 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -15494,21 +12288,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/drkonqi/presets/Makefile.in kdebase-3.4.0/drkonqi/presets/Makefile.in
---- kdebase-3.4.0.orig/drkonqi/presets/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/drkonqi/presets/Makefile.in 2005-05-07 12:35:06.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/drkonqi/presets/Makefile.in kdebase-3.4.1/drkonqi/presets/Makefile.in
+--- kdebase-3.4.1.orig/drkonqi/presets/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/drkonqi/presets/Makefile.in 2005-05-24 16:27:53.523273660 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -15540,21 +12322,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kappfinder/apps/Development/Makefile.in kdebase-3.4.0/kappfinder/apps/Development/Makefile.in
---- kdebase-3.4.0.orig/kappfinder/apps/Development/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Development/Makefile.in 2005-05-07 12:35:06.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kappfinder/apps/Development/Makefile.in kdebase-3.4.1/kappfinder/apps/Development/Makefile.in
+--- kdebase-3.4.1.orig/kappfinder/apps/Development/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/kappfinder/apps/Development/Makefile.in 2005-05-24 16:27:53.564269957 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -15586,21 +12356,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kappfinder/apps/Editors/Makefile.in kdebase-3.4.0/kappfinder/apps/Editors/Makefile.in
---- kdebase-3.4.0.orig/kappfinder/apps/Editors/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Editors/Makefile.in 2005-05-07 12:35:06.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kappfinder/apps/Editors/Makefile.in kdebase-3.4.1/kappfinder/apps/Editors/Makefile.in
+--- kdebase-3.4.1.orig/kappfinder/apps/Editors/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/kappfinder/apps/Editors/Makefile.in 2005-05-24 16:27:53.577268782 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -15632,30 +12390,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -738,7 +741,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=nano.desktop gedit.desktop xemacs.desktop pico.desktop xedit.desktop lemacs.desktop nedit.desktop gvim.desktop emacs.desktop Makefile.in Makefile.am
-+KDE_DIST=gedit.desktop nano.desktop xemacs.desktop pico.desktop xedit.desktop lemacs.desktop nedit.desktop gvim.desktop emacs.desktop Makefile.in Makefile.am
-
- #>+ 2
- docs-am:
-diff -Nru kdebase-3.4.0.orig/kappfinder/apps/Games/Arcade/Makefile.in kdebase-3.4.0/kappfinder/apps/Games/Arcade/Makefile.in
---- kdebase-3.4.0.orig/kappfinder/apps/Games/Arcade/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Games/Arcade/Makefile.in 2005-05-07 12:35:06.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kappfinder/apps/Games/Arcade/Makefile.in kdebase-3.4.1/kappfinder/apps/Games/Arcade/Makefile.in
+--- kdebase-3.4.1.orig/kappfinder/apps/Games/Arcade/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/kappfinder/apps/Games/Arcade/Makefile.in 2005-05-24 16:27:53.589267699 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -15687,21 +12424,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kappfinder/apps/Games/Board/Makefile.in kdebase-3.4.0/kappfinder/apps/Games/Board/Makefile.in
---- kdebase-3.4.0.orig/kappfinder/apps/Games/Board/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Games/Board/Makefile.in 2005-05-07 12:35:06.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kappfinder/apps/Games/Board/Makefile.in kdebase-3.4.1/kappfinder/apps/Games/Board/Makefile.in
+--- kdebase-3.4.1.orig/kappfinder/apps/Games/Board/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/kappfinder/apps/Games/Board/Makefile.in 2005-05-24 16:27:53.599266796 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -15733,21 +12458,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kappfinder/apps/Games/Card/Makefile.in kdebase-3.4.0/kappfinder/apps/Games/Card/Makefile.in
---- kdebase-3.4.0.orig/kappfinder/apps/Games/Card/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Games/Card/Makefile.in 2005-05-07 12:35:06.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kappfinder/apps/Games/Card/Makefile.in kdebase-3.4.1/kappfinder/apps/Games/Card/Makefile.in
+--- kdebase-3.4.1.orig/kappfinder/apps/Games/Card/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/kappfinder/apps/Games/Card/Makefile.in 2005-05-24 16:27:53.607266073 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -15779,21 +12492,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kappfinder/apps/Games/Emulators/Makefile.in kdebase-3.4.0/kappfinder/apps/Games/Emulators/Makefile.in
---- kdebase-3.4.0.orig/kappfinder/apps/Games/Emulators/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Games/Emulators/Makefile.in 2005-05-07 12:35:06.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kappfinder/apps/Games/Emulators/Makefile.in kdebase-3.4.1/kappfinder/apps/Games/Emulators/Makefile.in
+--- kdebase-3.4.1.orig/kappfinder/apps/Games/Emulators/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/kappfinder/apps/Games/Emulators/Makefile.in 2005-05-24 16:27:53.616265260 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -15825,21 +12526,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kappfinder/apps/Games/Makefile.in kdebase-3.4.0/kappfinder/apps/Games/Makefile.in
---- kdebase-3.4.0.orig/kappfinder/apps/Games/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Games/Makefile.in 2005-05-07 12:35:06.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kappfinder/apps/Games/Makefile.in kdebase-3.4.1/kappfinder/apps/Games/Makefile.in
+--- kdebase-3.4.1.orig/kappfinder/apps/Games/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/kappfinder/apps/Games/Makefile.in 2005-05-24 16:27:53.626264357 +0200
@@ -261,6 +261,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -15871,69 +12560,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -631,7 +634,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -643,7 +652,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -651,7 +660,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -672,7 +687,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kappfinder/apps/Games/Roguelikes/Makefile.in kdebase-3.4.0/kappfinder/apps/Games/Roguelikes/Makefile.in
---- kdebase-3.4.0.orig/kappfinder/apps/Games/Roguelikes/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Games/Roguelikes/Makefile.in 2005-05-07 12:35:06.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kappfinder/apps/Games/Roguelikes/Makefile.in kdebase-3.4.1/kappfinder/apps/Games/Roguelikes/Makefile.in
+--- kdebase-3.4.1.orig/kappfinder/apps/Games/Roguelikes/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/kappfinder/apps/Games/Roguelikes/Makefile.in 2005-05-24 16:27:53.635263544 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -15965,21 +12594,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kappfinder/apps/Games/TacticStrategy/Makefile.in kdebase-3.4.0/kappfinder/apps/Games/TacticStrategy/Makefile.in
---- kdebase-3.4.0.orig/kappfinder/apps/Games/TacticStrategy/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Games/TacticStrategy/Makefile.in 2005-05-07 12:35:06.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kappfinder/apps/Games/TacticStrategy/Makefile.in kdebase-3.4.1/kappfinder/apps/Games/TacticStrategy/Makefile.in
+--- kdebase-3.4.1.orig/kappfinder/apps/Games/TacticStrategy/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/kappfinder/apps/Games/TacticStrategy/Makefile.in 2005-05-24 16:27:53.643262822 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -16011,21 +12628,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kappfinder/apps/Graphics/Makefile.in kdebase-3.4.0/kappfinder/apps/Graphics/Makefile.in
---- kdebase-3.4.0.orig/kappfinder/apps/Graphics/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Graphics/Makefile.in 2005-05-07 12:35:06.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kappfinder/apps/Graphics/Makefile.in kdebase-3.4.1/kappfinder/apps/Graphics/Makefile.in
+--- kdebase-3.4.1.orig/kappfinder/apps/Graphics/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/kappfinder/apps/Graphics/Makefile.in 2005-05-24 16:27:53.654261828 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -16057,21 +12662,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kappfinder/apps/Internet/Makefile.in kdebase-3.4.0/kappfinder/apps/Internet/Makefile.in
---- kdebase-3.4.0.orig/kappfinder/apps/Internet/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Internet/Makefile.in 2005-05-07 12:35:06.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kappfinder/apps/Internet/Makefile.in kdebase-3.4.1/kappfinder/apps/Internet/Makefile.in
+--- kdebase-3.4.1.orig/kappfinder/apps/Internet/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/kappfinder/apps/Internet/Makefile.in 2005-05-24 16:27:53.670260383 +0200
@@ -261,6 +261,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -16103,78 +12696,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -640,7 +643,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -652,7 +661,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -660,7 +669,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -681,7 +696,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -900,7 +915,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=opera.desktop Nmapfe.desktop coolmail.desktop Pan.desktop ethereal.desktop balsa.desktop arena.desktop Evolution.desktop dc_gui.desktop mldonkey_gui.desktop mozilla-thunderbird.desktop xfmail.desktop mozilla-firefox.desktop Netscapemessenger.desktop Gabber.desktop mozilla.desktop ickle.desktop gnometalk.desktop netscape6.desktop xftp.desktop gtelnet.desktop gFTP.desktop Faces.desktop gnomemeeting.desktop ed2k_gui.desktop Dpsftp.desktop knews.desktop epiphany.desktop mozilla-firebird.desktop gaim.desktop licq.desktop Sylpheed.desktop DrakSync.desktop netscape.desktop Makefile.in btdownloadgui.desktop GnomeICU.desktop BlueFish.desktop Fetchmailconf.desktop Galeon.desktop Makefile.am xchat.desktop xbiff.desktop
-+KDE_DIST=opera.desktop Nmapfe.desktop coolmail.desktop Pan.desktop ethereal.desktop balsa.desktop arena.desktop Evolution.desktop dc_gui.desktop mldonkey_gui.desktop mozilla-thunderbird.desktop xfmail.desktop Netscapemessenger.desktop mozilla-firefox.desktop Gabber.desktop mozilla.desktop gnometalk.desktop ickle.desktop netscape6.desktop xftp.desktop gtelnet.desktop gFTP.desktop Faces.desktop gnomemeeting.desktop ed2k_gui.desktop Dpsftp.desktop knews.desktop epiphany.desktop mozilla-firebird.desktop gaim.desktop licq.desktop Sylpheed.desktop DrakSync.desktop netscape.desktop btdownloadgui.desktop Makefile.in BlueFish.desktop GnomeICU.desktop Fetchmailconf.desktop Galeon.desktop Makefile.am xchat.desktop xbiff.desktop
-
- #>+ 2
- docs-am:
-diff -Nru kdebase-3.4.0.orig/kappfinder/apps/Internet/Terminal/Makefile.in kdebase-3.4.0/kappfinder/apps/Internet/Terminal/Makefile.in
---- kdebase-3.4.0.orig/kappfinder/apps/Internet/Terminal/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Internet/Terminal/Makefile.in 2005-05-07 12:35:07.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kappfinder/apps/Internet/Terminal/Makefile.in kdebase-3.4.1/kappfinder/apps/Internet/Terminal/Makefile.in
+--- kdebase-3.4.1.orig/kappfinder/apps/Internet/Terminal/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/kappfinder/apps/Internet/Terminal/Makefile.in 2005-05-24 16:27:53.684259119 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -16206,21 +12730,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kappfinder/apps/Makefile.in kdebase-3.4.0/kappfinder/apps/Makefile.in
---- kdebase-3.4.0.orig/kappfinder/apps/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Makefile.in 2005-05-07 12:35:07.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kappfinder/apps/Makefile.in kdebase-3.4.1/kappfinder/apps/Makefile.in
+--- kdebase-3.4.1.orig/kappfinder/apps/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/kappfinder/apps/Makefile.in 2005-05-24 16:27:53.699257764 +0200
@@ -251,6 +251,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -16252,69 +12764,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -601,7 +604,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -613,7 +622,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -621,7 +630,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -642,7 +657,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kappfinder/apps/Multimedia/Makefile.in kdebase-3.4.0/kappfinder/apps/Multimedia/Makefile.in
---- kdebase-3.4.0.orig/kappfinder/apps/Multimedia/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Multimedia/Makefile.in 2005-05-07 12:35:07.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kappfinder/apps/Multimedia/Makefile.in kdebase-3.4.1/kappfinder/apps/Multimedia/Makefile.in
+--- kdebase-3.4.1.orig/kappfinder/apps/Multimedia/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/kappfinder/apps/Multimedia/Makefile.in 2005-05-24 16:27:53.714256409 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -16346,30 +12798,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -763,7 +766,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=bcast2000.desktop XMovie.desktop xcam.desktop ogle.desktop alsamixergui.desktop slab.desktop alevt.desktop rezound.desktop xine.desktop mtv.desktop audacity.desktop mplayer.desktop MP3info.desktop realplayer.desktop Grip.desktop gtv.desktop enjoympeg.desktop jazz.desktop xawtv.desktop Aumix.desktop xmms-enqueue.desktop Makefile.in oqtplayer.desktop aviplay.desktop sweep.desktop xmms.desktop Makefile.am
-+KDE_DIST=XMovie.desktop bcast2000.desktop xcam.desktop ogle.desktop alsamixergui.desktop slab.desktop alevt.desktop rezound.desktop xine.desktop mtv.desktop audacity.desktop mplayer.desktop MP3info.desktop realplayer.desktop Grip.desktop gtv.desktop enjoympeg.desktop jazz.desktop Aumix.desktop xawtv.desktop xmms-enqueue.desktop Makefile.in oqtplayer.desktop aviplay.desktop sweep.desktop xmms.desktop Makefile.am
-
- #>+ 2
- docs-am:
-diff -Nru kdebase-3.4.0.orig/kappfinder/apps/Office/Makefile.in kdebase-3.4.0/kappfinder/apps/Office/Makefile.in
---- kdebase-3.4.0.orig/kappfinder/apps/Office/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Office/Makefile.in 2005-05-07 12:35:07.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kappfinder/apps/Office/Makefile.in kdebase-3.4.1/kappfinder/apps/Office/Makefile.in
+--- kdebase-3.4.1.orig/kappfinder/apps/Office/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/kappfinder/apps/Office/Makefile.in 2005-05-24 16:27:53.727255235 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -16401,30 +12832,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -742,7 +745,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=Applix.desktop Gnome-Card.desktop Ical.desktop Gnumeric.desktop WordPerfect.desktop Gnome-Cal.desktop netscapeaddressbook.desktop pybliographic.desktop gnucash.desktop xpdf.desktop GnomeTimeTracker.desktop abiword.desktop lyx.desktop acroread.desktop Makefile.in scribus.desktop mrproject.desktop plan.desktop XsLite.desktop WordPerfect2000.desktop XAcc.desktop Dia.desktop Makefile.am Guppi.desktop
-+KDE_DIST=Applix.desktop Gnome-Card.desktop Ical.desktop Gnumeric.desktop WordPerfect.desktop Gnome-Cal.desktop netscapeaddressbook.desktop gnucash.desktop pybliographic.desktop xpdf.desktop GnomeTimeTracker.desktop abiword.desktop acroread.desktop lyx.desktop Makefile.in scribus.desktop mrproject.desktop plan.desktop XsLite.desktop WordPerfect2000.desktop XAcc.desktop Dia.desktop Makefile.am Guppi.desktop
-
- #>+ 2
- docs-am:
-diff -Nru kdebase-3.4.0.orig/kappfinder/apps/System/Makefile.in kdebase-3.4.0/kappfinder/apps/System/Makefile.in
---- kdebase-3.4.0.orig/kappfinder/apps/System/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/System/Makefile.in 2005-05-07 12:35:07.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kappfinder/apps/System/Makefile.in kdebase-3.4.1/kappfinder/apps/System/Makefile.in
+--- kdebase-3.4.1.orig/kappfinder/apps/System/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/kappfinder/apps/System/Makefile.in 2005-05-24 16:27:53.741253971 +0200
@@ -261,6 +261,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -16456,69 +12866,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -631,7 +634,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -643,7 +652,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -651,7 +660,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -672,7 +687,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kappfinder/apps/System/Terminal/Makefile.in kdebase-3.4.0/kappfinder/apps/System/Terminal/Makefile.in
---- kdebase-3.4.0.orig/kappfinder/apps/System/Terminal/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/System/Terminal/Makefile.in 2005-05-07 12:35:07.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kappfinder/apps/System/Terminal/Makefile.in kdebase-3.4.1/kappfinder/apps/System/Terminal/Makefile.in
+--- kdebase-3.4.1.orig/kappfinder/apps/System/Terminal/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/kappfinder/apps/System/Terminal/Makefile.in 2005-05-24 16:27:53.754252796 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -16550,21 +12900,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kappfinder/apps/Toys/Makefile.in kdebase-3.4.0/kappfinder/apps/Toys/Makefile.in
---- kdebase-3.4.0.orig/kappfinder/apps/Toys/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Toys/Makefile.in 2005-05-07 12:35:07.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kappfinder/apps/Toys/Makefile.in kdebase-3.4.1/kappfinder/apps/Toys/Makefile.in
+--- kdebase-3.4.1.orig/kappfinder/apps/Toys/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/kappfinder/apps/Toys/Makefile.in 2005-05-24 16:27:53.766251713 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -16596,21 +12934,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kappfinder/apps/Utilities/Makefile.in kdebase-3.4.0/kappfinder/apps/Utilities/Makefile.in
---- kdebase-3.4.0.orig/kappfinder/apps/Utilities/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Utilities/Makefile.in 2005-05-07 12:35:07.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kappfinder/apps/Utilities/Makefile.in kdebase-3.4.1/kappfinder/apps/Utilities/Makefile.in
+--- kdebase-3.4.1.orig/kappfinder/apps/Utilities/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/kappfinder/apps/Utilities/Makefile.in 2005-05-24 16:27:53.781250358 +0200
@@ -261,6 +261,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -16642,69 +12968,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -631,7 +634,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -643,7 +652,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -651,7 +660,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -672,7 +687,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kappfinder/apps/Utilities/xutils/Makefile.in kdebase-3.4.0/kappfinder/apps/Utilities/xutils/Makefile.in
---- kdebase-3.4.0.orig/kappfinder/apps/Utilities/xutils/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Utilities/xutils/Makefile.in 2005-05-07 12:35:07.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kappfinder/apps/Utilities/xutils/Makefile.in kdebase-3.4.1/kappfinder/apps/Utilities/xutils/Makefile.in
+--- kdebase-3.4.1.orig/kappfinder/apps/Utilities/xutils/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/kappfinder/apps/Utilities/xutils/Makefile.in 2005-05-24 16:27:53.794249184 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -16736,44 +13002,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kappfinder/Makefile.in kdebase-3.4.0/kappfinder/Makefile.in
---- kdebase-3.4.0.orig/kappfinder/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/Makefile.in 2005-05-07 12:35:06.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -85,18 +85,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kappfinder_SOURCES) $(kappfinder_install_SOURCES)
- DIST_SOURCES = $(kappfinder_SOURCES) $(kappfinder_install_SOURCES)
+diff -rua kdebase-3.4.1.orig/kappfinder/Makefile.in kdebase-3.4.1/kappfinder/Makefile.in
+--- kdebase-3.4.1.orig/kappfinder/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/kappfinder/Makefile.in 2005-05-24 16:27:53.551271131 +0200
@@ -310,6 +310,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -16805,122 +13036,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -759,7 +762,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -771,7 +780,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -779,7 +788,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -800,7 +815,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1065,23 +1080,23 @@
-
- #>+ 19
- install-kde-icons:
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kappfinder.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kappfinder.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
- $(INSTALL_DATA) $(srcdir)/cr128-app-kappfinder.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kappfinder.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-kappfinder.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kappfinder.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kappfinder.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kappfinder.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kappfinder.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kappfinder.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- $(INSTALL_DATA) $(srcdir)/cr64-app-kappfinder.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kappfinder.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kappfinder.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kappfinder.png
-
- uninstall-kde-icons:
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kappfinder.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kappfinder.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kappfinder.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kappfinder.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kappfinder.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kappfinder.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kappfinder.png
-
- #>+ 15
- force-reedit:
-diff -Nru kdebase-3.4.0.orig/kate/app/Makefile.in kdebase-3.4.0/kate/app/Makefile.in
---- kdebase-3.4.0.orig/kate/app/Makefile.in 2005-03-04 08:14:45.000000000 -0500
-+++ kdebase-3.4.0/kate/app/Makefile.in 2005-05-07 12:35:10.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -125,18 +125,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kate_la_SOURCES) $(kwrite_la_SOURCES) \
- $(libkateinterfaces_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kate/app/Makefile.in kdebase-3.4.1/kate/app/Makefile.in
+--- kdebase-3.4.1.orig/kate/app/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/kate/app/Makefile.in 2005-05-24 16:27:53.868242500 +0200
@@ -333,6 +333,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -16952,96 +13070,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1111,18 +1114,18 @@
- mocs: kateconfigdialog.moc
-
- #>+ 3
--katemainwindow.moc: $(srcdir)/katemainwindow.h
-- $(MOC) $(srcdir)/katemainwindow.h -o katemainwindow.moc
-+kateconsole.moc: $(srcdir)/kateconsole.h
-+ $(MOC) $(srcdir)/kateconsole.h -o kateconsole.moc
-
- #>+ 2
--mocs: katemainwindow.moc
-+mocs: kateconsole.moc
-
- #>+ 3
--kateconsole.moc: $(srcdir)/kateconsole.h
-- $(MOC) $(srcdir)/kateconsole.h -o kateconsole.moc
-+katemainwindow.moc: $(srcdir)/katemainwindow.h
-+ $(MOC) $(srcdir)/katemainwindow.h -o katemainwindow.moc
-
- #>+ 2
--mocs: kateconsole.moc
-+mocs: katemainwindow.moc
-
- #>+ 3
- katedocmanager.moc: $(srcdir)/katedocmanager.h
-@@ -1132,6 +1135,13 @@
- mocs: katedocmanager.moc
-
- #>+ 3
-+kategrepdialog.moc: $(srcdir)/kategrepdialog.h
-+ $(MOC) $(srcdir)/kategrepdialog.h -o kategrepdialog.moc
-+
-+#>+ 2
-+mocs: kategrepdialog.moc
-+
-+#>+ 3
- kateprojecttreeview.moc: $(srcdir)/kateprojecttreeview.h
- $(MOC) $(srcdir)/kateprojecttreeview.h -o kateprojecttreeview.moc
-
-@@ -1146,13 +1156,6 @@
- mocs: kateprojectlist.moc
-
- #>+ 3
--kategrepdialog.moc: $(srcdir)/kategrepdialog.h
-- $(MOC) $(srcdir)/kategrepdialog.h -o kategrepdialog.moc
--
--#>+ 2
--mocs: kategrepdialog.moc
--
--#>+ 3
- kwritemain.moc: $(srcdir)/kwritemain.h
- $(MOC) $(srcdir)/kwritemain.h -o kwritemain.moc
-
-@@ -1296,10 +1299,10 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f katesavemodifieddialog.moc kateconfigdialog.moc katemainwindow.moc kateconsole.moc katedocmanager.moc kateprojecttreeview.moc kateprojectlist.moc kategrepdialog.moc kwritemain.moc kateviewspace.moc kbookmarkhandler.moc katefileselector.moc katemwmodonhddialog.moc kateprojectviews.moc katepluginmanager.moc kateexternaltools.moc katemailfilesdialog.moc kateviewspacecontainer.moc kateprojectmanager.moc katefilelist.moc kateapp.moc kateviewmanager.moc katesplitter.moc kateconfigplugindialogpage.moc kateprojectdirview.moc
-+ -rm -f katesavemodifieddialog.moc kateconfigdialog.moc kateconsole.moc katemainwindow.moc katedocmanager.moc kategrepdialog.moc kateprojecttreeview.moc kateprojectlist.moc kwritemain.moc kateviewspace.moc kbookmarkhandler.moc katefileselector.moc katemwmodonhddialog.moc kateprojectviews.moc katepluginmanager.moc kateexternaltools.moc katemailfilesdialog.moc kateviewspacecontainer.moc kateprojectmanager.moc katefilelist.moc kateapp.moc kateviewmanager.moc katesplitter.moc kateconfigplugindialogpage.moc kateprojectdirview.moc
-
- #>+ 2
--KDE_DIST=kateprojecttreeview.h katepluginmanager.h katefileselector.h kateviewspace.h katemainwindowiface.h kateexternaltools.h katedocmanageriface.h kateconfigdialog.h kateviewspacecontainer.h kwritemain.h kateprojectviews.h katefilelist.h kateconsole.h katemailfilesdialog.h kateapp.h kateprojectdirview.h katedocmanager.h katemain.h kateconfigplugindialogpage.h katesplitter.h kateappIface.h Makefile.in katemainwindow.h kbookmarkhandler.h kateviewmanager.h kateprojectmanager.h katemwmodonhddialog.h katesavemodifieddialog.h Makefile.am kateprojectlist.h kategrepdialog.h
-+KDE_DIST=kateprojecttreeview.h katepluginmanager.h katefileselector.h kateviewspace.h katemainwindowiface.h kateexternaltools.h katedocmanageriface.h kateconfigdialog.h kateviewspacecontainer.h kwritemain.h kateprojectviews.h katefilelist.h kateconsole.h katemailfilesdialog.h kateapp.h kateprojectdirview.h katedocmanager.h katemain.h kateconfigplugindialogpage.h katesplitter.h kateappIface.h Makefile.in katemainwindow.h kbookmarkhandler.h kateviewmanager.h kateprojectmanager.h katemwmodonhddialog.h Makefile.am katesavemodifieddialog.h kateprojectlist.h kategrepdialog.h
-
- #>+ 6
- clean-idl:
-@@ -1354,7 +1357,7 @@
-
-
- #>+ 11
--libkateinterfaces_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kateapp.cpp $(srcdir)/kateconfigdialog.cpp $(srcdir)/kateconfigplugindialogpage.cpp $(srcdir)/kateconsole.cpp $(srcdir)/katedocmanager.cpp $(srcdir)/katefilelist.cpp $(srcdir)/katefileselector.cpp $(srcdir)/katemainwindow.cpp $(srcdir)/katepluginmanager.cpp $(srcdir)/katesplitter.cpp $(srcdir)/kateviewmanager.cpp $(srcdir)/kateviewspace.cpp $(srcdir)/kateprojectmanager.cpp $(srcdir)/katemainwindowiface.cpp $(srcdir)/kategrepdialog.cpp $(srcdir)/katemailfilesdialog.cpp $(srcdir)/kbookmarkhandler.cpp $(srcdir)/kateprojectlist.cpp $(srcdir)/kateprojecttreeview.cpp $(srcdir)/kateprojectviews.cpp $(srcdir)/kateprojectdirview.cpp $(srcdir)/kateappIface.cpp $(srcdir)/katedocmanageriface.cpp $(srcdir)/kateexternaltools.cpp $(srcdir)/katesavemodifieddialog.cpp $(srcdir)/kateviewspacecontainer.cpp $(srcdir)/katemwmodonhddialog.cpp katemainwindowiface_skel.cpp katedocmanageriface_skel.cpp kateappIface_skel.cpp katesavemodifieddialog.moc kateconfigdialog.moc kateconsole.moc katemainwindow.moc katedocmanager.moc kategrepdialog.moc kateprojectlist.moc kateprojecttreeview.moc kateviewspace.moc kbookmarkhandler.moc katefileselector.moc katemwmodonhddialog.moc kateprojectviews.moc kateexternaltools.moc katepluginmanager.moc katemailfilesdialog.moc kateviewspacecontainer.moc kateprojectmanager.moc katefilelist.moc kateapp.moc katesplitter.moc kateviewmanager.moc kateconfigplugindialogpage.moc kateprojectdirview.moc
-+libkateinterfaces_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kateapp.cpp $(srcdir)/kateconfigdialog.cpp $(srcdir)/kateconfigplugindialogpage.cpp $(srcdir)/kateconsole.cpp $(srcdir)/katedocmanager.cpp $(srcdir)/katefilelist.cpp $(srcdir)/katefileselector.cpp $(srcdir)/katemainwindow.cpp $(srcdir)/katepluginmanager.cpp $(srcdir)/katesplitter.cpp $(srcdir)/kateviewmanager.cpp $(srcdir)/kateviewspace.cpp $(srcdir)/kateprojectmanager.cpp $(srcdir)/katemainwindowiface.cpp $(srcdir)/kategrepdialog.cpp $(srcdir)/katemailfilesdialog.cpp $(srcdir)/kbookmarkhandler.cpp $(srcdir)/kateprojectlist.cpp $(srcdir)/kateprojecttreeview.cpp $(srcdir)/kateprojectviews.cpp $(srcdir)/kateprojectdirview.cpp $(srcdir)/kateappIface.cpp $(srcdir)/katedocmanageriface.cpp $(srcdir)/kateexternaltools.cpp $(srcdir)/katesavemodifieddialog.cpp $(srcdir)/kateviewspacecontainer.cpp $(srcdir)/katemwmodonhddialog.cpp katemainwindowiface_skel.cpp katedocmanageriface_skel.cpp kateappIface_skel.cpp katesavemodifieddialog.moc kateconfigdialog.moc katemainwindow.moc kateconsole.moc katedocmanager.moc kateprojectlist.moc kateprojecttreeview.moc kategrepdialog.moc kateviewspace.moc kbookmarkhandler.moc katefileselector.moc katemwmodonhddialog.moc kateprojectviews.moc kateexternaltools.moc katepluginmanager.moc katemailfilesdialog.moc kateviewspacecontainer.moc kateprojectmanager.moc katefilelist.moc kateapp.moc katesplitter.moc kateviewmanager.moc kateconfigplugindialogpage.moc kateprojectdirview.moc
- @echo 'creating libkateinterfaces_la.all_cpp.cpp ...'; \
- rm -f libkateinterfaces_la.all_cpp.files libkateinterfaces_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libkateinterfaces_la.all_cpp.final; \
-diff -Nru kdebase-3.4.0.orig/kate/data/Makefile.in kdebase-3.4.0/kate/data/Makefile.in
---- kdebase-3.4.0.orig/kate/data/Makefile.in 2005-03-04 08:14:45.000000000 -0500
-+++ kdebase-3.4.0/kate/data/Makefile.in 2005-05-07 12:35:10.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kate/data/Makefile.in kdebase-3.4.1/kate/data/Makefile.in
+--- kdebase-3.4.1.orig/kate/data/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/kate/data/Makefile.in 2005-05-24 16:27:53.879241507 +0200
@@ -263,6 +263,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -17073,53 +13104,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-katescriptsSCRIPTS: $(katescripts_SCRIPTS)
@$(NORMAL_INSTALL)
-@@ -936,7 +939,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=sample.desktop sample.sh externaltools kate-2.4.upd kwriteui.rc kwrite.desktop tips kateui.rc kate.desktop kateplugin.desktop kateprojectplugin.desktop Makefile.in katerc kateinitplugin.desktop x-kate-project.desktop Makefile.am
-+KDE_DIST=sample.desktop sample.sh externaltools kate-2.4.upd kwriteui.rc kwrite.desktop tips kateui.rc kate.desktop kateplugin.desktop kateprojectplugin.desktop Makefile.in kateinitplugin.desktop katerc x-kate-project.desktop Makefile.am
-
- #>+ 2
- docs-am:
-diff -Nru kdebase-3.4.0.orig/kate/interfaces/Makefile.in kdebase-3.4.0/kate/interfaces/Makefile.in
---- kdebase-3.4.0.orig/kate/interfaces/Makefile.in 2005-03-04 08:14:45.000000000 -0500
-+++ kdebase-3.4.0/kate/interfaces/Makefile.in 2005-05-07 12:35:10.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -76,18 +76,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkateinterfacesprivate_la_SOURCES)
- DIST_SOURCES = $(libkateinterfacesprivate_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kate/interfaces/Makefile.in kdebase-3.4.1/kate/interfaces/Makefile.in
+--- kdebase-3.4.1.orig/kate/interfaces/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/kate/interfaces/Makefile.in 2005-05-24 16:27:53.899239701 +0200
@@ -288,6 +288,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -17151,21 +13138,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdebase-3.4.0.orig/kate/Makefile.in kdebase-3.4.0/kate/Makefile.in
---- kdebase-3.4.0.orig/kate/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kate/Makefile.in 2005-05-07 12:35:07.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kate/Makefile.in kdebase-3.4.1/kate/Makefile.in
+--- kdebase-3.4.1.orig/kate/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/kate/Makefile.in 2005-05-24 16:27:53.810247739 +0200
@@ -253,6 +253,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -17197,69 +13172,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -602,7 +605,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -614,7 +623,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -622,7 +631,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -643,7 +658,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kate/pics/actions/Makefile.in kdebase-3.4.0/kate/pics/actions/Makefile.in
---- kdebase-3.4.0.orig/kate/pics/actions/Makefile.in 2005-03-04 08:14:45.000000000 -0500
-+++ kdebase-3.4.0/kate/pics/actions/Makefile.in 2005-05-07 12:35:10.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kate/pics/actions/Makefile.in kdebase-3.4.1/kate/pics/actions/Makefile.in
+--- kdebase-3.4.1.orig/kate/pics/actions/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/kate/pics/actions/Makefile.in 2005-05-24 16:27:53.925237352 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -17291,85 +13206,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -714,43 +717,43 @@
-
- #>+ 40
- install-kde-icons:
-+ $(mkinstalldirs) $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-modmod.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modmod.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-indent.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/indent.png
-+ $(mkinstalldirs) $(DESTDIR)$(kateiconsdir)/crystalsvg/32x32/actions
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-highlighting.png $(DESTDIR)$(kateiconsdir)/crystalsvg/32x32/actions/highlighting.png
- $(mkinstalldirs) $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions
- $(INSTALL_DATA) $(srcdir)/cr16-action-curfiledir.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/curfiledir.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-highlighting.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/highlighting.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-modified.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modified.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-modmod.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modmod.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-modonhd.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modonhd.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-null.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/null.png
-- $(mkinstalldirs) $(DESTDIR)$(kateiconsdir)/crystalsvg/32x32/actions
-- $(INSTALL_DATA) $(srcdir)/cr32-action-highlighting.png $(DESTDIR)$(kateiconsdir)/crystalsvg/32x32/actions/highlighting.png
-- $(mkinstalldirs) $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions
-- $(INSTALL_DATA) $(srcdir)/lo16-action-curfiledir.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/curfiledir.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-indent.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/indent.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-modified.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modified.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-modmod.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modmod.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-modonhd.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modonhd.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-null.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/null.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-modified.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modified.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-unindent.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/unindent.png
- $(mkinstalldirs) $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions
- $(INSTALL_DATA) $(srcdir)/lo22-action-indent.png $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/indent.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-null.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/null.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-null.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/null.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-curfiledir.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/curfiledir.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-modonhd.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modonhd.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-highlighting.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/highlighting.png
- $(INSTALL_DATA) $(srcdir)/lo22-action-unindent.png $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/unindent.png
-
- uninstall-kde-icons:
-+ -rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modmod.png
-+ -rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/indent.png
-+ -rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/32x32/actions/highlighting.png
- -rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/curfiledir.png
-- -rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/highlighting.png
- -rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modified.png
- -rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modmod.png
-- -rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modonhd.png
-- -rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/null.png
-- -rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/32x32/actions/highlighting.png
-- -rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/curfiledir.png
-- -rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/indent.png
-- -rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modified.png
-- -rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modmod.png
- -rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modonhd.png
-- -rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/null.png
-+ -rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modified.png
- -rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/unindent.png
- -rm -f $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/indent.png
-+ -rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/null.png
-+ -rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/null.png
-+ -rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/curfiledir.png
-+ -rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modonhd.png
-+ -rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/highlighting.png
- -rm -f $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/unindent.png
-
- #>+ 15
-diff -Nru kdebase-3.4.0.orig/kate/pics/Makefile.in kdebase-3.4.0/kate/pics/Makefile.in
---- kdebase-3.4.0.orig/kate/pics/Makefile.in 2005-03-04 08:14:45.000000000 -0500
-+++ kdebase-3.4.0/kate/pics/Makefile.in 2005-05-07 12:35:10.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kate/pics/Makefile.in kdebase-3.4.1/kate/pics/Makefile.in
+--- kdebase-3.4.1.orig/kate/pics/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/kate/pics/Makefile.in 2005-05-24 16:27:53.911238617 +0200
@@ -251,6 +251,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -17401,147 +13240,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -600,7 +603,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -612,7 +621,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -620,7 +629,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -641,7 +656,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -867,37 +882,37 @@
- #>+ 34
- install-kde-icons:
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-- $(INSTALL_DATA) $(srcdir)/cr128-app-kate.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kate.png
- $(INSTALL_DATA) $(srcdir)/cr128-app-kwrite.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kwrite.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kate.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kate.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-kwrite.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwrite.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kate.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kate.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kwrite.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwrite.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-kwrite2.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kwrite2.svgz
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-kwrite.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kwrite.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-kate.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kate.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kate.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kate.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-kate.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kate.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-kate2.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kate2.svgz
- $(INSTALL_DATA) $(srcdir)/cr48-app-kwrite.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kwrite.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- $(INSTALL_DATA) $(srcdir)/cr64-app-kate.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kate.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-kwrite.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kwrite.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-- $(INSTALL_DATA) $(srcdir)/crsc-app-kate2.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kate2.svgz
-- $(INSTALL_DATA) $(srcdir)/crsc-app-kwrite2.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kwrite2.svgz
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kate.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kate.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kwrite.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwrite.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kate.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kwrite.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kate.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwrite.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kate.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwrite.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kwrite2.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kwrite.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kate.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kate.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kate.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kate2.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kwrite.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kate.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kwrite.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kate2.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kwrite2.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kate.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwrite.png
-
- #>+ 15
- force-reedit:
-diff -Nru kdebase-3.4.0.orig/kate/plugins/defaultproject/Makefile.in kdebase-3.4.0/kate/plugins/defaultproject/Makefile.in
---- kdebase-3.4.0.orig/kate/plugins/defaultproject/Makefile.in 2005-03-04 08:14:45.000000000 -0500
-+++ kdebase-3.4.0/kate/plugins/defaultproject/Makefile.in 2005-05-07 12:35:10.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -76,18 +76,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(katedefaultprojectplugin_la_SOURCES)
- DIST_SOURCES = $(katedefaultprojectplugin_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kate/plugins/defaultproject/Makefile.in kdebase-3.4.1/kate/plugins/defaultproject/Makefile.in
+--- kdebase-3.4.1.orig/kate/plugins/defaultproject/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/kate/plugins/defaultproject/Makefile.in 2005-05-24 16:27:53.960234191 +0200
@@ -282,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -17573,21 +13274,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kate/plugins/Makefile.in kdebase-3.4.0/kate/plugins/Makefile.in
---- kdebase-3.4.0.orig/kate/plugins/Makefile.in 2005-03-04 08:14:45.000000000 -0500
-+++ kdebase-3.4.0/kate/plugins/Makefile.in 2005-05-07 12:35:10.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kate/plugins/Makefile.in kdebase-3.4.1/kate/plugins/Makefile.in
+--- kdebase-3.4.1.orig/kate/plugins/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/kate/plugins/Makefile.in 2005-05-24 16:27:53.939236088 +0200
@@ -251,6 +251,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -17619,92 +13308,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -599,7 +602,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -611,7 +620,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -619,7 +628,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -640,7 +655,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kate/utils/Makefile.in kdebase-3.4.0/kate/utils/Makefile.in
---- kdebase-3.4.0.orig/kate/utils/Makefile.in 2005-03-04 08:14:45.000000000 -0500
-+++ kdebase-3.4.0/kate/utils/Makefile.in 2005-05-07 12:35:10.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -82,18 +82,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkateutils_la_SOURCES)
- DIST_SOURCES = $(libkateutils_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kate/utils/Makefile.in kdebase-3.4.1/kate/utils/Makefile.in
+--- kdebase-3.4.1.orig/kate/utils/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/kate/utils/Makefile.in 2005-05-24 16:27:53.984232024 +0200
@@ -287,6 +287,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -17736,35 +13342,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kcheckpass/Makefile.in kdebase-3.4.0/kcheckpass/Makefile.in
---- kdebase-3.4.0.orig/kcheckpass/Makefile.in 2005-03-04 08:14:45.000000000 -0500
-+++ kdebase-3.4.0/kcheckpass/Makefile.in 2005-05-07 12:35:10.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -76,11 +76,11 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcheckpass_SOURCES)
- DIST_SOURCES = $(kcheckpass_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcheckpass/Makefile.in kdebase-3.4.1/kcheckpass/Makefile.in
+--- kdebase-3.4.1.orig/kcheckpass/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/kcheckpass/Makefile.in 2005-05-24 16:27:54.003230308 +0200
@@ -273,6 +273,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -17796,44 +13376,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kcminit/Makefile.in kdebase-3.4.0/kcminit/Makefile.in
---- kdebase-3.4.0.orig/kcminit/Makefile.in 2005-03-04 08:14:45.000000000 -0500
-+++ kdebase-3.4.0/kcminit/Makefile.in 2005-05-07 12:35:10.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -107,18 +107,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcminit_la_SOURCES)
- #>- DIST_SOURCES = $(kcminit_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcminit/Makefile.in kdebase-3.4.1/kcminit/Makefile.in
+--- kdebase-3.4.1.orig/kcminit/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/kcminit/Makefile.in 2005-05-24 16:27:54.025228321 +0200
@@ -312,6 +312,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -17865,44 +13410,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kcontrol/access/Makefile.in kdebase-3.4.0/kcontrol/access/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/access/Makefile.in 2005-03-04 08:14:46.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/access/Makefile.in 2005-05-07 12:35:10.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -100,18 +100,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kaccess_la_SOURCES) $(kcm_access_la_SOURCES)
- #>- DIST_SOURCES = $(kaccess_la_SOURCES) $(kcm_access_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/access/Makefile.in kdebase-3.4.1/kcontrol/access/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/access/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/kcontrol/access/Makefile.in 2005-05-24 16:27:54.071224166 +0200
@@ -309,6 +309,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -17934,44 +13444,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kcontrol/accessibility/Makefile.in kdebase-3.4.0/kcontrol/accessibility/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/accessibility/Makefile.in 2005-03-04 08:14:46.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/accessibility/Makefile.in 2005-05-07 12:35:10.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -80,18 +80,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_accessibility_la_SOURCES)
- DIST_SOURCES = $(kcm_accessibility_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/accessibility/Makefile.in kdebase-3.4.1/kcontrol/accessibility/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/accessibility/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/kcontrol/accessibility/Makefile.in 2005-05-24 16:27:54.156216489 +0200
@@ -286,6 +286,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -18003,44 +13478,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kcontrol/arts/Makefile.in kdebase-3.4.0/kcontrol/arts/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/arts/Makefile.in 2005-03-04 08:14:46.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/arts/Makefile.in 2005-05-07 12:35:10.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -78,18 +78,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_arts_la_SOURCES)
- DIST_SOURCES = $(kcm_arts_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/arts/Makefile.in kdebase-3.4.1/kcontrol/arts/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/arts/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/kcontrol/arts/Makefile.in 2005-05-24 16:27:54.177214592 +0200
@@ -283,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -18072,44 +13512,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kcontrol/background/Makefile.in kdebase-3.4.0/kcontrol/background/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/background/Makefile.in 2005-03-04 08:14:47.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/background/Makefile.in 2005-05-07 12:35:10.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -96,18 +96,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_background_la_SOURCES) $(libbgnd_la_SOURCES) \
- $(libkcmbgnd_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/background/Makefile.in kdebase-3.4.1/kcontrol/background/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/background/Makefile.in 2005-05-23 18:38:21.000000000 +0200
++++ kdebase-3.4.1/kcontrol/background/Makefile.in 2005-05-24 16:27:54.229209896 +0200
@@ -318,6 +318,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -18141,103 +13546,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -785,7 +788,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -797,7 +806,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -805,7 +814,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -826,7 +841,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1087,18 +1102,18 @@
- mocs: bgrender.moc
-
- #>+ 3
--bgmonitor.moc: $(srcdir)/bgmonitor.h
-- $(MOC) $(srcdir)/bgmonitor.h -o bgmonitor.moc
-+bgadvanced.moc: $(srcdir)/bgadvanced.h
-+ $(MOC) $(srcdir)/bgadvanced.h -o bgadvanced.moc
-
- #>+ 2
--mocs: bgmonitor.moc
-+mocs: bgadvanced.moc
-
- #>+ 3
--bgadvanced.moc: $(srcdir)/bgadvanced.h
-- $(MOC) $(srcdir)/bgadvanced.h -o bgadvanced.moc
-+bgmonitor.moc: $(srcdir)/bgmonitor.h
-+ $(MOC) $(srcdir)/bgmonitor.h -o bgmonitor.moc
-
- #>+ 2
--mocs: bgadvanced.moc
-+mocs: bgmonitor.moc
-
- #>+ 3
- bgdialog.moc: $(srcdir)/bgdialog.h
-@@ -1116,7 +1131,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f bgwallpaper.moc bgrender.moc bgmonitor.moc bgadvanced.moc bgdialog.moc main.moc
-+ -rm -f bgwallpaper.moc bgrender.moc bgadvanced.moc bgmonitor.moc bgdialog.moc main.moc
-
- #>+ 2
- KDE_DIST=background.desktop bgwallpaper_ui.ui bgdialog_ui.ui Makefile.in bgadvanced_ui.ui Makefile.am
-diff -Nru kdebase-3.4.0.orig/kcontrol/background/pics/Makefile.in kdebase-3.4.0/kcontrol/background/pics/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/background/pics/Makefile.in 2005-03-04 08:14:47.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/background/pics/Makefile.in 2005-05-07 12:35:11.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kcontrol/background/pics/Makefile.in kdebase-3.4.1/kcontrol/background/pics/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/background/pics/Makefile.in 2005-05-23 18:38:21.000000000 +0200
++++ kdebase-3.4.1/kcontrol/background/pics/Makefile.in 2005-05-24 16:27:54.243208632 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -18269,44 +13580,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kcontrol/bell/Makefile.in kdebase-3.4.0/kcontrol/bell/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/bell/Makefile.in 2005-03-04 08:14:47.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/bell/Makefile.in 2005-05-07 12:35:11.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -74,18 +74,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_bell_la_SOURCES)
- DIST_SOURCES = $(kcm_bell_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/bell/Makefile.in kdebase-3.4.1/kcontrol/bell/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/bell/Makefile.in 2005-05-23 18:38:21.000000000 +0200
++++ kdebase-3.4.1/kcontrol/bell/Makefile.in 2005-05-24 16:27:54.264206735 +0200
@@ -279,6 +279,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -18338,44 +13614,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kcontrol/clock/Makefile.in kdebase-3.4.0/kcontrol/clock/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/clock/Makefile.in 2005-03-04 08:14:47.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/clock/Makefile.in 2005-05-07 12:35:11.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -78,18 +78,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_clock_la_SOURCES)
- DIST_SOURCES = $(kcm_clock_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/clock/Makefile.in kdebase-3.4.1/kcontrol/clock/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/clock/Makefile.in 2005-05-23 18:38:21.000000000 +0200
++++ kdebase-3.4.1/kcontrol/clock/Makefile.in 2005-05-24 16:27:54.286204748 +0200
@@ -283,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -18407,44 +13648,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kcontrol/colors/Makefile.in kdebase-3.4.0/kcontrol/colors/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/colors/Makefile.in 2005-03-04 08:14:47.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/colors/Makefile.in 2005-05-07 12:35:11.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -81,18 +81,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_colors_la_SOURCES)
- DIST_SOURCES = $(kcm_colors_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/colors/Makefile.in kdebase-3.4.1/kcontrol/colors/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/colors/Makefile.in 2005-05-23 18:38:21.000000000 +0200
++++ kdebase-3.4.1/kcontrol/colors/Makefile.in 2005-05-24 16:27:54.318201858 +0200
@@ -287,6 +287,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -18476,21 +13682,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kcontrol/componentchooser/componentservices/Makefile.in kdebase-3.4.0/kcontrol/componentchooser/componentservices/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/componentchooser/componentservices/Makefile.in 2005-03-04 08:14:47.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/componentchooser/componentservices/Makefile.in 2005-05-07 12:35:11.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kcontrol/componentchooser/componentservices/Makefile.in kdebase-3.4.1/kcontrol/componentchooser/componentservices/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/componentchooser/componentservices/Makefile.in 2005-05-23 18:38:21.000000000 +0200
++++ kdebase-3.4.1/kcontrol/componentchooser/componentservices/Makefile.in 2005-05-24 16:27:54.355198516 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -18522,44 +13716,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kcontrol/componentchooser/Makefile.in kdebase-3.4.0/kcontrol/componentchooser/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/componentchooser/Makefile.in 2005-03-04 08:14:47.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/componentchooser/Makefile.in 2005-05-07 12:35:11.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -81,18 +81,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_componentchooser_la_SOURCES)
- DIST_SOURCES = $(kcm_componentchooser_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/componentchooser/Makefile.in kdebase-3.4.1/kcontrol/componentchooser/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/componentchooser/Makefile.in 2005-05-23 18:38:21.000000000 +0200
++++ kdebase-3.4.1/kcontrol/componentchooser/Makefile.in 2005-05-24 16:27:54.342199690 +0200
@@ -300,6 +300,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -18591,101 +13750,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -739,7 +742,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -751,7 +760,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -759,7 +768,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -780,7 +795,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1040,7 +1055,7 @@
- -rm -f componentchooser.moc kcm_componentchooser.moc
-
- #>+ 2
--KDE_DIST=browserconfig_ui.ui kcm_componentchooser.h emailclientconfig_ui.ui componentconfig_ui.ui terminalemulatorconfig_ui.ui EXAMPLE.desktop componentchooser_ui.ui Makefile.in componentchooser.desktop Makefile.am componentchooser.h
-+KDE_DIST=browserconfig_ui.ui kcm_componentchooser.h emailclientconfig_ui.ui componentconfig_ui.ui terminalemulatorconfig_ui.ui EXAMPLE.desktop componentchooser_ui.ui componentchooser.desktop Makefile.in Makefile.am componentchooser.h
-
- #>+ 8
- clean-ui:
-diff -Nru kdebase-3.4.0.orig/kcontrol/crypto/Makefile.in kdebase-3.4.0/kcontrol/crypto/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/crypto/Makefile.in 2005-03-04 08:14:47.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/crypto/Makefile.in 2005-05-07 12:35:11.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -81,18 +81,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_crypto_la_SOURCES)
- DIST_SOURCES = $(kcm_crypto_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/crypto/Makefile.in kdebase-3.4.1/kcontrol/crypto/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/crypto/Makefile.in 2005-05-23 18:38:21.000000000 +0200
++++ kdebase-3.4.1/kcontrol/crypto/Makefile.in 2005-05-24 16:27:54.447190207 +0200
@@ -287,6 +287,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -18717,44 +13784,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kcontrol/css/Makefile.in kdebase-3.4.0/kcontrol/css/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/css/Makefile.in 2005-03-04 08:14:48.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/css/Makefile.in 2005-05-07 12:35:11.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -78,18 +78,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_css_la_SOURCES)
- DIST_SOURCES = $(kcm_css_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/css/Makefile.in kdebase-3.4.1/kcontrol/css/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/css/Makefile.in 2005-05-23 18:38:21.000000000 +0200
++++ kdebase-3.4.1/kcontrol/css/Makefile.in 2005-05-24 16:27:54.464188672 +0200
@@ -284,6 +284,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -18786,44 +13818,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kcontrol/display/Makefile.in kdebase-3.4.0/kcontrol/display/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/display/Makefile.in 2005-03-04 08:14:48.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/display/Makefile.in 2005-05-07 12:35:11.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_display_la_SOURCES)
- DIST_SOURCES = $(kcm_display_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/display/Makefile.in kdebase-3.4.1/kcontrol/display/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/display/Makefile.in 2005-05-23 18:38:21.000000000 +0200
++++ kdebase-3.4.1/kcontrol/display/Makefile.in 2005-05-24 16:27:54.485186775 +0200
@@ -283,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -18855,54 +13852,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kcontrol/dnssd/Makefile.in kdebase-3.4.0/kcontrol/dnssd/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/dnssd/Makefile.in 2005-03-04 08:14:48.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/dnssd/Makefile.in 2005-05-07 12:35:11.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -79,26 +79,26 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_kdnssd_la_SOURCES)
- DIST_SOURCES = $(kcm_kdnssd_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/dnssd/Makefile.in kdebase-3.4.1/kcontrol/dnssd/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/dnssd/Makefile.in 2005-05-23 18:38:21.000000000 +0200
++++ kdebase-3.4.1/kcontrol/dnssd/Makefile.in 2005-05-24 16:27:54.507184788 +0200
@@ -292,6 +292,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -18934,44 +13886,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kcontrol/ebrowsing/Makefile.in kdebase-3.4.0/kcontrol/ebrowsing/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/ebrowsing/Makefile.in 2005-03-04 08:14:48.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/ebrowsing/Makefile.in 2005-05-07 12:35:12.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -78,18 +78,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_kurifilt_la_SOURCES)
- DIST_SOURCES = $(kcm_kurifilt_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/ebrowsing/Makefile.in kdebase-3.4.1/kcontrol/ebrowsing/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/ebrowsing/Makefile.in 2005-05-23 18:38:21.000000000 +0200
++++ kdebase-3.4.1/kcontrol/ebrowsing/Makefile.in 2005-05-24 16:27:54.530182711 +0200
@@ -297,6 +297,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -19003,92 +13920,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -734,7 +737,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -746,7 +755,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -754,7 +763,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -775,7 +790,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/ikws/Makefile.in kdebase-3.4.0/kcontrol/ebrowsing/plugins/ikws/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/ikws/Makefile.in 2005-03-04 08:14:49.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/ebrowsing/plugins/ikws/Makefile.in 2005-05-07 12:35:12.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -95,18 +95,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkuriikwsfilter_la_SOURCES) \
- $(libkurisearchfilter_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/ebrowsing/plugins/ikws/Makefile.in kdebase-3.4.1/kcontrol/ebrowsing/plugins/ikws/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/ebrowsing/plugins/ikws/Makefile.in 2005-05-23 18:38:21.000000000 +0200
++++ kdebase-3.4.1/kcontrol/ebrowsing/plugins/ikws/Makefile.in 2005-05-24 16:27:54.578178376 +0200
@@ -318,6 +318,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -19120,69 +13954,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -816,7 +819,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -828,7 +837,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -836,7 +845,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -857,7 +872,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.in kdebase-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.in 2005-03-04 08:14:49.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.in 2005-05-07 12:35:12.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.in kdebase-3.4.1/kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.in 2005-05-23 18:38:21.000000000 +0200
++++ kdebase-3.4.1/kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.in 2005-05-24 16:27:54.594176930 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -19214,66 +13988,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -819,7 +822,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=leo.desktop kde.desktop google_groups.desktop it2en.desktop hyperdictionary.desktop bugft.desktop vivisimo.desktop gracenote.desktop de2en.desktop google_images.desktop ruby_application_archive.desktop en2es.desktop imdb.desktop whatis.desktop austronaut.desktop docbook.desktop deb.desktop jeeves.desktop google_lucky.desktop msdn.desktop doi.desktop alexa_url.desktop kde_webcvs.desktop bugno.desktop dmoz.desktop google.desktop en2fr.desktop acronym.desktop fsd.desktop nl-teletekst.desktop webster.desktop katatudo.desktop ctan_cat.desktop wordref.desktop call.desktop de2fr.desktop wikipedia.desktop cia.desktop alltheweb.desktop lycos.desktop tvtome.desktop en2it.desktop cpan.desktop google_advanced.desktop netcraft.desktop hotbot.desktop freshmeat.desktop alexa.desktop thesaurus.desktop pgpkeys.desktop php.desktop nl-telephone.desktop foldoc.desktop feedster.desktop en2de.desktop google_news.desktop dbug.desktop qt.desktop rfc.desktop Makefile.in rae.desktop citeseer.desktop backports.desktop metacrawler.desktop fr2en.desktop excite.desktop ctan.desktop mamma.desktop rpmfind.desktop froogle.desktop es2en.desktop uspto.desktop fr2de.desktop freedb.desktop python.desktop altavista.desktop grec.desktop voila.desktop seek.desktop sourceforge.desktop hyperdictionary_thesaurus.desktop appsy.desktop Makefile.am amg.desktop
-+KDE_DIST=leo.desktop kde.desktop google_groups.desktop it2en.desktop hyperdictionary.desktop bugft.desktop vivisimo.desktop gracenote.desktop de2en.desktop google_images.desktop ruby_application_archive.desktop en2es.desktop imdb.desktop whatis.desktop austronaut.desktop docbook.desktop deb.desktop google_lucky.desktop jeeves.desktop msdn.desktop doi.desktop alexa_url.desktop kde_webcvs.desktop bugno.desktop dmoz.desktop google.desktop acronym.desktop en2fr.desktop fsd.desktop nl-teletekst.desktop katatudo.desktop webster.desktop ctan_cat.desktop wordref.desktop call.desktop de2fr.desktop wikipedia.desktop alltheweb.desktop cia.desktop lycos.desktop tvtome.desktop cpan.desktop en2it.desktop google_advanced.desktop netcraft.desktop hotbot.desktop freshmeat.desktop alexa.desktop pgpkeys.desktop thesaurus.desktop nl-telephone.desktop php.desktop foldoc.desktop feedster.desktop en2de.desktop dbug.desktop google_news.desktop qt.desktop rfc.desktop Makefile.in rae.desktop citeseer.desktop backports.desktop ctan.desktop fr2en.desktop excite.desktop metacrawler.desktop mamma.desktop rpmfind.desktop froogle.desktop es2en.desktop uspto.desktop fr2de.desktop freedb.desktop altavista.desktop python.desktop grec.desktop seek.desktop voila.desktop sourceforge.desktop hyperdictionary_thesaurus.desktop appsy.desktop Makefile.am amg.desktop
-
- #>+ 2
- docs-am:
-diff -Nru kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/localdomain/Makefile.in kdebase-3.4.0/kcontrol/ebrowsing/plugins/localdomain/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/localdomain/Makefile.in 2005-03-04 08:14:49.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/ebrowsing/plugins/localdomain/Makefile.in 2005-05-07 12:35:12.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -88,29 +88,29 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(liblocaldomainurifilter_la_SOURCES) \
- $(klocaldomainurifilterhelper_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/ebrowsing/plugins/localdomain/Makefile.in kdebase-3.4.1/kcontrol/ebrowsing/plugins/localdomain/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/ebrowsing/plugins/localdomain/Makefile.in 2005-05-23 18:38:21.000000000 +0200
++++ kdebase-3.4.1/kcontrol/ebrowsing/plugins/localdomain/Makefile.in 2005-05-24 16:27:54.617174853 +0200
@@ -306,6 +306,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -19305,21 +14022,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/Makefile.in kdebase-3.4.0/kcontrol/ebrowsing/plugins/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/Makefile.in 2005-03-04 08:14:48.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/ebrowsing/plugins/Makefile.in 2005-05-07 12:35:12.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kcontrol/ebrowsing/plugins/Makefile.in kdebase-3.4.1/kcontrol/ebrowsing/plugins/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/ebrowsing/plugins/Makefile.in 2005-05-23 18:38:21.000000000 +0200
++++ kdebase-3.4.1/kcontrol/ebrowsing/plugins/Makefile.in 2005-05-24 16:27:54.544181446 +0200
@@ -251,6 +251,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -19351,92 +14056,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -599,7 +602,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -611,7 +620,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -619,7 +628,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -640,7 +655,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/shorturi/Makefile.in kdebase-3.4.0/kcontrol/ebrowsing/plugins/shorturi/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/shorturi/Makefile.in 2005-03-04 08:14:49.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/ebrowsing/plugins/shorturi/Makefile.in 2005-05-07 12:35:12.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -79,18 +79,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkshorturifilter_la_SOURCES)
- DIST_SOURCES = $(libkshorturifilter_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/ebrowsing/plugins/shorturi/Makefile.in kdebase-3.4.1/kcontrol/ebrowsing/plugins/shorturi/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/ebrowsing/plugins/shorturi/Makefile.in 2005-05-23 18:38:21.000000000 +0200
++++ kdebase-3.4.1/kcontrol/ebrowsing/plugins/shorturi/Makefile.in 2005-05-24 16:27:54.641172686 +0200
@@ -285,6 +285,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -19468,44 +14090,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kcontrol/energy/Makefile.in kdebase-3.4.0/kcontrol/energy/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/energy/Makefile.in 2005-03-04 08:14:49.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/energy/Makefile.in 2005-05-07 12:35:12.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -78,18 +78,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_energy_la_SOURCES)
- DIST_SOURCES = $(kcm_energy_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/energy/Makefile.in kdebase-3.4.1/kcontrol/energy/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/energy/Makefile.in 2005-05-23 18:38:21.000000000 +0200
++++ kdebase-3.4.1/kcontrol/energy/Makefile.in 2005-05-24 16:27:54.665170518 +0200
@@ -298,6 +298,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -19537,69 +14124,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -736,7 +739,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -748,7 +757,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -756,7 +765,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -777,7 +792,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kcontrol/energy/pics/Makefile.in kdebase-3.4.0/kcontrol/energy/pics/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/energy/pics/Makefile.in 2005-03-04 08:14:49.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/energy/pics/Makefile.in 2005-05-07 12:35:12.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kcontrol/energy/pics/Makefile.in kdebase-3.4.1/kcontrol/energy/pics/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/energy/pics/Makefile.in 2005-05-23 18:38:21.000000000 +0200
++++ kdebase-3.4.1/kcontrol/energy/pics/Makefile.in 2005-05-24 16:27:54.677169434 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -19631,44 +14158,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kcontrol/filetypes/Makefile.in kdebase-3.4.0/kcontrol/filetypes/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/filetypes/Makefile.in 2005-03-04 08:14:49.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/filetypes/Makefile.in 2005-05-07 12:35:12.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -98,18 +98,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_filetypes_la_SOURCES) $(libfiletypes_la_SOURCES) \
- $(keditfiletype_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/filetypes/Makefile.in kdebase-3.4.1/kcontrol/filetypes/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/filetypes/Makefile.in 2005-05-23 18:38:21.000000000 +0200
++++ kdebase-3.4.1/kcontrol/filetypes/Makefile.in 2005-05-24 16:27:54.704166996 +0200
@@ -306,6 +306,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -19700,78 +14192,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1016,18 +1019,18 @@
- mocs: filetypesview.moc
-
- #>+ 3
--keditfiletype.moc: $(srcdir)/keditfiletype.h
-- $(MOC) $(srcdir)/keditfiletype.h -o keditfiletype.moc
-+filegroupdetails.moc: $(srcdir)/filegroupdetails.h
-+ $(MOC) $(srcdir)/filegroupdetails.h -o filegroupdetails.moc
-
- #>+ 2
--mocs: keditfiletype.moc
-+mocs: filegroupdetails.moc
-
- #>+ 3
--filegroupdetails.moc: $(srcdir)/filegroupdetails.h
-- $(MOC) $(srcdir)/filegroupdetails.h -o filegroupdetails.moc
-+keditfiletype.moc: $(srcdir)/keditfiletype.h
-+ $(MOC) $(srcdir)/keditfiletype.h -o keditfiletype.moc
-
- #>+ 2
--mocs: filegroupdetails.moc
-+mocs: keditfiletype.moc
-
- #>+ 3
- kserviceselectdlg.moc: $(srcdir)/kserviceselectdlg.h
-@@ -1038,7 +1041,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f kservicelistwidget.moc filetypedetails.moc filetypesview.moc keditfiletype.moc filegroupdetails.moc kserviceselectdlg.moc
-+ -rm -f kservicelistwidget.moc filetypedetails.moc filetypesview.moc filegroupdetails.moc keditfiletype.moc kserviceselectdlg.moc
-
- #>+ 2
- KDE_DIST=filetypes.desktop keditfiletype.h Makefile.in Makefile.am
-diff -Nru kdebase-3.4.0.orig/kcontrol/fonts/Makefile.in kdebase-3.4.0/kcontrol/fonts/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/fonts/Makefile.in 2005-03-04 08:14:49.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/fonts/Makefile.in 2005-05-07 12:35:12.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -84,18 +84,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_fonts_la_SOURCES) $(libkxftconfig_la_SOURCES)
- DIST_SOURCES = $(kcm_fonts_la_SOURCES) $(libkxftconfig_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/fonts/Makefile.in kdebase-3.4.1/kcontrol/fonts/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/fonts/Makefile.in 2005-05-23 18:38:21.000000000 +0200
++++ kdebase-3.4.1/kcontrol/fonts/Makefile.in 2005-05-24 16:27:54.720165551 +0200
@@ -290,6 +290,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -19803,44 +14226,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kcontrol/icons/Makefile.in kdebase-3.4.0/kcontrol/icons/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/icons/Makefile.in 2005-03-04 08:14:50.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/icons/Makefile.in 2005-05-07 12:35:12.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -86,18 +86,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_icons_la_SOURCES) $(testicons_SOURCES)
- DIST_SOURCES = $(kcm_icons_la_SOURCES) $(testicons_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/icons/Makefile.in kdebase-3.4.1/kcontrol/icons/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/icons/Makefile.in 2005-05-23 18:38:21.000000000 +0200
++++ kdebase-3.4.1/kcontrol/icons/Makefile.in 2005-05-24 16:27:54.747163112 +0200
@@ -292,6 +292,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -19872,87 +14260,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -943,18 +946,18 @@
-
-
- #>+ 3
--iconthemes.moc: $(srcdir)/iconthemes.h
-- $(MOC) $(srcdir)/iconthemes.h -o iconthemes.moc
-+icons.moc: $(srcdir)/icons.h
-+ $(MOC) $(srcdir)/icons.h -o icons.moc
-
- #>+ 2
--mocs: iconthemes.moc
-+mocs: icons.moc
-
- #>+ 3
--icons.moc: $(srcdir)/icons.h
-- $(MOC) $(srcdir)/icons.h -o icons.moc
-+iconthemes.moc: $(srcdir)/iconthemes.h
-+ $(MOC) $(srcdir)/iconthemes.h -o iconthemes.moc
-
- #>+ 2
--mocs: icons.moc
-+mocs: iconthemes.moc
-
- #>+ 3
- main.moc: $(srcdir)/main.h
-@@ -965,7 +968,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f iconthemes.moc icons.moc main.moc
-+ -rm -f icons.moc iconthemes.moc main.moc
-
- #>+ 2
- KDE_DIST=icons.desktop Makefile.in uninstall.desktop Makefile.am
-@@ -1016,7 +1019,7 @@
-
-
- #>+ 11
--kcm_icons_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/iconthemes.cpp $(srcdir)/icons.cpp $(srcdir)/main.cpp icons.moc iconthemes.moc main.moc
-+kcm_icons_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/iconthemes.cpp $(srcdir)/icons.cpp $(srcdir)/main.cpp iconthemes.moc icons.moc main.moc
- @echo 'creating kcm_icons_la.all_cpp.cpp ...'; \
- rm -f kcm_icons_la.all_cpp.files kcm_icons_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> kcm_icons_la.all_cpp.final; \
-diff -Nru kdebase-3.4.0.orig/kcontrol/info/Makefile.in kdebase-3.4.0/kcontrol/info/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/info/Makefile.in 2005-03-04 08:14:50.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/info/Makefile.in 2005-05-07 12:35:12.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -82,18 +82,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_info_la_SOURCES)
- DIST_SOURCES = $(kcm_info_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/info/Makefile.in kdebase-3.4.1/kcontrol/info/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/info/Makefile.in 2005-05-23 18:38:21.000000000 +0200
++++ kdebase-3.4.1/kcontrol/info/Makefile.in 2005-05-24 16:27:54.781160041 +0200
@@ -287,6 +287,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -19984,53 +14294,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -930,7 +933,7 @@
- -rm -f memory.moc
-
- #>+ 2
--KDE_DIST=memory_linux.cpp configure.in.bot info_netbsd.cpp partitions.desktop info_solaris.cpp pci.desktop xserver.desktop info_generic.cpp interrupts.desktop info_linux.cpp memory.desktop info.cpp info_svr4.cpp memory_solaris.cpp ioports.desktop info_openbsd.cpp info_sgi.cpp sound.desktop memory_netbsd.cpp memory_sgi.cpp info_hpux.cpp info_fbsd.cpp info.h memory_tru64.cpp devices.desktop memory_fbsd.cpp configure.in.in opengl.desktop memory_osx.cpp dma.desktop info_osx.cpp Makefile.in processor.desktop memory_hpux.cpp info_aix.cpp scsi.desktop Makefile.am memory.h
-+KDE_DIST=memory_linux.cpp configure.in.bot info_netbsd.cpp partitions.desktop info_solaris.cpp pci.desktop xserver.desktop info_generic.cpp interrupts.desktop info_linux.cpp memory.desktop info.cpp info_svr4.cpp memory_solaris.cpp ioports.desktop info_openbsd.cpp info_sgi.cpp sound.desktop memory_netbsd.cpp memory_sgi.cpp info_hpux.cpp info_fbsd.cpp info.h devices.desktop memory_tru64.cpp memory_fbsd.cpp configure.in.in opengl.desktop dma.desktop memory_osx.cpp info_osx.cpp Makefile.in processor.desktop memory_hpux.cpp info_aix.cpp scsi.desktop Makefile.am memory.h
-
- #>+ 3
- clean-closures:
-diff -Nru kdebase-3.4.0.orig/kcontrol/input/core/Makefile.in kdebase-3.4.0/kcontrol/input/core/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/input/core/Makefile.in 2005-03-04 08:14:51.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/input/core/Makefile.in 2005-05-07 12:35:12.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -66,18 +66,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libthemepage_la_SOURCES)
- DIST_SOURCES = $(libthemepage_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/input/core/Makefile.in kdebase-3.4.1/kcontrol/input/core/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/input/core/Makefile.in 2005-05-23 18:38:21.000000000 +0200
++++ kdebase-3.4.1/kcontrol/input/core/Makefile.in 2005-05-24 16:27:54.836155074 +0200
@@ -270,6 +270,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -20062,44 +14328,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdebase-3.4.0.orig/kcontrol/input/Makefile.in kdebase-3.4.0/kcontrol/input/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/input/Makefile.in 2005-03-04 08:14:50.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/input/Makefile.in 2005-05-07 12:35:12.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -83,18 +83,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_input_la_SOURCES)
- DIST_SOURCES = $(kcm_input_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/input/Makefile.in kdebase-3.4.1/kcontrol/input/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/input/Makefile.in 2005-05-23 18:38:21.000000000 +0200
++++ kdebase-3.4.1/kcontrol/input/Makefile.in 2005-05-24 16:27:54.817156790 +0200
@@ -303,6 +303,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -20131,69 +14362,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -769,7 +772,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -781,7 +790,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -789,7 +798,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -810,7 +825,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kcontrol/input/pics/Makefile.in kdebase-3.4.0/kcontrol/input/pics/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/input/pics/Makefile.in 2005-03-04 08:14:51.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/input/pics/Makefile.in 2005-05-07 12:35:12.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kcontrol/input/pics/Makefile.in kdebase-3.4.1/kcontrol/input/pics/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/input/pics/Makefile.in 2005-05-23 18:38:21.000000000 +0200
++++ kdebase-3.4.1/kcontrol/input/pics/Makefile.in 2005-05-24 16:27:54.849153900 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -20225,44 +14396,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kcontrol/input/xcursor/Makefile.in kdebase-3.4.0/kcontrol/input/xcursor/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/input/xcursor/Makefile.in 2005-03-04 08:14:51.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/input/xcursor/Makefile.in 2005-05-07 12:35:13.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -69,18 +69,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libthemepage_la_SOURCES)
- DIST_SOURCES = $(libthemepage_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/input/xcursor/Makefile.in kdebase-3.4.1/kcontrol/input/xcursor/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/input/xcursor/Makefile.in 2005-05-23 18:38:21.000000000 +0200
++++ kdebase-3.4.1/kcontrol/input/xcursor/Makefile.in 2005-05-24 16:27:54.868152184 +0200
@@ -273,6 +273,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -20294,44 +14430,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdebase-3.4.0.orig/kcontrol/ioslaveinfo/Makefile.in kdebase-3.4.0/kcontrol/ioslaveinfo/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/ioslaveinfo/Makefile.in 2005-03-04 08:14:51.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/ioslaveinfo/Makefile.in 2005-05-07 12:35:13.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -75,18 +75,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_ioslaveinfo_la_SOURCES)
- DIST_SOURCES = $(kcm_ioslaveinfo_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/ioslaveinfo/Makefile.in kdebase-3.4.1/kcontrol/ioslaveinfo/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/ioslaveinfo/Makefile.in 2005-05-23 18:38:22.000000000 +0200
++++ kdebase-3.4.1/kcontrol/ioslaveinfo/Makefile.in 2005-05-24 16:27:54.888150377 +0200
@@ -280,6 +280,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -20363,44 +14464,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kcontrol/joystick/Makefile.in kdebase-3.4.0/kcontrol/joystick/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/joystick/Makefile.in 2005-03-04 08:14:52.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/joystick/Makefile.in 2005-05-07 12:35:13.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -82,18 +82,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_joystick_la_SOURCES)
- DIST_SOURCES = $(kcm_joystick_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/joystick/Makefile.in kdebase-3.4.1/kcontrol/joystick/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/joystick/Makefile.in 2005-05-23 18:38:22.000000000 +0200
++++ kdebase-3.4.1/kcontrol/joystick/Makefile.in 2005-05-24 16:27:54.913148119 +0200
@@ -288,6 +288,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -20432,21 +14498,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kcontrol/kcontrol/about/Makefile.in kdebase-3.4.0/kcontrol/kcontrol/about/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/kcontrol/about/Makefile.in 2005-03-04 08:14:52.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kcontrol/about/Makefile.in 2005-05-07 12:35:13.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kcontrol/kcontrol/about/Makefile.in kdebase-3.4.1/kcontrol/kcontrol/about/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/kcontrol/about/Makefile.in 2005-05-23 18:38:22.000000000 +0200
++++ kdebase-3.4.1/kcontrol/kcontrol/about/Makefile.in 2005-05-24 16:27:54.961143784 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -20478,44 +14532,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kcontrol/kcontrol/Makefile.in kdebase-3.4.0/kcontrol/kcontrol/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/kcontrol/Makefile.in 2005-03-04 08:14:52.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kcontrol/Makefile.in 2005-05-07 12:35:13.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -113,18 +113,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcontrol_la_SOURCES)
- #>- DIST_SOURCES = $(kcontrol_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/kcontrol/Makefile.in kdebase-3.4.1/kcontrol/kcontrol/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/kcontrol/Makefile.in 2005-05-23 18:38:22.000000000 +0200
++++ kdebase-3.4.1/kcontrol/kcontrol/Makefile.in 2005-05-24 16:27:54.953144507 +0200
@@ -336,6 +336,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -20547,168 +14566,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -892,7 +895,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -904,7 +913,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -912,7 +921,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -933,7 +948,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1304,25 +1319,25 @@
- mocs: modulemenu.moc
-
- #>+ 3
--searchwidget.moc: $(srcdir)/searchwidget.h
-- $(MOC) $(srcdir)/searchwidget.h -o searchwidget.moc
-+moduleIface.moc: $(srcdir)/moduleIface.h
-+ $(MOC) $(srcdir)/moduleIface.h -o moduleIface.moc
-
- #>+ 2
--mocs: searchwidget.moc
-+mocs: moduleIface.moc
-
- #>+ 3
--moduleIface.moc: $(srcdir)/moduleIface.h
-- $(MOC) $(srcdir)/moduleIface.h -o moduleIface.moc
-+searchwidget.moc: $(srcdir)/searchwidget.h
-+ $(MOC) $(srcdir)/searchwidget.h -o searchwidget.moc
-
- #>+ 2
--mocs: moduleIface.moc
-+mocs: searchwidget.moc
-
- #>+ 3
- clean-metasources:
-- -rm -f indexwidget.moc moduleiconview.moc dockcontainer.moc aboutwidget.moc proxywidget.moc helpwidget.moc quickhelp.moc main.moc modules.moc moduletreeview.moc toplevel.moc modulemenu.moc searchwidget.moc moduleIface.moc
-+ -rm -f indexwidget.moc moduleiconview.moc dockcontainer.moc aboutwidget.moc proxywidget.moc helpwidget.moc quickhelp.moc main.moc modules.moc moduletreeview.moc toplevel.moc modulemenu.moc moduleIface.moc searchwidget.moc
-
- #>+ 2
--KDE_DIST=cr48-app-kcontrol.png KControl_NoDisplay.desktop aboutwidget.h toplevel.h kcontrolui.rc helpwidget.h main.h searchwidget.h dockcontainer.h cr16-app-kcontrol.png KControl.desktop modules.h cr32-app-kcontrol.png proxywidget.h quickhelp.h cr64-app-kcontrol.png global.h modulemenu.h modulemenu.cpp kinfocenterui.rc kinfocenter.desktop moduletreeview.h Makefile.in moduleiconview.h version.h indexwidget.h cr128-app-kcontrol.png moduleIface.h Makefile.am kcrootonly.h
-+KDE_DIST=cr48-app-kcontrol.png KControl_NoDisplay.desktop aboutwidget.h toplevel.h kcontrolui.rc helpwidget.h main.h searchwidget.h dockcontainer.h cr16-app-kcontrol.png KControl.desktop modules.h cr32-app-kcontrol.png proxywidget.h quickhelp.h cr64-app-kcontrol.png global.h modulemenu.h modulemenu.cpp kinfocenterui.rc kinfocenter.desktop moduletreeview.h Makefile.in moduleiconview.h version.h cr128-app-kcontrol.png indexwidget.h moduleIface.h Makefile.am kcrootonly.h
-
- #>+ 4
- clean-idl:
-@@ -1334,23 +1349,23 @@
-
- #>+ 19
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-- $(INSTALL_DATA) $(srcdir)/cr128-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcontrol.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcontrol.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcontrol.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcontrol.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcontrol.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcontrol.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-- $(INSTALL_DATA) $(srcdir)/cr64-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcontrol.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcontrol.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcontrol.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcontrol.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcontrol.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcontrol.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcontrol.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcontrol.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcontrol.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcontrol.png
-
- #>+ 15
- force-reedit:
-@@ -1391,7 +1406,7 @@
-
-
- #>+ 11
--libkdeinit_kcontrol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/indexwidget.cpp $(srcdir)/helpwidget.cpp $(srcdir)/dockcontainer.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/quickhelp.cpp $(srcdir)/moduletreeview.cpp $(srcdir)/moduleiconview.cpp $(srcdir)/moduleIface.cpp $(srcdir)/global.cpp $(srcdir)/modules.cpp $(srcdir)/proxywidget.cpp $(srcdir)/kcrootonly.cpp $(srcdir)/searchwidget.cpp moduleIface_skel.cpp indexwidget.moc aboutwidget.moc dockcontainer.moc moduleiconview.moc proxywidget.moc helpwidget.moc quickhelp.moc main.moc modules.moc moduletreeview.moc toplevel.moc moduleIface.moc searchwidget.moc
-+libkdeinit_kcontrol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/indexwidget.cpp $(srcdir)/helpwidget.cpp $(srcdir)/dockcontainer.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/quickhelp.cpp $(srcdir)/moduletreeview.cpp $(srcdir)/moduleiconview.cpp $(srcdir)/moduleIface.cpp $(srcdir)/global.cpp $(srcdir)/modules.cpp $(srcdir)/proxywidget.cpp $(srcdir)/kcrootonly.cpp $(srcdir)/searchwidget.cpp moduleIface_skel.cpp indexwidget.moc aboutwidget.moc dockcontainer.moc moduleiconview.moc proxywidget.moc helpwidget.moc quickhelp.moc main.moc modules.moc moduletreeview.moc toplevel.moc searchwidget.moc moduleIface.moc
- @echo 'creating libkdeinit_kcontrol_la.all_cpp.cpp ...'; \
- rm -f libkdeinit_kcontrol_la.all_cpp.files libkdeinit_kcontrol_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libkdeinit_kcontrol_la.all_cpp.final; \
-diff -Nru kdebase-3.4.0.orig/kcontrol/kded/Makefile.in kdebase-3.4.0/kcontrol/kded/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/kded/Makefile.in 2005-03-04 08:14:52.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kded/Makefile.in 2005-05-07 12:35:13.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -75,18 +75,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_kded_la_SOURCES)
- DIST_SOURCES = $(kcm_kded_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/kded/Makefile.in kdebase-3.4.1/kcontrol/kded/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/kded/Makefile.in 2005-05-23 18:38:22.000000000 +0200
++++ kdebase-3.4.1/kcontrol/kded/Makefile.in 2005-05-24 16:27:54.975142520 +0200
@@ -280,6 +280,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -20740,53 +14600,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -917,7 +920,7 @@
- -rm -f kcmkded.moc
-
- #>+ 2
--KDE_DIST=kcmkded.desktop Makefile.in kcmkded.h Makefile.am
-+KDE_DIST=kcmkded.desktop kcmkded.h Makefile.in Makefile.am
-
- #>+ 3
- clean-closures:
-diff -Nru kdebase-3.4.0.orig/kcontrol/kdm/Makefile.in kdebase-3.4.0/kcontrol/kdm/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/kdm/Makefile.in 2005-03-04 08:14:52.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kdm/Makefile.in 2005-05-07 12:35:13.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -84,18 +84,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_kdm_la_SOURCES)
- DIST_SOURCES = $(kcm_kdm_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/kdm/Makefile.in kdebase-3.4.1/kcontrol/kdm/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/kdm/Makefile.in 2005-05-23 18:38:22.000000000 +0200
++++ kdebase-3.4.1/kcontrol/kdm/Makefile.in 2005-05-24 16:27:55.003139991 +0200
@@ -289,6 +289,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -20818,97 +14634,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -947,18 +950,18 @@
- mocs: kdm-conv.moc
-
- #>+ 3
--kdm-font.moc: $(srcdir)/kdm-font.h
-- $(MOC) $(srcdir)/kdm-font.h -o kdm-font.moc
-+kdm-appear.moc: $(srcdir)/kdm-appear.h
-+ $(MOC) $(srcdir)/kdm-appear.h -o kdm-appear.moc
-
- #>+ 2
--mocs: kdm-font.moc
-+mocs: kdm-appear.moc
-
- #>+ 3
--kdm-appear.moc: $(srcdir)/kdm-appear.h
-- $(MOC) $(srcdir)/kdm-appear.h -o kdm-appear.moc
-+kdm-font.moc: $(srcdir)/kdm-font.h
-+ $(MOC) $(srcdir)/kdm-font.h -o kdm-font.moc
-
- #>+ 2
--mocs: kdm-appear.moc
-+mocs: kdm-font.moc
-
- #>+ 3
- background.moc: $(srcdir)/background.h
-@@ -976,7 +979,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f kdm-sess.moc kdm-users.moc kdm-conv.moc kdm-font.moc kdm-appear.moc background.moc main.moc
-+ -rm -f kdm-sess.moc kdm-users.moc kdm-conv.moc kdm-appear.moc kdm-font.moc background.moc main.moc
-
- #>+ 2
- KDE_DIST=main.h kdm-font.h kdm-users.h kdm-sess.h background.h kdm.desktop kdm-appear.h Makefile.in kdm-conv.h Makefile.am
-@@ -1027,7 +1030,7 @@
-
-
- #>+ 11
--kcm_kdm_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/background.cpp $(srcdir)/kdm-appear.cpp $(srcdir)/kdm-font.cpp $(srcdir)/kdm-sess.cpp $(srcdir)/kdm-users.cpp $(srcdir)/kdm-conv.cpp $(srcdir)/main.cpp kdm-sess.moc kdm-users.moc kdm-conv.moc kdm-appear.moc kdm-font.moc background.moc main.moc
-+kcm_kdm_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/background.cpp $(srcdir)/kdm-appear.cpp $(srcdir)/kdm-font.cpp $(srcdir)/kdm-sess.cpp $(srcdir)/kdm-users.cpp $(srcdir)/kdm-conv.cpp $(srcdir)/main.cpp kdm-sess.moc kdm-users.moc kdm-conv.moc kdm-font.moc kdm-appear.moc background.moc main.moc
- @echo 'creating kcm_kdm_la.all_cpp.cpp ...'; \
- rm -f kcm_kdm_la.all_cpp.files kcm_kdm_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> kcm_kdm_la.all_cpp.final; \
-@@ -1069,8 +1072,8 @@
- #>+ 17
- kdm-conv.o: kdm-conv.moc
- main.lo: main.moc
--kdm-appear.lo: kdm-appear.moc
- kdm-font.lo: kdm-font.moc
-+kdm-appear.lo: kdm-appear.moc
- main.o: main.moc
- kdm-appear.o: kdm-appear.moc
- kdm-sess.lo: kdm-sess.moc
-diff -Nru kdebase-3.4.0.orig/kcontrol/keys/Makefile.in kdebase-3.4.0/kcontrol/keys/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/keys/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/keys/Makefile.in 2005-05-07 12:35:13.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -84,18 +84,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_keys_la_SOURCES)
- DIST_SOURCES = $(kcm_keys_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/keys/Makefile.in kdebase-3.4.1/kcontrol/keys/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/keys/Makefile.in 2005-05-23 18:38:22.000000000 +0200
++++ kdebase-3.4.1/kcontrol/keys/Makefile.in 2005-05-24 16:27:55.053135475 +0200
@@ -291,6 +291,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -20940,44 +14668,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kcontrol/kfontinst/kcmfontinst/Makefile.in kdebase-3.4.0/kcontrol/kfontinst/kcmfontinst/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/kfontinst/kcmfontinst/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kfontinst/kcmfontinst/Makefile.in 2005-05-07 12:35:14.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -84,18 +84,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_fontinst_la_SOURCES)
- DIST_SOURCES = $(kcm_fontinst_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/kfontinst/kcmfontinst/Makefile.in kdebase-3.4.1/kcontrol/kfontinst/kcmfontinst/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/kfontinst/kcmfontinst/Makefile.in 2005-05-23 18:38:22.000000000 +0200
++++ kdebase-3.4.1/kcontrol/kfontinst/kcmfontinst/Makefile.in 2005-05-24 16:27:55.100131230 +0200
@@ -290,6 +290,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -21009,68 +14702,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -959,17 +962,17 @@
-
- #>+ 13
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
-- $(INSTALL_DATA) $(srcdir)/cr16-action-newfont.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/newfont.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions
-- $(INSTALL_DATA) $(srcdir)/cr22-action-newfont.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/newfont.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions
- $(INSTALL_DATA) $(srcdir)/cr32-action-newfont.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/newfont.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-newfont.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/newfont.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-newfont.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/newfont.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/newfont.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/newfont.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/newfont.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/newfont.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/newfont.png
-
- #>+ 15
- force-reedit:
-diff -Nru kdebase-3.4.0.orig/kcontrol/kfontinst/kfile-plugin/Makefile.in kdebase-3.4.0/kcontrol/kfontinst/kfile-plugin/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/kfontinst/kfile-plugin/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kfontinst/kfile-plugin/Makefile.in 2005-05-07 12:35:14.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -78,18 +78,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kfile_font_la_SOURCES)
- DIST_SOURCES = $(kfile_font_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/kfontinst/kfile-plugin/Makefile.in kdebase-3.4.1/kcontrol/kfontinst/kfile-plugin/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/kfontinst/kfile-plugin/Makefile.in 2005-05-23 18:38:22.000000000 +0200
++++ kdebase-3.4.1/kcontrol/kfontinst/kfile-plugin/Makefile.in 2005-05-24 16:27:55.119129514 +0200
@@ -284,6 +284,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -21102,57 +14736,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kcontrol/kfontinst/kfontinst/Makefile.in kdebase-3.4.0/kcontrol/kfontinst/kfontinst/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/kfontinst/kfontinst/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kfontinst/kfontinst/Makefile.in 2005-05-07 12:35:14.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,29 +77,29 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kfontinst_SOURCES)
- DIST_SOURCES = $(kfontinst_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/kfontinst/kfontinst/Makefile.in kdebase-3.4.1/kcontrol/kfontinst/kfontinst/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/kfontinst/kfontinst/Makefile.in 2005-05-23 18:38:22.000000000 +0200
++++ kdebase-3.4.1/kcontrol/kfontinst/kfontinst/Makefile.in 2005-05-24 16:27:55.138127798 +0200
@@ -292,6 +292,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -21184,44 +14770,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kcontrol/kfontinst/kio/Makefile.in kdebase-3.4.0/kcontrol/kfontinst/kio/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/kfontinst/kio/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kfontinst/kio/Makefile.in 2005-05-07 12:35:14.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -80,18 +80,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kio_fonts_la_SOURCES)
- DIST_SOURCES = $(kio_fonts_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/kfontinst/kio/Makefile.in kdebase-3.4.1/kcontrol/kfontinst/kio/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/kfontinst/kio/Makefile.in 2005-05-23 18:38:22.000000000 +0200
++++ kdebase-3.4.1/kcontrol/kfontinst/kio/Makefile.in 2005-05-24 16:27:55.157126082 +0200
@@ -288,6 +288,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -21253,44 +14804,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kcontrol/kfontinst/lib/Makefile.in kdebase-3.4.0/kcontrol/kfontinst/lib/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/kfontinst/lib/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kfontinst/lib/Makefile.in 2005-05-07 12:35:14.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -80,18 +80,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkfontinst_la_SOURCES)
- DIST_SOURCES = $(libkfontinst_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/kfontinst/lib/Makefile.in kdebase-3.4.1/kcontrol/kfontinst/lib/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/kfontinst/lib/Makefile.in 2005-05-23 18:38:22.000000000 +0200
++++ kdebase-3.4.1/kcontrol/kfontinst/lib/Makefile.in 2005-05-24 16:27:55.175124456 +0200
@@ -284,6 +284,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -21322,21 +14838,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kcontrol/kfontinst/Makefile.in kdebase-3.4.0/kcontrol/kfontinst/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/kfontinst/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kfontinst/Makefile.in 2005-05-07 12:35:13.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kcontrol/kfontinst/Makefile.in kdebase-3.4.1/kcontrol/kfontinst/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/kfontinst/Makefile.in 2005-05-23 18:38:22.000000000 +0200
++++ kdebase-3.4.1/kcontrol/kfontinst/Makefile.in 2005-05-24 16:27:55.068134120 +0200
@@ -263,6 +263,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -21368,92 +14872,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -633,7 +636,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -645,7 +654,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -653,7 +662,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -674,7 +689,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kcontrol/kfontinst/thumbnail/Makefile.in kdebase-3.4.0/kcontrol/kfontinst/thumbnail/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/kfontinst/thumbnail/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kfontinst/thumbnail/Makefile.in 2005-05-07 12:35:14.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -79,18 +79,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(fontthumbnail_la_SOURCES)
- DIST_SOURCES = $(fontthumbnail_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/kfontinst/thumbnail/Makefile.in kdebase-3.4.1/kcontrol/kfontinst/thumbnail/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/kfontinst/thumbnail/Makefile.in 2005-05-23 18:38:22.000000000 +0200
++++ kdebase-3.4.1/kcontrol/kfontinst/thumbnail/Makefile.in 2005-05-24 16:27:55.194122740 +0200
@@ -285,6 +285,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -21485,44 +14906,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kcontrol/kfontinst/viewpart/Makefile.in kdebase-3.4.0/kcontrol/kfontinst/viewpart/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/kfontinst/viewpart/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kfontinst/viewpart/Makefile.in 2005-05-07 12:35:15.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -93,18 +93,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkfontviewpart_la_SOURCES) $(kfontview_SOURCES)
- DIST_SOURCES = $(libkfontviewpart_la_SOURCES) $(kfontview_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/kfontinst/viewpart/Makefile.in kdebase-3.4.1/kcontrol/kfontinst/viewpart/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/kfontinst/viewpart/Makefile.in 2005-05-23 18:38:22.000000000 +0200
++++ kdebase-3.4.1/kcontrol/kfontinst/viewpart/Makefile.in 2005-05-24 16:27:55.219120483 +0200
@@ -301,6 +301,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -21554,44 +14940,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kcontrol/kicker/Makefile.in kdebase-3.4.0/kcontrol/kicker/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/kicker/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kicker/Makefile.in 2005-05-07 12:35:16.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -85,18 +85,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_kicker_la_SOURCES)
- DIST_SOURCES = $(kcm_kicker_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/kicker/Makefile.in kdebase-3.4.1/kcontrol/kicker/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/kicker/Makefile.in 2005-05-23 18:38:22.000000000 +0200
++++ kdebase-3.4.1/kcontrol/kicker/Makefile.in 2005-05-24 16:27:55.249117773 +0200
@@ -292,6 +292,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -21623,78 +14974,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -977,18 +980,18 @@
-
-
- #>+ 3
--menutab_impl.moc: $(srcdir)/menutab_impl.h
-- $(MOC) $(srcdir)/menutab_impl.h -o menutab_impl.moc
-+applettab_impl.moc: $(srcdir)/applettab_impl.h
-+ $(MOC) $(srcdir)/applettab_impl.h -o applettab_impl.moc
-
- #>+ 2
--mocs: menutab_impl.moc
-+mocs: applettab_impl.moc
-
- #>+ 3
--applettab_impl.moc: $(srcdir)/applettab_impl.h
-- $(MOC) $(srcdir)/applettab_impl.h -o applettab_impl.moc
-+menutab_impl.moc: $(srcdir)/menutab_impl.h
-+ $(MOC) $(srcdir)/menutab_impl.h -o menutab_impl.moc
-
- #>+ 2
--mocs: applettab_impl.moc
-+mocs: menutab_impl.moc
-
- #>+ 3
- lookandfeeltab_kcm.moc: $(srcdir)/lookandfeeltab_kcm.h
-@@ -1034,7 +1037,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f menutab_impl.moc applettab_impl.moc lookandfeeltab_kcm.moc main.moc hidingtab_impl.moc lookandfeeltab_impl.moc positiontab_impl.moc advancedDialog.moc
-+ -rm -f applettab_impl.moc menutab_impl.moc lookandfeeltab_kcm.moc main.moc hidingtab_impl.moc lookandfeeltab_impl.moc positiontab_impl.moc advancedDialog.moc
-
- #>+ 2
- KDE_DIST=applettab_impl.h lookandfeeltab.ui lookandfeeltab_kcm.h advancedOptions.ui panel.desktop positiontab.ui kicker_config_appearance.desktop applettab_impl.cpp kicker_config.desktop menutab.ui applettab.ui Makefile.in hidingtab.ui uninstall.desktop lookandfeeltab_kcm.cpp Makefile.am
-diff -Nru kdebase-3.4.0.orig/kcontrol/kio/Makefile.in kdebase-3.4.0/kcontrol/kio/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/kio/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kio/Makefile.in 2005-05-07 12:35:16.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -89,18 +89,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_kio_la_SOURCES)
- DIST_SOURCES = $(kcm_kio_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/kio/Makefile.in kdebase-3.4.1/kcontrol/kio/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/kio/Makefile.in 2005-05-23 18:38:22.000000000 +0200
++++ kdebase-3.4.1/kcontrol/kio/Makefile.in 2005-05-24 16:27:55.297113438 +0200
@@ -312,6 +312,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -21726,141 +15008,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -839,7 +842,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -851,7 +860,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -859,7 +868,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -880,7 +895,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1148,18 +1163,18 @@
- mocs: smbrodlg.moc
-
- #>+ 3
--socks.moc: $(srcdir)/socks.h
-- $(MOC) $(srcdir)/socks.h -o socks.moc
-+kmanualproxydlg.moc: $(srcdir)/kmanualproxydlg.h
-+ $(MOC) $(srcdir)/kmanualproxydlg.h -o kmanualproxydlg.moc
-
- #>+ 2
--mocs: socks.moc
-+mocs: kmanualproxydlg.moc
-
- #>+ 3
--kmanualproxydlg.moc: $(srcdir)/kmanualproxydlg.h
-- $(MOC) $(srcdir)/kmanualproxydlg.h -o kmanualproxydlg.moc
-+socks.moc: $(srcdir)/socks.h
-+ $(MOC) $(srcdir)/socks.h -o socks.moc
-
- #>+ 2
--mocs: kmanualproxydlg.moc
-+mocs: socks.moc
-
- #>+ 3
- kproxydlg.moc: $(srcdir)/kproxydlg.h
-@@ -1190,18 +1205,18 @@
- mocs: kcookiesmain.moc
-
- #>+ 3
--kcookiesmanagement.moc: $(srcdir)/kcookiesmanagement.h
-- $(MOC) $(srcdir)/kcookiesmanagement.h -o kcookiesmanagement.moc
-+kcookiespolicies.moc: $(srcdir)/kcookiespolicies.h
-+ $(MOC) $(srcdir)/kcookiespolicies.h -o kcookiespolicies.moc
-
- #>+ 2
--mocs: kcookiesmanagement.moc
-+mocs: kcookiespolicies.moc
-
- #>+ 3
--kcookiespolicies.moc: $(srcdir)/kcookiespolicies.h
-- $(MOC) $(srcdir)/kcookiespolicies.h -o kcookiespolicies.moc
-+kcookiesmanagement.moc: $(srcdir)/kcookiesmanagement.h
-+ $(MOC) $(srcdir)/kcookiesmanagement.h -o kcookiesmanagement.moc
-
- #>+ 2
--mocs: kcookiespolicies.moc
-+mocs: kcookiesmanagement.moc
-
- #>+ 3
- netpref.moc: $(srcdir)/netpref.h
-@@ -1233,10 +1248,10 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f uagentproviderdlg.moc smbrodlg.moc socks.moc kmanualproxydlg.moc kproxydlg.moc useragentdlg.moc main.moc kcookiesmain.moc kcookiesmanagement.moc kcookiespolicies.moc netpref.moc policydlg.moc kenvvarproxydlg.moc cache.moc
-+ -rm -f uagentproviderdlg.moc smbrodlg.moc kmanualproxydlg.moc socks.moc kproxydlg.moc useragentdlg.moc main.moc kcookiesmain.moc kcookiespolicies.moc kcookiesmanagement.moc netpref.moc policydlg.moc kenvvarproxydlg.moc cache.moc
-
- #>+ 2
--KDE_DIST=uasprovider.desktop policydlg.h fakeuaprovider.h socks.upd lanbrowser.desktop smb.desktop UA-DESKTOP-FILE-HOWTO useragentdlg.h kioslave.kcfg kio_ftprc.kcfg socksbase.ui netpref.h smbrodlg.h main.h cache.desktop kio_ftprc.kcfgc cookies.desktop kenvvarproxydlg.h ksaveioconfig.h uagentproviderdlg_ui.ui useragentdlg_ui.ui cache_ui.ui netpref.desktop kcookiespolicies.h socks.h proxy.desktop uagentproviderdlg.h kproxydlg.h envvarproxy_ui.ui kproxydlg_ui.ui kioslave.kcfgc policydlg_ui.ui useragent.desktop cache.h Makefile.in kcookiesmanagementdlg_ui.ui kcookiespoliciesdlg_ui.ui kcookiesmanagement.h uninstall.desktop kproxydlgbase.h kcookiesmain.h Makefile.am manualproxy_ui.ui kmanualproxydlg.h
-+KDE_DIST=uasprovider.desktop fakeuaprovider.h policydlg.h socks.upd lanbrowser.desktop smb.desktop UA-DESKTOP-FILE-HOWTO kioslave.kcfg useragentdlg.h kio_ftprc.kcfg socksbase.ui netpref.h main.h smbrodlg.h cache.desktop kio_ftprc.kcfgc cookies.desktop kenvvarproxydlg.h ksaveioconfig.h uagentproviderdlg_ui.ui useragentdlg_ui.ui cache_ui.ui netpref.desktop kcookiespolicies.h socks.h proxy.desktop uagentproviderdlg.h kproxydlg.h envvarproxy_ui.ui kproxydlg_ui.ui kioslave.kcfgc policydlg_ui.ui useragent.desktop cache.h Makefile.in kcookiesmanagementdlg_ui.ui kcookiespoliciesdlg_ui.ui kcookiesmanagement.h uninstall.desktop kproxydlgbase.h Makefile.am kcookiesmain.h kmanualproxydlg.h manualproxy_ui.ui
-
- #>+ 13
- clean-ui:
-@@ -1298,7 +1313,7 @@
-
-
- #>+ 11
--kcm_kio_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/policydlg.cpp $(srcdir)/kcookiesmain.cpp $(srcdir)/kcookiespolicies.cpp $(srcdir)/main.cpp $(srcdir)/smbrodlg.cpp $(srcdir)/useragentdlg.cpp $(srcdir)/kproxydlgbase.cpp $(srcdir)/kmanualproxydlg.cpp $(srcdir)/kenvvarproxydlg.cpp $(srcdir)/kproxydlg.cpp $(srcdir)/kcookiesmanagement.cpp $(srcdir)/fakeuaprovider.cpp $(srcdir)/uagentproviderdlg.cpp $(srcdir)/netpref.cpp $(srcdir)/cache.cpp $(srcdir)/ksaveioconfig.cpp $(srcdir)/socks.cpp socksbase.cpp kproxydlg_ui.cpp kcookiesmanagementdlg_ui.cpp kcookiespoliciesdlg_ui.cpp policydlg_ui.cpp useragentdlg_ui.cpp uagentproviderdlg_ui.cpp manualproxy_ui.cpp envvarproxy_ui.cpp cache_ui.cpp uagentproviderdlg.moc smbrodlg.moc manualproxy_ui.moc policydlg_ui.moc kproxydlg.moc socksbase.moc envvarproxy_ui.moc kcookiespoliciesdlg_ui.moc kproxydlg_ui.moc cache_ui.moc uagentproviderdlg_ui.moc kcookiesmain.moc useragentdlg_ui.moc netpref.moc policydlg.moc kenvvarproxydlg.moc kcookiesmanagementdlg_ui.moc socks.moc kmanualproxydlg.moc useragentdlg.moc main.moc kcookiespolicies.moc kcookiesmanagement.moc cache.moc
-+kcm_kio_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/policydlg.cpp $(srcdir)/kcookiesmain.cpp $(srcdir)/kcookiespolicies.cpp $(srcdir)/main.cpp $(srcdir)/smbrodlg.cpp $(srcdir)/useragentdlg.cpp $(srcdir)/kproxydlgbase.cpp $(srcdir)/kmanualproxydlg.cpp $(srcdir)/kenvvarproxydlg.cpp $(srcdir)/kproxydlg.cpp $(srcdir)/kcookiesmanagement.cpp $(srcdir)/fakeuaprovider.cpp $(srcdir)/uagentproviderdlg.cpp $(srcdir)/netpref.cpp $(srcdir)/cache.cpp $(srcdir)/ksaveioconfig.cpp $(srcdir)/socks.cpp socksbase.cpp kproxydlg_ui.cpp kcookiesmanagementdlg_ui.cpp kcookiespoliciesdlg_ui.cpp policydlg_ui.cpp useragentdlg_ui.cpp uagentproviderdlg_ui.cpp manualproxy_ui.cpp envvarproxy_ui.cpp cache_ui.cpp uagentproviderdlg.moc smbrodlg.moc manualproxy_ui.moc policydlg_ui.moc kproxydlg.moc socksbase.moc envvarproxy_ui.moc kcookiespoliciesdlg_ui.moc kproxydlg_ui.moc cache_ui.moc uagentproviderdlg_ui.moc kcookiesmain.moc useragentdlg_ui.moc netpref.moc policydlg.moc kenvvarproxydlg.moc kcookiesmanagementdlg_ui.moc kmanualproxydlg.moc socks.moc useragentdlg.moc main.moc kcookiesmanagement.moc kcookiespolicies.moc cache.moc
- @echo 'creating kcm_kio_la.all_cpp.cpp ...'; \
- rm -f kcm_kio_la.all_cpp.files kcm_kio_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> kcm_kio_la.all_cpp.final; \
-diff -Nru kdebase-3.4.0.orig/kcontrol/kio/uasproviders/Makefile.in kdebase-3.4.0/kcontrol/kio/uasproviders/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/kio/uasproviders/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kio/uasproviders/Makefile.in 2005-05-07 12:35:16.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kcontrol/kio/uasproviders/Makefile.in kdebase-3.4.1/kcontrol/kio/uasproviders/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/kio/uasproviders/Makefile.in 2005-05-23 18:38:22.000000000 +0200
++++ kdebase-3.4.1/kcontrol/kio/uasproviders/Makefile.in 2005-05-24 16:27:55.308112444 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -21892,53 +15042,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -743,7 +746,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=ns71oncurrent.desktop mozoncurrent.desktop mozoncurrent16.desktop nn476onppc.desktop op403onwinnt4.desktop w3moncurrent.desktop nn475onwin95.desktop ie60onwinnt51.desktop ie55onwin98.desktop googlebot.desktop safari.desktop ie45onwinnt5.desktop wgetoncurrent.desktop firefoxoncurrent.desktop nn475oncurrent.desktop lynxoncurrent.desktop ie501onwinnt5.desktop ns71onwinnt51.desktop ie60oncurrent.desktop ie55onwinnt5.desktop Makefile.in mozonwin2000.desktop ie401onwinnt4.desktop ie50onppc.desktop op75oncurrent.desktop mozonwinxp.desktop nn301oncurrent.desktop mozoncurrent12.desktop Makefile.am
-+KDE_DIST=ns71oncurrent.desktop mozoncurrent.desktop mozoncurrent16.desktop nn476onppc.desktop op403onwinnt4.desktop w3moncurrent.desktop nn475onwin95.desktop ie60onwinnt51.desktop ie55onwin98.desktop googlebot.desktop safari.desktop ie45onwinnt5.desktop wgetoncurrent.desktop firefoxoncurrent.desktop nn475oncurrent.desktop lynxoncurrent.desktop ie501onwinnt5.desktop ns71onwinnt51.desktop ie55onwinnt5.desktop ie60oncurrent.desktop Makefile.in mozonwin2000.desktop ie401onwinnt4.desktop ie50onppc.desktop op75oncurrent.desktop mozonwinxp.desktop nn301oncurrent.desktop mozoncurrent12.desktop Makefile.am
-
- #>+ 2
- docs-am:
-diff -Nru kdebase-3.4.0.orig/kcontrol/knotify/Makefile.in kdebase-3.4.0/kcontrol/knotify/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/knotify/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/knotify/Makefile.in 2005-05-07 12:35:16.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -80,18 +80,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_knotify_la_SOURCES)
- DIST_SOURCES = $(kcm_knotify_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/knotify/Makefile.in kdebase-3.4.1/kcontrol/knotify/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/knotify/Makefile.in 2005-05-23 18:38:22.000000000 +0200
++++ kdebase-3.4.1/kcontrol/knotify/Makefile.in 2005-05-24 16:27:55.325110909 +0200
@@ -301,6 +301,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -21970,69 +15076,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -759,7 +762,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -771,7 +780,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -779,7 +788,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -800,7 +815,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kcontrol/knotify/sounds/Makefile.in kdebase-3.4.0/kcontrol/knotify/sounds/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/knotify/sounds/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/knotify/sounds/Makefile.in 2005-05-07 12:35:16.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kcontrol/knotify/sounds/Makefile.in kdebase-3.4.1/kcontrol/knotify/sounds/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/knotify/sounds/Makefile.in 2005-05-23 18:38:22.000000000 +0200
++++ kdebase-3.4.1/kcontrol/knotify/sounds/Makefile.in 2005-05-24 16:27:55.340109554 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -22064,53 +15110,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -844,7 +847,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=KDE_Beep_Pop.wav KDE_Beep_RimShot.wav KDE_Window_Shade_Up.wav KDE_Beep_Beep.wav KDE_Desktop3.wav KDE_Window_UnSticky.wav KDE_Beep_Door.wav KDE_Window_Maximize.wav KDE_Beep_ClassicBeep.wav KDE_Beep_Ahem.wav KDE_Beep_Bottles.wav KDE_Window_Open.wav KDE_Dialog_Disappear.wav KDE_Beep_ShortBeep.wav KDE_Error.wav KDE_Window_DeIconify.wav KDE_Critical_Error.wav KDE_Window_Iconify.wav KDE_Beep_Yo.wav KDE_Window_Sticky.wav KDE_Notify.wav KDE_Window_Close.wav KDE_Desktop2.wav KDE_Desktop1.wav KDE_Beep_Lightning.wav KDE_Desktop6.wav KDE_Window_UnMaximize.wav KDE_Desktop4.wav KDE_Desktop5.wav KDE_Beep_Connect.wav Makefile.in KDE_Beep_ClockChime.wav KDE_Window_Shade_Down.wav KDE_Beep_Honk.wav KDE_Click.wav KDE_Logout.wav KDE_Close_Window.wav KDE_Dialog_Appear.wav Makefile.am KDE_Startup.wav KDE_Beep_RingRing.wav KDE_Desktop7.wav KDE_Desktop8.wav
-+KDE_DIST=KDE_Beep_Pop.wav KDE_Beep_RimShot.wav KDE_Window_Shade_Up.wav KDE_Beep_Beep.wav KDE_Desktop3.wav KDE_Beep_Door.wav KDE_Window_UnSticky.wav KDE_Window_Maximize.wav KDE_Beep_ClassicBeep.wav KDE_Beep_Ahem.wav KDE_Beep_Bottles.wav KDE_Window_Open.wav KDE_Dialog_Disappear.wav KDE_Beep_ShortBeep.wav KDE_Error.wav KDE_Window_DeIconify.wav KDE_Critical_Error.wav KDE_Window_Iconify.wav KDE_Beep_Yo.wav KDE_Window_Sticky.wav KDE_Notify.wav KDE_Desktop2.wav KDE_Window_Close.wav KDE_Desktop1.wav KDE_Beep_Lightning.wav KDE_Desktop6.wav KDE_Desktop4.wav KDE_Window_UnMaximize.wav KDE_Desktop5.wav KDE_Beep_Connect.wav Makefile.in KDE_Beep_ClockChime.wav KDE_Window_Shade_Down.wav KDE_Beep_Honk.wav KDE_Click.wav KDE_Logout.wav KDE_Close_Window.wav KDE_Dialog_Appear.wav Makefile.am KDE_Startup.wav KDE_Beep_RingRing.wav KDE_Desktop7.wav KDE_Desktop8.wav
-
- #>+ 2
- docs-am:
-diff -Nru kdebase-3.4.0.orig/kcontrol/konq/Makefile.in kdebase-3.4.0/kcontrol/konq/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/konq/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/konq/Makefile.in 2005-05-07 12:35:16.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -84,18 +84,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_konq_la_SOURCES)
- DIST_SOURCES = $(kcm_konq_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/konq/Makefile.in kdebase-3.4.1/kcontrol/konq/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/konq/Makefile.in 2005-05-23 18:38:22.000000000 +0200
++++ kdebase-3.4.1/kcontrol/konq/Makefile.in 2005-05-24 16:27:55.377106213 +0200
@@ -291,6 +291,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -22142,91 +15144,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1013,18 +1016,18 @@
- mocs: desktopbehavior_impl.moc
-
- #>+ 3
--desktop.moc: $(srcdir)/desktop.h
-- $(MOC) $(srcdir)/desktop.h -o desktop.moc
-+browser.moc: $(srcdir)/browser.h
-+ $(MOC) $(srcdir)/browser.h -o browser.moc
-
- #>+ 2
--mocs: desktop.moc
-+mocs: browser.moc
-
- #>+ 3
--browser.moc: $(srcdir)/browser.h
-- $(MOC) $(srcdir)/browser.h -o browser.moc
-+desktop.moc: $(srcdir)/desktop.h
-+ $(MOC) $(srcdir)/desktop.h -o desktop.moc
-
- #>+ 2
--mocs: browser.moc
-+mocs: desktop.moc
-
- #>+ 3
- rootopts.moc: $(srcdir)/rootopts.h
-@@ -1035,10 +1038,10 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f previews.moc fontopts.moc behaviour.moc desktopbehavior_impl.moc desktop.moc browser.moc rootopts.moc
-+ -rm -f previews.moc fontopts.moc behaviour.moc desktopbehavior_impl.moc browser.moc desktop.moc rootopts.moc
-
- #>+ 2
--KDE_DIST=onlyone.png fontopts.h browser.h desktopbehavior.ui overlapping.png fileappearance.desktop webbehavior.desktop filebehavior.desktop desktopbehavior_impl.h filepreviews.desktop desktop.h previews.h webappearance.desktop rootopts.h desktoppath.desktop behaviour.h filebrowser.desktop Makefile.in desktopbehavior.desktop desktop.desktop Makefile.am
-+KDE_DIST=onlyone.png fontopts.h browser.h desktopbehavior.ui overlapping.png fileappearance.desktop webbehavior.desktop filebehavior.desktop desktopbehavior_impl.h desktop.h filepreviews.desktop previews.h webappearance.desktop rootopts.h desktoppath.desktop behaviour.h filebrowser.desktop Makefile.in desktopbehavior.desktop desktop.desktop Makefile.am
-
- #>+ 4
- clean-idl:
-@@ -1096,7 +1099,7 @@
-
-
- #>+ 11
--kcm_konq_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/behaviour.cpp $(srcdir)/desktop.cpp $(srcdir)/rootopts.cpp $(srcdir)/fontopts.cpp $(srcdir)/previews.cpp $(srcdir)/browser.cpp $(srcdir)/main.cpp $(srcdir)/desktopbehavior_impl.cpp uiserver_stub.cpp desktopbehavior.cpp previews.moc fontopts.moc behaviour.moc desktopbehavior_impl.moc browser.moc desktop.moc desktopbehavior.moc rootopts.moc
-+kcm_konq_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/behaviour.cpp $(srcdir)/desktop.cpp $(srcdir)/rootopts.cpp $(srcdir)/fontopts.cpp $(srcdir)/previews.cpp $(srcdir)/browser.cpp $(srcdir)/main.cpp $(srcdir)/desktopbehavior_impl.cpp uiserver_stub.cpp desktopbehavior.cpp previews.moc fontopts.moc behaviour.moc desktopbehavior_impl.moc desktop.moc browser.moc desktopbehavior.moc rootopts.moc
- @echo 'creating kcm_konq_la.all_cpp.cpp ...'; \
- rm -f kcm_konq_la.all_cpp.files kcm_konq_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> kcm_konq_la.all_cpp.final; \
-diff -Nru kdebase-3.4.0.orig/kcontrol/konqhtml/Makefile.in kdebase-3.4.0/kcontrol/konqhtml/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/konqhtml/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/konqhtml/Makefile.in 2005-05-07 12:35:16.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -83,18 +83,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_konqhtml_la_SOURCES)
- DIST_SOURCES = $(kcm_konqhtml_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/konqhtml/Makefile.in kdebase-3.4.1/kcontrol/konqhtml/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/konqhtml/Makefile.in 2005-05-23 18:38:22.000000000 +0200
++++ kdebase-3.4.1/kcontrol/konqhtml/Makefile.in 2005-05-24 16:27:55.417102600 +0200
@@ -288,6 +288,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -22258,83 +15178,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1007,22 +1010,22 @@
- mocs: advancedTabDialog.moc
-
- #>+ 3
--pluginopts.moc: $(srcdir)/pluginopts.h
-- $(MOC) $(srcdir)/pluginopts.h -o pluginopts.moc
-+htmlopts.moc: $(srcdir)/htmlopts.h
-+ $(MOC) $(srcdir)/htmlopts.h -o htmlopts.moc
-
- #>+ 2
--mocs: pluginopts.moc
-+mocs: htmlopts.moc
-
- #>+ 3
--htmlopts.moc: $(srcdir)/htmlopts.h
-- $(MOC) $(srcdir)/htmlopts.h -o htmlopts.moc
-+pluginopts.moc: $(srcdir)/pluginopts.h
-+ $(MOC) $(srcdir)/pluginopts.h -o pluginopts.moc
-
- #>+ 2
--mocs: htmlopts.moc
-+mocs: pluginopts.moc
-
- #>+ 3
- clean-metasources:
-- -rm -f khttpoptdlg.moc jspolicies.moc main.moc jsopts.moc appearance.moc javaopts.moc policydlg.moc domainlistview.moc advancedTabDialog.moc pluginopts.moc htmlopts.moc
-+ -rm -f khttpoptdlg.moc jspolicies.moc main.moc jsopts.moc appearance.moc javaopts.moc policydlg.moc domainlistview.moc advancedTabDialog.moc htmlopts.moc pluginopts.moc
-
- #>+ 2
- KDE_DIST=policydlg.h policies.h pluginopts.h appearance.h main.h jsopts.h advancedTabDialog.h advancedTabOptions.ui khtml_java_js.desktop nsconfigwidget.ui htmlopts.h khttpoptdlg.h javaopts.h jspolicies.h domainlistview.h khtml_behavior.desktop khtml_fonts.desktop Makefile.in uninstall.desktop Makefile.am
-@@ -1079,7 +1082,7 @@
-
-
- #>+ 11
--kcm_konqhtml_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/advancedTabDialog.cpp $(srcdir)/htmlopts.cpp $(srcdir)/jsopts.cpp $(srcdir)/javaopts.cpp $(srcdir)/pluginopts.cpp $(srcdir)/appearance.cpp $(srcdir)/khttpoptdlg.cpp $(srcdir)/policydlg.cpp $(srcdir)/main.cpp $(srcdir)/jspolicies.cpp $(srcdir)/policies.cpp $(srcdir)/domainlistview.cpp nsconfigwidget.cpp advancedTabOptions.cpp khttpoptdlg.moc jspolicies.moc appearance.moc jsopts.moc main.moc javaopts.moc nsconfigwidget.moc advancedTabOptions.moc policydlg.moc domainlistview.moc advancedTabDialog.moc htmlopts.moc pluginopts.moc
-+kcm_konqhtml_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/advancedTabDialog.cpp $(srcdir)/htmlopts.cpp $(srcdir)/jsopts.cpp $(srcdir)/javaopts.cpp $(srcdir)/pluginopts.cpp $(srcdir)/appearance.cpp $(srcdir)/khttpoptdlg.cpp $(srcdir)/policydlg.cpp $(srcdir)/main.cpp $(srcdir)/jspolicies.cpp $(srcdir)/policies.cpp $(srcdir)/domainlistview.cpp nsconfigwidget.cpp advancedTabOptions.cpp khttpoptdlg.moc jspolicies.moc appearance.moc jsopts.moc main.moc javaopts.moc nsconfigwidget.moc advancedTabOptions.moc policydlg.moc domainlistview.moc advancedTabDialog.moc pluginopts.moc htmlopts.moc
- @echo 'creating kcm_konqhtml_la.all_cpp.cpp ...'; \
- rm -f kcm_konqhtml_la.all_cpp.files kcm_konqhtml_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> kcm_konqhtml_la.all_cpp.final; \
-diff -Nru kdebase-3.4.0.orig/kcontrol/konsole/Makefile.in kdebase-3.4.0/kcontrol/konsole/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/konsole/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/konsole/Makefile.in 2005-05-07 12:35:17.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -82,18 +82,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_konsole_la_SOURCES)
- DIST_SOURCES = $(kcm_konsole_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/konsole/Makefile.in kdebase-3.4.1/kcontrol/konsole/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/konsole/Makefile.in 2005-05-23 18:38:22.000000000 +0200
++++ kdebase-3.4.1/kcontrol/konsole/Makefile.in 2005-05-24 16:27:55.441100432 +0200
@@ -288,6 +288,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -22366,21 +15212,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kcontrol/krdb/ad/Makefile.in kdebase-3.4.0/kcontrol/krdb/ad/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/krdb/ad/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/ad/Makefile.in 2005-05-07 12:35:17.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kcontrol/krdb/ad/Makefile.in kdebase-3.4.1/kcontrol/krdb/ad/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/krdb/ad/Makefile.in 2005-05-23 18:38:22.000000000 +0200
++++ kdebase-3.4.1/kcontrol/krdb/ad/Makefile.in 2005-05-24 16:27:55.473097542 +0200
@@ -249,6 +249,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -22412,30 +15246,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
-@@ -765,7 +768,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=AAAXaw.ad AAATk.ad XTerm.ad AAAAAAGeneral.ad krdb Xdvi.ad AAAMotif.ad Netscape.ad XCalc.ad ML.ad RVPlayer.ad XV.ad Xawtv.ad Nedit.ad Makefile.in XOsview.ad WPerfect.ad Editres.ad Emacs.ad GV.ad Xpdf.ad AcroRead.ad Makefile.am
-+KDE_DIST=AAAXaw.ad AAATk.ad XTerm.ad AAAAAAGeneral.ad Xdvi.ad krdb AAAMotif.ad Netscape.ad XCalc.ad ML.ad RVPlayer.ad XV.ad Xawtv.ad Nedit.ad XOsview.ad Makefile.in WPerfect.ad Editres.ad Emacs.ad GV.ad Xpdf.ad AcroRead.ad Makefile.am
-
- #>+ 2
- docs-am:
-diff -Nru kdebase-3.4.0.orig/kcontrol/krdb/kcs/Makefile.in kdebase-3.4.0/kcontrol/krdb/kcs/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/krdb/kcs/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/kcs/Makefile.in 2005-05-07 12:35:17.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kcontrol/krdb/kcs/Makefile.in kdebase-3.4.1/kcontrol/krdb/kcs/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/krdb/kcs/Makefile.in 2005-05-23 18:38:22.000000000 +0200
++++ kdebase-3.4.1/kcontrol/krdb/kcs/Makefile.in 2005-05-24 16:27:55.486096368 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -22467,53 +15280,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -744,7 +747,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=KDETwo.kcsrc PaleGray.kcsrc Next.kcsrc SolarisCDE.kcsrc PointReyesGreen.kcsrc AtlasGreen.kcsrc EveX.kcsrc Storm.kcsrc Pumpkin.kcsrc MediaPeach.kcsrc DarkBlue.kcsrc KDEOne.kcsrc DesertRed.kcsrc Keramik.kcsrc WindowsXP.kcsrc BlackOnWhite.kcsrc BeOS.kcsrc System.kcsrc WhiteOnBlack.kcsrc Makefile.in KeramikEmerald.kcsrc DigitalCDE.kcsrc Windows2000.kcsrc BlueSlate.kcsrc YellowOnBlue.kcsrc Windows95.kcsrc CDE.kcsrc KeramikWhite.kcsrc Plastik.kcsrc Makefile.am
-+KDE_DIST=KDETwo.kcsrc PaleGray.kcsrc Next.kcsrc SolarisCDE.kcsrc PointReyesGreen.kcsrc AtlasGreen.kcsrc EveX.kcsrc Storm.kcsrc MediaPeach.kcsrc Pumpkin.kcsrc DarkBlue.kcsrc DesertRed.kcsrc KDEOne.kcsrc Keramik.kcsrc WindowsXP.kcsrc BlackOnWhite.kcsrc BeOS.kcsrc System.kcsrc WhiteOnBlack.kcsrc Makefile.in KeramikEmerald.kcsrc DigitalCDE.kcsrc Windows2000.kcsrc BlueSlate.kcsrc CDE.kcsrc Windows95.kcsrc YellowOnBlue.kcsrc KeramikWhite.kcsrc Plastik.kcsrc Makefile.am
-
- #>+ 2
- docs-am:
-diff -Nru kdebase-3.4.0.orig/kcontrol/krdb/Makefile.in kdebase-3.4.0/kcontrol/krdb/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/krdb/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/Makefile.in 2005-05-07 12:35:17.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -66,18 +66,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkrdb_la_SOURCES)
- DIST_SOURCES = $(libkrdb_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/krdb/Makefile.in kdebase-3.4.1/kcontrol/krdb/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/krdb/Makefile.in 2005-05-23 18:38:22.000000000 +0200
++++ kdebase-3.4.1/kcontrol/krdb/Makefile.in 2005-05-24 16:27:55.459098807 +0200
@@ -292,6 +292,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -22545,69 +15314,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -710,7 +713,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -722,7 +731,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -730,7 +739,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -751,7 +766,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kcontrol/krdb/pics/Makefile.in kdebase-3.4.0/kcontrol/krdb/pics/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/krdb/pics/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/pics/Makefile.in 2005-05-07 12:35:17.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kcontrol/krdb/pics/Makefile.in kdebase-3.4.1/kcontrol/krdb/pics/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/krdb/pics/Makefile.in 2005-05-23 18:38:22.000000000 +0200
++++ kdebase-3.4.1/kcontrol/krdb/pics/Makefile.in 2005-05-24 16:27:55.499095194 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -22639,21 +15348,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kcontrol/krdb/themes/HighContrastDark/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/HighContrastDark/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/krdb/themes/HighContrastDark/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/themes/HighContrastDark/Makefile.in 2005-05-07 12:35:17.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kcontrol/krdb/themes/HighContrastDark/Makefile.in kdebase-3.4.1/kcontrol/krdb/themes/HighContrastDark/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/krdb/themes/HighContrastDark/Makefile.in 2005-05-23 18:38:22.000000000 +0200
++++ kdebase-3.4.1/kcontrol/krdb/themes/HighContrastDark/Makefile.in 2005-05-24 16:27:55.525092846 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -22685,21 +15382,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kcontrol/krdb/themes/HighContrastDark-big/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/HighContrastDark-big/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/krdb/themes/HighContrastDark-big/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/themes/HighContrastDark-big/Makefile.in 2005-05-07 12:35:17.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kcontrol/krdb/themes/HighContrastDark-big/Makefile.in kdebase-3.4.1/kcontrol/krdb/themes/HighContrastDark-big/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/krdb/themes/HighContrastDark-big/Makefile.in 2005-05-23 18:38:22.000000000 +0200
++++ kdebase-3.4.1/kcontrol/krdb/themes/HighContrastDark-big/Makefile.in 2005-05-24 16:27:55.512094020 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -22731,21 +15416,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kcontrol/krdb/themes/HighContrastLight/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/HighContrastLight/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/krdb/themes/HighContrastLight/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/themes/HighContrastLight/Makefile.in 2005-05-07 12:35:17.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kcontrol/krdb/themes/HighContrastLight/Makefile.in kdebase-3.4.1/kcontrol/krdb/themes/HighContrastLight/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/krdb/themes/HighContrastLight/Makefile.in 2005-05-23 18:38:22.000000000 +0200
++++ kdebase-3.4.1/kcontrol/krdb/themes/HighContrastLight/Makefile.in 2005-05-24 16:27:55.547090859 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -22777,21 +15450,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kcontrol/krdb/themes/HighContrastLight-big/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/HighContrastLight-big/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/krdb/themes/HighContrastLight-big/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/themes/HighContrastLight-big/Makefile.in 2005-05-07 12:35:17.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kcontrol/krdb/themes/HighContrastLight-big/Makefile.in kdebase-3.4.1/kcontrol/krdb/themes/HighContrastLight-big/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/krdb/themes/HighContrastLight-big/Makefile.in 2005-05-23 18:38:22.000000000 +0200
++++ kdebase-3.4.1/kcontrol/krdb/themes/HighContrastLight-big/Makefile.in 2005-05-24 16:27:55.536091852 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -22823,21 +15484,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kcontrol/krdb/themes/KDE_Classic/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/KDE_Classic/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/krdb/themes/KDE_Classic/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/themes/KDE_Classic/Makefile.in 2005-05-07 12:35:17.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kcontrol/krdb/themes/KDE_Classic/Makefile.in kdebase-3.4.1/kcontrol/krdb/themes/KDE_Classic/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/krdb/themes/KDE_Classic/Makefile.in 2005-05-23 18:38:22.000000000 +0200
++++ kdebase-3.4.1/kcontrol/krdb/themes/KDE_Classic/Makefile.in 2005-05-24 16:27:55.556090046 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -22869,21 +15518,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kcontrol/krdb/themes/Keramik/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/Keramik/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/krdb/themes/Keramik/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/themes/Keramik/Makefile.in 2005-05-07 12:35:17.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kcontrol/krdb/themes/Keramik/Makefile.in kdebase-3.4.1/kcontrol/krdb/themes/Keramik/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/krdb/themes/Keramik/Makefile.in 2005-05-23 18:38:22.000000000 +0200
++++ kdebase-3.4.1/kcontrol/krdb/themes/Keramik/Makefile.in 2005-05-24 16:27:55.565089233 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -22915,21 +15552,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kcontrol/krdb/themes/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/krdb/themes/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/themes/Makefile.in 2005-05-07 12:35:17.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kcontrol/krdb/themes/Makefile.in kdebase-3.4.1/kcontrol/krdb/themes/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/krdb/themes/Makefile.in 2005-05-23 18:38:22.000000000 +0200
++++ kdebase-3.4.1/kcontrol/krdb/themes/Makefile.in 2005-05-24 16:27:55.575088330 +0200
@@ -251,6 +251,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -22961,69 +15586,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -603,7 +606,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -615,7 +624,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -623,7 +632,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -644,7 +659,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kcontrol/krdb/themes/Plastik/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/Plastik/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/krdb/themes/Plastik/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/themes/Plastik/Makefile.in 2005-05-07 12:35:17.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kcontrol/krdb/themes/Plastik/Makefile.in kdebase-3.4.1/kcontrol/krdb/themes/Plastik/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/krdb/themes/Plastik/Makefile.in 2005-05-23 18:38:22.000000000 +0200
++++ kdebase-3.4.1/kcontrol/krdb/themes/Plastik/Makefile.in 2005-05-24 16:27:55.583087607 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -23055,21 +15620,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kcontrol/krdb/themes/Platinum/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/Platinum/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/krdb/themes/Platinum/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/themes/Platinum/Makefile.in 2005-05-07 12:35:17.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kcontrol/krdb/themes/Platinum/Makefile.in kdebase-3.4.1/kcontrol/krdb/themes/Platinum/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/krdb/themes/Platinum/Makefile.in 2005-05-23 18:38:22.000000000 +0200
++++ kdebase-3.4.1/kcontrol/krdb/themes/Platinum/Makefile.in 2005-05-24 16:27:55.592086794 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -23101,21 +15654,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kcontrol/krdb/themes/Redmond/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/Redmond/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/krdb/themes/Redmond/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/themes/Redmond/Makefile.in 2005-05-07 12:35:17.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kcontrol/krdb/themes/Redmond/Makefile.in kdebase-3.4.1/kcontrol/krdb/themes/Redmond/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/krdb/themes/Redmond/Makefile.in 2005-05-23 18:38:22.000000000 +0200
++++ kdebase-3.4.1/kcontrol/krdb/themes/Redmond/Makefile.in 2005-05-24 16:27:55.601085982 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -23147,21 +15688,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kcontrol/krdb/themes/Sunshine/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/Sunshine/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/krdb/themes/Sunshine/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/themes/Sunshine/Makefile.in 2005-05-07 12:35:17.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kcontrol/krdb/themes/Sunshine/Makefile.in kdebase-3.4.1/kcontrol/krdb/themes/Sunshine/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/krdb/themes/Sunshine/Makefile.in 2005-05-23 18:38:22.000000000 +0200
++++ kdebase-3.4.1/kcontrol/krdb/themes/Sunshine/Makefile.in 2005-05-24 16:27:55.614084807 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -23193,21 +15722,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kcontrol/krdb/themes/YellowOnBlue/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/YellowOnBlue/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/krdb/themes/YellowOnBlue/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/themes/YellowOnBlue/Makefile.in 2005-05-07 12:35:17.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kcontrol/krdb/themes/YellowOnBlue/Makefile.in kdebase-3.4.1/kcontrol/krdb/themes/YellowOnBlue/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/krdb/themes/YellowOnBlue/Makefile.in 2005-05-23 18:38:23.000000000 +0200
++++ kdebase-3.4.1/kcontrol/krdb/themes/YellowOnBlue/Makefile.in 2005-05-24 16:27:55.641082369 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -23239,21 +15756,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kcontrol/krdb/themes/YellowOnBlue-big/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/YellowOnBlue-big/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/krdb/themes/YellowOnBlue-big/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/themes/YellowOnBlue-big/Makefile.in 2005-05-07 12:35:17.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kcontrol/krdb/themes/YellowOnBlue-big/Makefile.in kdebase-3.4.1/kcontrol/krdb/themes/YellowOnBlue-big/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/krdb/themes/YellowOnBlue-big/Makefile.in 2005-05-23 18:38:22.000000000 +0200
++++ kdebase-3.4.1/kcontrol/krdb/themes/YellowOnBlue-big/Makefile.in 2005-05-24 16:27:55.628083543 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -23285,44 +15790,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kcontrol/kthememanager/Makefile.in kdebase-3.4.0/kcontrol/kthememanager/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/kthememanager/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kthememanager/Makefile.in 2005-05-07 12:35:17.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -85,18 +85,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_kthememanager_la_SOURCES)
- DIST_SOURCES = $(kcm_kthememanager_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/kthememanager/Makefile.in kdebase-3.4.1/kcontrol/kthememanager/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/kthememanager/Makefile.in 2005-05-23 18:38:23.000000000 +0200
++++ kdebase-3.4.1/kcontrol/kthememanager/Makefile.in 2005-05-24 16:27:55.668079930 +0200
@@ -292,6 +292,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -23354,44 +15824,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kcontrol/launch/Makefile.in kdebase-3.4.0/kcontrol/launch/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/launch/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/launch/Makefile.in 2005-05-07 12:35:17.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_launch_la_SOURCES)
- DIST_SOURCES = $(kcm_launch_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/launch/Makefile.in kdebase-3.4.1/kcontrol/launch/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/launch/Makefile.in 2005-05-23 18:38:23.000000000 +0200
++++ kdebase-3.4.1/kcontrol/launch/Makefile.in 2005-05-24 16:27:55.688078124 +0200
@@ -283,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -23423,21 +15858,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kcontrol/locale/default/Makefile.in kdebase-3.4.0/kcontrol/locale/default/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/locale/default/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/locale/default/Makefile.in 2005-05-07 12:35:17.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kcontrol/locale/default/Makefile.in kdebase-3.4.1/kcontrol/locale/default/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/locale/default/Makefile.in 2005-05-23 18:38:23.000000000 +0200
++++ kdebase-3.4.1/kcontrol/locale/default/Makefile.in 2005-05-24 16:27:55.729074421 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -23469,44 +15892,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kcontrol/locale/Makefile.in kdebase-3.4.0/kcontrol/locale/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/locale/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/locale/Makefile.in 2005-05-07 12:35:17.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -86,18 +86,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_locale_la_SOURCES)
- DIST_SOURCES = $(kcm_locale_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/locale/Makefile.in kdebase-3.4.1/kcontrol/locale/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/locale/Makefile.in 2005-05-23 18:38:23.000000000 +0200
++++ kdebase-3.4.1/kcontrol/locale/Makefile.in 2005-05-24 16:27:55.716075595 +0200
@@ -306,6 +306,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -23538,112 +15926,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -750,7 +753,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -762,7 +771,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -770,7 +779,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -791,7 +806,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1059,18 +1074,18 @@
- mocs: toplevel.moc
-
- #>+ 3
--localeother.moc: $(srcdir)/localeother.h
-- $(MOC) $(srcdir)/localeother.h -o localeother.moc
-+localemon.moc: $(srcdir)/localemon.h
-+ $(MOC) $(srcdir)/localemon.h -o localemon.moc
-
- #>+ 2
--mocs: localeother.moc
-+mocs: localemon.moc
-
- #>+ 3
--localemon.moc: $(srcdir)/localemon.h
-- $(MOC) $(srcdir)/localemon.h -o localemon.moc
-+localeother.moc: $(srcdir)/localeother.h
-+ $(MOC) $(srcdir)/localeother.h -o localeother.moc
-
- #>+ 2
--mocs: localemon.moc
-+mocs: localeother.moc
-
- #>+ 3
- kcmlocale.moc: $(srcdir)/kcmlocale.h
-@@ -1088,7 +1103,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f localetime.moc klocalesample.moc toplevel.moc localeother.moc localemon.moc kcmlocale.moc localenum.moc
-+ -rm -f localetime.moc klocalesample.moc toplevel.moc localemon.moc localeother.moc kcmlocale.moc localenum.moc
-
- #>+ 2
- KDE_DIST=TIMEZONES language.desktop Makefile.in Makefile.am
-@@ -1139,7 +1154,7 @@
-
-
- #>+ 11
--kcm_locale_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/kcmlocale.cpp $(srcdir)/klocalesample.cpp $(srcdir)/localenum.cpp $(srcdir)/localemon.cpp $(srcdir)/localetime.cpp $(srcdir)/localeother.cpp localetime.moc klocalesample.moc localemon.moc localeother.moc toplevel.moc kcmlocale.moc localenum.moc
-+kcm_locale_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/kcmlocale.cpp $(srcdir)/klocalesample.cpp $(srcdir)/localenum.cpp $(srcdir)/localemon.cpp $(srcdir)/localetime.cpp $(srcdir)/localeother.cpp localetime.moc klocalesample.moc localeother.moc localemon.moc toplevel.moc kcmlocale.moc localenum.moc
- @echo 'creating kcm_locale_la.all_cpp.cpp ...'; \
- rm -f kcm_locale_la.all_cpp.files kcm_locale_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> kcm_locale_la.all_cpp.final; \
-diff -Nru kdebase-3.4.0.orig/kcontrol/locale/pics/Makefile.in kdebase-3.4.0/kcontrol/locale/pics/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/locale/pics/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/locale/pics/Makefile.in 2005-05-07 12:35:17.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kcontrol/locale/pics/Makefile.in kdebase-3.4.1/kcontrol/locale/pics/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/locale/pics/Makefile.in 2005-05-23 18:38:23.000000000 +0200
++++ kdebase-3.4.1/kcontrol/locale/pics/Makefile.in 2005-05-24 16:27:55.741073337 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -23675,21 +15960,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kcontrol/Makefile.in kdebase-3.4.0/kcontrol/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/Makefile.in 2005-03-04 08:14:45.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/Makefile.in 2005-05-07 12:35:10.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kcontrol/Makefile.in kdebase-3.4.1/kcontrol/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/Makefile.in 2005-05-23 18:38:20.000000000 +0200
++++ kdebase-3.4.1/kcontrol/Makefile.in 2005-05-24 16:27:54.040226966 +0200
@@ -257,6 +257,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -23721,92 +15994,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -623,7 +626,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -635,7 +644,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -643,7 +652,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -664,7 +679,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kcontrol/nics/Makefile.in kdebase-3.4.0/kcontrol/nics/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/nics/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/nics/Makefile.in 2005-05-07 12:35:17.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -75,18 +75,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_nic_la_SOURCES)
- DIST_SOURCES = $(kcm_nic_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/nics/Makefile.in kdebase-3.4.1/kcontrol/nics/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/nics/Makefile.in 2005-05-23 18:38:23.000000000 +0200
++++ kdebase-3.4.1/kcontrol/nics/Makefile.in 2005-05-24 16:27:55.761071531 +0200
@@ -280,6 +280,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -23838,44 +16028,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kcontrol/performance/Makefile.in kdebase-3.4.0/kcontrol/performance/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/performance/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/performance/Makefile.in 2005-05-07 12:35:18.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -82,18 +82,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_performance_la_SOURCES)
- DIST_SOURCES = $(kcm_performance_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/performance/Makefile.in kdebase-3.4.1/kcontrol/performance/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/performance/Makefile.in 2005-05-23 18:38:23.000000000 +0200
++++ kdebase-3.4.1/kcontrol/performance/Makefile.in 2005-05-24 16:27:55.786069273 +0200
@@ -289,6 +289,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -23907,64 +16062,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -944,18 +947,18 @@
-
-
- #>+ 3
--system.moc: $(srcdir)/system.h
-- $(MOC) $(srcdir)/system.h -o system.moc
-+konqueror.moc: $(srcdir)/konqueror.h
-+ $(MOC) $(srcdir)/konqueror.h -o konqueror.moc
-
- #>+ 2
--mocs: system.moc
-+mocs: konqueror.moc
-
- #>+ 3
--konqueror.moc: $(srcdir)/konqueror.h
-- $(MOC) $(srcdir)/konqueror.h -o konqueror.moc
-+system.moc: $(srcdir)/system.h
-+ $(MOC) $(srcdir)/system.h -o system.moc
-
- #>+ 2
--mocs: konqueror.moc
-+mocs: system.moc
-
- #>+ 3
- kcmperformance.moc: $(srcdir)/kcmperformance.h
-@@ -966,7 +969,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f system.moc konqueror.moc kcmperformance.moc
-+ -rm -f konqueror.moc system.moc kcmperformance.moc
-
- #>+ 2
- KDE_DIST=kcmperformance.h kcmperformance.desktop konqueror_ui.ui system_ui.ui Makefile.in kcmkonqyperformance.desktop Makefile.am
-@@ -1023,7 +1026,7 @@
-
-
- #>+ 11
--kcm_performance_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmperformance.cpp $(srcdir)/konqueror.cpp $(srcdir)/system.cpp konqueror_ui.cpp system_ui.cpp system_ui.moc konqueror.moc system.moc kcmperformance.moc konqueror_ui.moc
-+kcm_performance_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmperformance.cpp $(srcdir)/konqueror.cpp $(srcdir)/system.cpp konqueror_ui.cpp system_ui.cpp system_ui.moc system.moc konqueror.moc kcmperformance.moc konqueror_ui.moc
- @echo 'creating kcm_performance_la.all_cpp.cpp ...'; \
- rm -f kcm_performance_la.all_cpp.files kcm_performance_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> kcm_performance_la.all_cpp.final; \
-diff -Nru kdebase-3.4.0.orig/kcontrol/pics/Makefile.in kdebase-3.4.0/kcontrol/pics/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/pics/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/pics/Makefile.in 2005-05-07 12:35:18.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kcontrol/pics/Makefile.in kdebase-3.4.1/kcontrol/pics/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/pics/Makefile.in 2005-05-23 18:38:23.000000000 +0200
++++ kdebase-3.4.1/kcontrol/pics/Makefile.in 2005-05-24 16:27:55.841064306 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -23996,1071 +16096,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -706,548 +709,548 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=cr48-app-stylesheet.png cr32-app-input_devices_settings.png cr64-app-kcmx.png cr64-app-locale.png cr48-app-kcmx.png cr22-app-arts.png cr32-app-background.png cr16-app-kcmmemory.png cr128-app-kcmpartitions.png crsc-app-samba.svgz cr48-app-input_devices_settings.png cr32-app-cache.png cr64-app-proxy.png cr22-app-kscreensaver.png cr22-app-hwinfo.png cr48-app-multimedia.png cr32-app-kcmx.png cr48-app-date.png cr48-app-bell.png cr32-app-style.png cr48-app-kcmdf.png cr64-app-filetypes.png cr48-app-kcmpci.png cr128-app-kthememgr.png cr64-app-style.png cr22-app-filetypes.png cr16-app-help_index.png cr64-app-hwinfo.png cr48-app-key_bindings.png cr22-app-energy.png cr16-app-iconthemes.png cr128-app-fonts.png cr16-app-energy_star.png cr32-app-cookie.png crsc-app-background.svgz cr128-app-kcmpci.png cr64-app-enhanced_browsing.png cr32-app-usb.png cr48-app-enhanced_browsing.png cr22-app-keyboard.png cr64-app-kcmpci.png cr48-app-colors.png cr48-app-energy_star.png cr64-app-energy.png cr16-app-fonts.png cr48-app-iconthemes.png cr22-app-samba.png cr32-app-energy.png cr32-app-icons.png cr16-app-keyboard.png crsc-app-energy.svgz crsc-app-access.svgz cr16-app-colors.png cr16-app-looknfeel.png cr48-app-locale.png cr128-app-samba.png crsc-app-filetypes.svgz cr128-app-kcmkwm.png cr16-app-kcmsystem.png crsc-app-fonts.svgz cr64-app-personal.png Makefile.in cr22-app-stylesheet.png cr32-app-kcmmemory.png cr64-app-help_index.png cr48-app-arts.png cr16-app-background.png cr16-app-kcmpartitions.png cr16-app-key_bindings.png cr16-app-kcmx.png cr16-app-clock.png cr64-app-kcmpartitions.png cr32-app-multimedia.png cr32-app-filetypes.png cr128-app-proxy.png cr32-app-date.png cr128-app-arts.png cr16-app-icons.png cr48-app-style.png cr22-app-locale.png cr32-app-bell.png cr22-app-kcmx.png cr128-app-kcmdf.png cr32-app-keyboard_layout.png cr32-app-locale.png cr22-app-key_bindings.png cr128-app-hwinfo.png cr48-app-personal.png cr64-app-kthememgr.png cr16-app-cache.png cr48-app-usb.png cr32-app-enhanced_browsing.png cr128-app-energy.png cr128-app-kdmconfig.png cr128-app-clock.png cr22-app-style.png cr48-app-energy.png cr32-app-agent.png cr64-app-kcmmemory.png cr32-app-kcmprocessor.png cr22-app-cache.png cr128-app-help_index.png cr128-app-colors.png cr32-app-personal.png cr16-app-arts.png cr16-app-stylesheet.png cr22-app-enhanced_browsing.png cr64-app-kscreensaver.png cr22-app-bell.png cr48-app-cookie.png cr48-app-access.png cr32-app-kcmkwm.png cr32-app-kcmmidi.png cr16-app-kcmscsi.png cr64-app-colors.png cr16-app-keyboard_layout.png cr16-app-access.png cr64-app-fonts.png cr128-app-background.png cr128-app-energy_star.png cr48-app-fonts.png cr16-app-input_devices_settings.png cr22-app-kcmkwm.png cr32-app-kscreensaver.png cr32-app-kdmconfig.png cr22-app-proxy.png cr22-app-kdmconfig.png cr16-app-date.png cr32-app-kthememgr.png cr32-app-kcmsound.png cr48-app-kcmscsi.png crsc-app-locale.svgz cr48-app-kthememgr.png cr128-app-bell.png cr32-app-colors.png cr22-app-iconthemes.png cr48-app-cache.png cr128-app-stylesheet.png cr64-app-stylesheet.png cr48-app-kcmdrkonqi.png cr22-app-kcmkicker.png cr64-app-energy_star.png cr16-app-hwinfo.png cr16-app-proxy.png cr22-app-kthememgr.png cr64-app-background.png cr22-app-background.png cr32-app-kcmpartitions.png cr22-app-date.png cr128-app-kcmmemory.png cr16-app-bell.png cr32-app-arts.png cr48-app-agent.png cr48-app-kcmsystem.png cr32-app-kcmsystem.png cr48-app-looknfeel.png cr64-app-icons.png cr16-app-kcmkicker.png cr16-app-panel_settings.png cr22-app-icons.png cr32-app-kcmkicker.png crsc-app-kcmkwm.svgz cr22-app-personal.png cr48-app-kscreensaver.png cr48-app-keyboard.png crsc-app-stylesheet.svgz cr16-app-samba.png cr48-app-kcmprocessor.png cr32-app-fonts.png cr128-app-kcmdevices.png cr16-app-personal.png cr48-app-proxy.png cr16-app-energy.png cr16-app-multimedia.png cr32-app-help_index.png cr16-app-kcmpci.png cr48-app-kcmdevices.png cr64-app-multimedia.png cr16-app-style.png cr48-app-icons.png cr128-app-cache.png cr32-app-keyboard.png cr48-app-kcmmemory.png cr16-app-knotify.png cr48-app-kcmpartitions.png cr16-app-agent.png cr32-app-looknfeel.png cr128-app-kscreensaver.png cr32-app-stylesheet.png cr128-app-date.png cr64-app-bell.png crsc-app-arts.svgz cr128-app-multimedia.png cr16-app-cookie.png cr64-app-kdmconfig.png cr22-app-access.png cr48-app-samba.png cr64-app-kcmdf.png cr32-app-knotify.png cr64-app-clock.png cr32-app-clock.png crsc-app-kcmx.svgz crsc-app-cache.svgz cr128-app-key_bindings.png cr48-app-kdmconfig.png cr16-app-kdmconfig.png cr22-app-kcmdevices.png cr64-app-looknfeel.png cr128-app-personal.png cr48-app-background.png cr48-app-knotify.png cr48-app-kcmmidi.png cr64-app-date.png cr48-app-clock.png cr32-app-proxy.png cr16-app-kscreensaver.png cr32-app-key_bindings.png cr64-app-arts.png cr64-app-samba.png cr48-app-filetypes.png cr64-app-access.png cr48-app-keyboard_layout.png cr128-app-access.png cr32-app-samba.png cr128-app-filetypes.png cr16-app-kcmmidi.png cr32-app-hwinfo.png cr48-app-help_index.png cr16-app-usb.png cr64-app-kcmdevices.png cr48-app-hwinfo.png cr22-app-cookie.png cr64-app-knotify.png cr32-app-kcmdrkonqi.png cr128-app-locale.png crsc-app-hwinfo.svgz cr16-app-kcmkwm.png cr32-app-energy_star.png cr32-app-kcmscsi.png cr128-app-looknfeel.png cr16-app-enhanced_browsing.png crsc-app-date.svgz crsc-app-bell.svgz cr16-app-locale.png cr64-app-kcmkwm.png cr64-app-cache.png cr48-app-kcmkwm.png cr22-app-agent.png cr64-app-key_bindings.png cr64-app-cookie.png cr32-app-kcmdevices.png cr48-app-kcmopengl.png crsc-app-colors.svgz cr16-app-kcmprocessor.png cr32-app-access.png crsc-app-kcmdevices.svgz cr16-app-kcmsound.png cr32-app-iconthemes.png cr16-app-kthememgr.png cr22-app-fonts.png cr22-app-colors.png cr16-app-kcmdevices.png cr16-app-filetypes.png cr32-app-kcmpci.png Makefile.am
-+KDE_DIST=cr48-app-stylesheet.png cr32-app-input_devices_settings.png cr64-app-kcmx.png cr64-app-locale.png cr48-app-kcmx.png cr22-app-arts.png cr16-app-kcmmemory.png cr32-app-background.png cr128-app-kcmpartitions.png crsc-app-samba.svgz cr48-app-input_devices_settings.png cr32-app-cache.png cr64-app-proxy.png cr22-app-kscreensaver.png cr22-app-hwinfo.png cr48-app-multimedia.png cr32-app-kcmx.png cr32-app-style.png cr48-app-bell.png cr48-app-date.png cr48-app-kcmdf.png cr48-app-kcmpci.png cr64-app-filetypes.png cr128-app-kthememgr.png cr64-app-style.png cr22-app-filetypes.png cr16-app-help_index.png cr48-app-key_bindings.png cr64-app-hwinfo.png cr22-app-energy.png cr16-app-iconthemes.png cr128-app-fonts.png cr16-app-energy_star.png cr32-app-cookie.png crsc-app-background.svgz cr128-app-kcmpci.png cr64-app-enhanced_browsing.png cr32-app-usb.png cr48-app-enhanced_browsing.png cr22-app-keyboard.png cr64-app-kcmpci.png cr48-app-colors.png cr64-app-energy.png cr48-app-energy_star.png cr16-app-fonts.png cr48-app-iconthemes.png cr22-app-samba.png cr32-app-energy.png cr32-app-icons.png cr16-app-keyboard.png crsc-app-energy.svgz crsc-app-access.svgz cr16-app-colors.png cr16-app-looknfeel.png cr48-app-locale.png cr128-app-samba.png cr128-app-kcmkwm.png crsc-app-filetypes.svgz cr16-app-kcmsystem.png crsc-app-fonts.svgz cr64-app-personal.png Makefile.in cr22-app-stylesheet.png cr32-app-kcmmemory.png cr64-app-help_index.png cr48-app-arts.png cr16-app-background.png cr16-app-kcmpartitions.png cr16-app-key_bindings.png cr16-app-kcmx.png cr16-app-clock.png cr64-app-kcmpartitions.png cr32-app-multimedia.png cr32-app-filetypes.png cr32-app-date.png cr128-app-proxy.png cr128-app-arts.png cr16-app-icons.png cr48-app-style.png cr22-app-locale.png cr32-app-bell.png cr22-app-kcmx.png cr128-app-kcmdf.png cr32-app-keyboard_layout.png cr32-app-locale.png cr22-app-key_bindings.png cr128-app-hwinfo.png cr48-app-personal.png cr64-app-kthememgr.png cr16-app-cache.png cr32-app-enhanced_browsing.png cr48-app-usb.png cr128-app-kdmconfig.png cr128-app-energy.png cr128-app-clock.png cr22-app-style.png cr48-app-energy.png cr32-app-agent.png cr32-app-kcmprocessor.png cr64-app-kcmmemory.png cr22-app-cache.png cr128-app-help_index.png cr128-app-colors.png cr32-app-personal.png cr16-app-arts.png cr16-app-stylesheet.png cr22-app-enhanced_browsing.png cr64-app-kscreensaver.png cr22-app-bell.png cr32-app-kcmkwm.png cr48-app-access.png cr48-app-cookie.png cr32-app-kcmmidi.png cr16-app-kcmscsi.png cr64-app-colors.png cr16-app-keyboard_layout.png cr16-app-access.png cr64-app-fonts.png cr128-app-background.png cr128-app-energy_star.png cr48-app-fonts.png cr16-app-input_devices_settings.png cr32-app-kscreensaver.png cr22-app-kcmkwm.png cr32-app-kdmconfig.png cr22-app-proxy.png cr16-app-date.png cr22-app-kdmconfig.png cr32-app-kthememgr.png cr32-app-kcmsound.png cr48-app-kcmscsi.png crsc-app-locale.svgz cr128-app-bell.png cr48-app-kthememgr.png cr32-app-colors.png cr22-app-iconthemes.png cr48-app-cache.png cr128-app-stylesheet.png cr48-app-kcmdrkonqi.png cr64-app-stylesheet.png cr22-app-kcmkicker.png cr16-app-proxy.png cr16-app-hwinfo.png cr64-app-energy_star.png cr22-app-kthememgr.png cr64-app-background.png cr22-app-background.png cr32-app-kcmpartitions.png cr128-app-kcmmemory.png cr22-app-date.png cr32-app-arts.png cr16-app-bell.png cr48-app-kcmsystem.png cr48-app-agent.png cr32-app-kcmsystem.png cr48-app-looknfeel.png cr64-app-icons.png cr16-app-kcmkicker.png cr16-app-panel_settings.png cr22-app-icons.png cr32-app-kcmkicker.png crsc-app-kcmkwm.svgz cr48-app-kscreensaver.png cr22-app-personal.png cr48-app-keyboard.png crsc-app-stylesheet.svgz cr16-app-samba.png cr48-app-kcmprocessor.png cr32-app-fonts.png cr16-app-personal.png cr128-app-kcmdevices.png cr48-app-proxy.png cr16-app-energy.png cr32-app-help_index.png cr16-app-multimedia.png cr16-app-kcmpci.png cr48-app-kcmdevices.png cr64-app-multimedia.png cr16-app-style.png cr48-app-icons.png cr128-app-cache.png cr32-app-keyboard.png cr48-app-kcmmemory.png cr16-app-knotify.png cr48-app-kcmpartitions.png cr16-app-agent.png cr32-app-looknfeel.png cr128-app-kscreensaver.png cr32-app-stylesheet.png cr128-app-date.png cr64-app-bell.png crsc-app-arts.svgz cr128-app-multimedia.png cr16-app-cookie.png cr64-app-kdmconfig.png cr48-app-samba.png cr64-app-kcmdf.png cr22-app-access.png cr32-app-knotify.png cr64-app-clock.png cr32-app-clock.png crsc-app-kcmx.svgz crsc-app-cache.svgz cr128-app-key_bindings.png cr48-app-kdmconfig.png cr16-app-kdmconfig.png cr22-app-kcmdevices.png cr64-app-looknfeel.png cr128-app-personal.png cr48-app-knotify.png cr48-app-background.png cr48-app-kcmmidi.png cr64-app-date.png cr48-app-clock.png cr32-app-proxy.png cr16-app-kscreensaver.png cr32-app-key_bindings.png cr64-app-arts.png cr64-app-samba.png cr48-app-filetypes.png cr64-app-access.png cr48-app-keyboard_layout.png cr128-app-access.png cr32-app-samba.png cr128-app-filetypes.png cr16-app-kcmmidi.png cr32-app-hwinfo.png cr48-app-help_index.png cr16-app-usb.png cr64-app-kcmdevices.png cr48-app-hwinfo.png cr22-app-cookie.png cr64-app-knotify.png cr32-app-kcmdrkonqi.png cr128-app-locale.png crsc-app-hwinfo.svgz cr16-app-kcmkwm.png cr32-app-energy_star.png cr32-app-kcmscsi.png cr128-app-looknfeel.png cr16-app-enhanced_browsing.png crsc-app-date.svgz crsc-app-bell.svgz cr16-app-locale.png cr64-app-kcmkwm.png cr64-app-cache.png cr48-app-kcmkwm.png cr22-app-agent.png cr64-app-key_bindings.png cr64-app-cookie.png cr32-app-kcmdevices.png cr48-app-kcmopengl.png crsc-app-colors.svgz cr16-app-kcmprocessor.png cr32-app-access.png crsc-app-kcmdevices.svgz cr16-app-kcmsound.png cr32-app-iconthemes.png cr16-app-kthememgr.png cr22-app-fonts.png cr22-app-colors.png cr16-app-filetypes.png cr16-app-kcmdevices.png cr32-app-kcmpci.png Makefile.am
-
- #>+ 2
- docs-am:
-
- #>+ 537
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-- $(INSTALL_DATA) $(srcdir)/cr128-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/access.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/arts.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/background.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/bell.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/cache.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clock.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/date.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy_star.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/filetypes.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/fonts.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/help_index.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/hwinfo.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdevices.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdf.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmmemory.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpartitions.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpci.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
-- $(INSTALL_DATA) $(srcdir)/cr22-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/access.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdmconfig.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/key_bindings.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscreensaver.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kthememgr.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/locale.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/looknfeel.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/multimedia.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/personal.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/proxy.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/samba.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/stylesheet.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/iconthemes.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy_star.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/access.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/agent.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/arts.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/background.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bell.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cache.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clock.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/colors.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cookie.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/date.png
-- $(INSTALL_DATA) $(srcdir)/cr22-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/arts.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy_star.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/enhanced_browsing.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/filetypes.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/fonts.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/help_index.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/hwinfo.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/icons.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/iconthemes.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-input_devices_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/input_devices_settings.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmdevices.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkicker.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/usb.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/help_index.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkwm.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmemory.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmidi.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpartitions.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpci.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kcmprocessor.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmprocessor.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmscsi.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kcmsound.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsound.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kcmsystem.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsystem.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmx.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdmconfig.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/key_bindings.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard_layout.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/knotify.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscreensaver.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kthememgr.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/locale.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/looknfeel.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/multimedia.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-panel_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel_settings.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/looknfeel.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kthememgr.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knotify.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/personal.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/proxy.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/samba.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/style.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/stylesheet.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/usb.png
-- $(INSTALL_DATA) $(srcdir)/cr22-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/background.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/access.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/agent.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/arts.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/background.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bell.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cache.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clock.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/colors.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cookie.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/date.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-kcmx.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmx.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kscreensaver.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/enhanced_browsing.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-- $(INSTALL_DATA) $(srcdir)/cr64-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/access.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy_star.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/enhanced_browsing.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/filetypes.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fonts.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/help_index.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/hwinfo.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/icons.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/iconthemes.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-input_devices_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/input_devices_settings.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdevices.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kcmdrkonqi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdrkonqi.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkicker.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkwm.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmemory.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmidi.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/filetypes.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkicker.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/multimedia.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cache.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpartitions.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpartitions.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clock.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmkwm.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/colors.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdevices.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/stylesheet.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/samba.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/arts.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmemory.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpci.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kcmprocessor.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmprocessor.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmscsi.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kcmsound.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsound.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kcmsystem.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsystem.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmx.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdmconfig.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/key_bindings.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard_layout.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knotify.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/access.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kcmprocessor.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmprocessor.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmidi.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kthememgr.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmprocessor.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmprocessor.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy_star.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmscsi.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/proxy.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/locale.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/personal.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/filetypes.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kscreensaver.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/energy.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/samba.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kscreensaver.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-colors.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/colors.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cookie.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/stylesheet.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard_layout.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmemory.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/date.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/enhanced_browsing.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/hwinfo.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kthememgr.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/locale.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/looknfeel.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/multimedia.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/personal.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/proxy.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/samba.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/style.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/stylesheet.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/usb.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/colors.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/access.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/agent.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/arts.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/background.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bell.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cache.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clock.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/date.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/keyboard.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkicker.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clock.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/background.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/stylesheet.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdmconfig.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/arts.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/colors.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cookie.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/date.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy_star.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-locale.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/locale.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/fonts.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/proxy.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/arts.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/date.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/access.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/icons.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/personal.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/usb.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmidi.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmscsi.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/key_bindings.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-input_devices_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/input_devices_settings.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/proxy.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/style.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cookie.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/knotify.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/filetypes.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/iconthemes.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkwm.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy_star.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/enhanced_browsing.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/filetypes.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fonts.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/help_index.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/hwinfo.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/icons.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/iconthemes.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-input_devices_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/input_devices_settings.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdevices.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdf.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmdrkonqi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdrkonqi.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmkwm.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmemory.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmidi.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmopengl.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmopengl.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpartitions.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpci.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmprocessor.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmprocessor.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmscsi.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmsystem.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmsystem.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmx.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmkwm.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdmconfig.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/key_bindings.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard_layout.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/knotify.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kscreensaver.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kthememgr.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/locale.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/looknfeel.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/enhanced_browsing.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-panel_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel_settings.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/key_bindings.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/personal.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/multimedia.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/personal.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/proxy.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/samba.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/style.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/stylesheet.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/usb.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-- $(INSTALL_DATA) $(srcdir)/crsc-app-access.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/access.svgz
-- $(INSTALL_DATA) $(srcdir)/cr64-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/arts.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/background.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/bell.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cache.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clock.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/date.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/key_bindings.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/agent.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fonts.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/stylesheet.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kcmdrkonqi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdrkonqi.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/samba.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/looknfeel.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdevices.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard_layout.png
- $(INSTALL_DATA) $(srcdir)/crsc-app-arts.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/arts.svgz
-- $(INSTALL_DATA) $(srcdir)/cr64-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy_star.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/filetypes.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/fonts.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/help_index.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/hwinfo.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/icons.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdevices.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdf.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/colors.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/date.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/icons.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-filetypes.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/filetypes.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cache.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/fonts.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kcmsystem.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsystem.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/style.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmsound.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsound.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpci.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/looknfeel.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bell.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kscreensaver.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/locale.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscreensaver.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cookie.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/background.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/knotify.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-input_devices_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/input_devices_settings.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kdmconfig.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmkwm.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bell.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/help_index.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpartitions.png
- $(INSTALL_DATA) $(srcdir)/cr64-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmmemory.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpartitions.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpci.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmx.png
-- $(INSTALL_DATA) $(srcdir)/crsc-app-background.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/background.svgz
-- $(INSTALL_DATA) $(srcdir)/cr64-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kdmconfig.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/key_bindings.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/knotify.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kscreensaver.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscreensaver.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/hwinfo.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpci.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/samba.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/icons.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/date.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/multimedia.png
- $(INSTALL_DATA) $(srcdir)/cr64-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kthememgr.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/locale.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdevices.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/proxy.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-cache.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/cache.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cache.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-kcmdevices.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmdevices.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/iconthemes.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/bell.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpci.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdf.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/date.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/usb.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdmconfig.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmx.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmmemory.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpartitions.png
- $(INSTALL_DATA) $(srcdir)/cr64-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/locale.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/looknfeel.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/multimedia.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard.png
- $(INSTALL_DATA) $(srcdir)/cr64-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/personal.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/proxy.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/samba.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/style.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/stylesheet.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/colors.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmkwm.png
-- $(INSTALL_DATA) $(srcdir)/cr22-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/bell.png
-- $(INSTALL_DATA) $(srcdir)/cr22-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cache.png
-- $(INSTALL_DATA) $(srcdir)/cr22-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/colors.png
-- $(INSTALL_DATA) $(srcdir)/cr22-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/date.png
-- $(INSTALL_DATA) $(srcdir)/cr22-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/energy.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/hwinfo.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/cache.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kthememgr.png
- $(INSTALL_DATA) $(srcdir)/cr22-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/filetypes.png
-- $(INSTALL_DATA) $(srcdir)/cr22-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/fonts.png
-- $(INSTALL_DATA) $(srcdir)/cr22-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/hwinfo.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/access.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/iconthemes.png
- $(INSTALL_DATA) $(srcdir)/cr22-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmdevices.png
-- $(INSTALL_DATA) $(srcdir)/cr22-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkwm.png
-- $(INSTALL_DATA) $(srcdir)/cr22-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmx.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmx.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/help_index.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdmconfig.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/hwinfo.png
- $(INSTALL_DATA) $(srcdir)/cr22-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/samba.png
-- $(INSTALL_DATA) $(srcdir)/cr22-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/stylesheet.png
-- $(INSTALL_DATA) $(srcdir)/crsc-app-bell.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/bell.svgz
-- $(INSTALL_DATA) $(srcdir)/crsc-app-cache.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/cache.svgz
-- $(INSTALL_DATA) $(srcdir)/crsc-app-colors.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/colors.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/multimedia.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/enhanced_browsing.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/looknfeel.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkwm.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/stylesheet.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-samba.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/samba.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmdevices.png
- $(INSTALL_DATA) $(srcdir)/crsc-app-date.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/date.svgz
-- $(INSTALL_DATA) $(srcdir)/crsc-app-energy.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/energy.svgz
-- $(INSTALL_DATA) $(srcdir)/crsc-app-filetypes.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/filetypes.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/agent.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/filetypes.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fonts.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clock.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-stylesheet.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/stylesheet.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/proxy.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/access.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdf.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/bell.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kcmdrkonqi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdrkonqi.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/key_bindings.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-input_devices_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/input_devices_settings.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/key_bindings.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/access.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/style.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/colors.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdf.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/filetypes.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/key_bindings.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kcmsound.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsound.png
- $(INSTALL_DATA) $(srcdir)/crsc-app-fonts.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/fonts.svgz
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-access.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/access.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmemory.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-energy.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/energy.svgz
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-background.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/background.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/background.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/help_index.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kthememgr.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/proxy.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/enhanced_browsing.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/agent.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/fonts.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clock.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmx.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/colors.png
- $(INSTALL_DATA) $(srcdir)/crsc-app-hwinfo.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hwinfo.svgz
-- $(INSTALL_DATA) $(srcdir)/crsc-app-kcmdevices.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmdevices.svgz
-- $(INSTALL_DATA) $(srcdir)/crsc-app-kcmkwm.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmkwm.svgz
-- $(INSTALL_DATA) $(srcdir)/crsc-app-kcmx.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmx.svgz
-- $(INSTALL_DATA) $(srcdir)/crsc-app-locale.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/locale.svgz
-- $(INSTALL_DATA) $(srcdir)/crsc-app-samba.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/samba.svgz
-- $(INSTALL_DATA) $(srcdir)/crsc-app-stylesheet.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/stylesheet.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard_layout.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkicker.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kcmprocessor.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmprocessor.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/bell.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/multimedia.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/locale.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdevices.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cache.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/colors.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-bell.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/bell.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clock.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bell.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/style.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmidi.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/icons.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kcmopengl.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmopengl.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmscsi.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/arts.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cookie.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/hwinfo.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-kcmkwm.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmkwm.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/knotify.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/personal.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/arts.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cookie.png
- $(INSTALL_DATA) $(srcdir)/cr22-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/agent.png
-- $(INSTALL_DATA) $(srcdir)/cr22-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cookie.png
-- $(INSTALL_DATA) $(srcdir)/cr22-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/enhanced_browsing.png
-- $(INSTALL_DATA) $(srcdir)/cr22-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/icons.png
-- $(INSTALL_DATA) $(srcdir)/cr22-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/iconthemes.png
-- $(INSTALL_DATA) $(srcdir)/cr22-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kscreensaver.png
-- $(INSTALL_DATA) $(srcdir)/cr22-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kthememgr.png
-- $(INSTALL_DATA) $(srcdir)/cr22-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/proxy.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/fonts.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmx.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/background.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/stylesheet.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpci.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmx.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cache.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/access.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kdmconfig.png
- $(INSTALL_DATA) $(srcdir)/cr22-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/style.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cookie.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/enhanced_browsing.png
-- $(INSTALL_DATA) $(srcdir)/cr22-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkicker.png
-- $(INSTALL_DATA) $(srcdir)/cr22-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kdmconfig.png
-- $(INSTALL_DATA) $(srcdir)/cr22-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/key_bindings.png
-- $(INSTALL_DATA) $(srcdir)/cr22-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/keyboard.png
-- $(INSTALL_DATA) $(srcdir)/cr22-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/locale.png
-- $(INSTALL_DATA) $(srcdir)/cr22-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/personal.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/arts.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/samba.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmkwm.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/locale.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy_star.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/looknfeel.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/icons.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/background.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpartitions.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmsystem.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsystem.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdmconfig.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/hwinfo.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/access.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/arts.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/background.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/bell.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/cache.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clock.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/date.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy_star.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/filetypes.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/fonts.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/help_index.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/hwinfo.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdevices.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdf.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmmemory.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpartitions.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpci.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/access.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdmconfig.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/key_bindings.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscreensaver.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kthememgr.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/locale.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/looknfeel.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/multimedia.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/personal.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/proxy.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/samba.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/stylesheet.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/access.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/agent.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/arts.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/iconthemes.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy_star.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/background.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bell.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cache.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clock.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/colors.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cookie.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/date.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/arts.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy_star.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/enhanced_browsing.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/filetypes.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/fonts.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/help_index.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/hwinfo.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/icons.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/iconthemes.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/input_devices_settings.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmdevices.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkicker.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/usb.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/help_index.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkwm.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmemory.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmidi.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpartitions.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpci.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmprocessor.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmscsi.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsound.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsystem.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmx.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdmconfig.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/key_bindings.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard_layout.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/knotify.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscreensaver.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kthememgr.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/locale.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/looknfeel.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/multimedia.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel_settings.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/looknfeel.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kthememgr.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knotify.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/personal.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/proxy.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/samba.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/style.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/stylesheet.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/usb.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/background.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/access.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/agent.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/arts.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/background.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bell.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cache.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmx.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kscreensaver.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/enhanced_browsing.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/filetypes.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkicker.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/multimedia.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cache.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpartitions.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpartitions.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clock.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/colors.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cookie.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/date.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/access.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy_star.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/enhanced_browsing.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/filetypes.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fonts.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/help_index.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/hwinfo.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/icons.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/iconthemes.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/input_devices_settings.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmkwm.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/colors.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdevices.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdrkonqi.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkicker.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkwm.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmemory.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmidi.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpartitions.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/stylesheet.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/samba.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/arts.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmemory.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpci.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmprocessor.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmscsi.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsound.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsystem.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmx.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdmconfig.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/key_bindings.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard_layout.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knotify.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/access.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmprocessor.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmidi.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kthememgr.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmprocessor.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy_star.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmscsi.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/proxy.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/locale.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/personal.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/filetypes.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kscreensaver.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/energy.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/samba.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kscreensaver.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/colors.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cookie.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/stylesheet.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard_layout.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmemory.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/date.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/enhanced_browsing.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/hwinfo.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kthememgr.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/locale.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/looknfeel.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/multimedia.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/personal.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/proxy.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/samba.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/style.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/stylesheet.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/usb.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/colors.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/access.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/agent.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/arts.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/background.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bell.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cache.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clock.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/date.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/keyboard.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkicker.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clock.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/background.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/stylesheet.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdmconfig.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/arts.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/colors.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cookie.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/date.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy_star.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/locale.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/fonts.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/proxy.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/arts.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/date.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/access.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/icons.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/personal.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/usb.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmidi.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmscsi.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/key_bindings.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/input_devices_settings.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/proxy.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/style.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cookie.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/knotify.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/filetypes.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/iconthemes.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkwm.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy_star.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/enhanced_browsing.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/filetypes.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/help_index.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmsystem.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/enhanced_browsing.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel_settings.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/key_bindings.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/personal.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/multimedia.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/key_bindings.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/agent.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fonts.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/help_index.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/hwinfo.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/icons.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/iconthemes.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/input_devices_settings.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/stylesheet.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdrkonqi.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/samba.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/looknfeel.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdevices.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdf.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdrkonqi.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmkwm.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmemory.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmidi.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmopengl.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpartitions.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpci.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmprocessor.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmscsi.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmsystem.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmx.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmkwm.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdmconfig.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/key_bindings.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard_layout.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/knotify.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kscreensaver.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kthememgr.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/locale.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/looknfeel.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/multimedia.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/personal.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/proxy.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/samba.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/style.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/stylesheet.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/usb.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/access.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/arts.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/background.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/bell.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cache.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clock.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/date.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/arts.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy_star.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/filetypes.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/fonts.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/help_index.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/hwinfo.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/icons.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdevices.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdf.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/colors.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/date.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/icons.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/filetypes.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cache.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/fonts.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsystem.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/style.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsound.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpci.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/looknfeel.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bell.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kscreensaver.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/locale.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscreensaver.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cookie.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/background.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/knotify.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/input_devices_settings.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kdmconfig.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmkwm.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bell.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/help_index.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpartitions.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmmemory.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpartitions.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpci.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmx.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/background.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kdmconfig.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/key_bindings.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/knotify.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kscreensaver.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscreensaver.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/hwinfo.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpci.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/samba.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/icons.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/date.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/multimedia.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kthememgr.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/locale.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdevices.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/proxy.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/cache.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cache.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmdevices.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/iconthemes.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/bell.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpci.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdf.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/date.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/usb.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdmconfig.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmx.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmmemory.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpartitions.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/locale.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/looknfeel.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/multimedia.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/personal.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/proxy.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/samba.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/style.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/stylesheet.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/colors.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmkwm.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/bell.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cache.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/colors.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/date.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/energy.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/hwinfo.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/cache.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kthememgr.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/filetypes.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/fonts.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/hwinfo.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/access.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/iconthemes.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmdevices.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkwm.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmx.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmx.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/help_index.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdmconfig.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/hwinfo.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/samba.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/stylesheet.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/bell.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/cache.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/colors.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/multimedia.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/enhanced_browsing.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/looknfeel.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkwm.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/stylesheet.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/samba.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmdevices.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/date.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/energy.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/filetypes.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/agent.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/filetypes.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fonts.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clock.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/stylesheet.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/proxy.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/access.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdf.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/bell.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdrkonqi.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/key_bindings.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/input_devices_settings.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/key_bindings.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/access.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/style.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/colors.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdf.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/filetypes.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/key_bindings.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsound.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/fonts.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/access.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmemory.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/energy.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/background.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/background.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/help_index.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kthememgr.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/proxy.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/enhanced_browsing.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/agent.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/fonts.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clock.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmx.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/colors.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hwinfo.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmdevices.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard_layout.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkicker.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmprocessor.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/bell.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/multimedia.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/locale.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdevices.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cache.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/colors.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/bell.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clock.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bell.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/style.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmidi.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/icons.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmopengl.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmscsi.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/arts.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cookie.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/hwinfo.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmkwm.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmx.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/locale.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/samba.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/stylesheet.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/knotify.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/personal.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/arts.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cookie.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/agent.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cookie.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/enhanced_browsing.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/icons.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/iconthemes.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kscreensaver.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kthememgr.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/proxy.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/fonts.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmx.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/background.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/stylesheet.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpci.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmx.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cache.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/access.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kdmconfig.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/style.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cookie.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/enhanced_browsing.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkicker.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kdmconfig.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/key_bindings.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/keyboard.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/locale.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/personal.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/arts.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/samba.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmkwm.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/locale.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy_star.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/looknfeel.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/icons.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/background.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpartitions.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsystem.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdmconfig.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/hwinfo.png
-
- #>+ 15
- force-reedit:
-diff -Nru kdebase-3.4.0.orig/kcontrol/privacy/Makefile.in kdebase-3.4.0/kcontrol/privacy/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/privacy/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/privacy/Makefile.in 2005-05-07 12:35:18.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -80,18 +80,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_privacy_la_SOURCES)
- DIST_SOURCES = $(kcm_privacy_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/privacy/Makefile.in kdebase-3.4.1/kcontrol/privacy/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/privacy/Makefile.in 2005-05-23 18:38:23.000000000 +0200
++++ kdebase-3.4.1/kcontrol/privacy/Makefile.in 2005-05-24 16:27:55.857062861 +0200
@@ -286,6 +286,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -25092,44 +16130,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kcontrol/randr/Makefile.in kdebase-3.4.0/kcontrol/randr/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/randr/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/randr/Makefile.in 2005-05-07 12:35:18.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -121,18 +121,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_randr_la_SOURCES) $(krandrinithack_la_SOURCES) \
- $(librandrinternal_la_SOURCES) $(krandrtray_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/randr/Makefile.in kdebase-3.4.1/kcontrol/randr/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/randr/Makefile.in 2005-05-23 18:38:23.000000000 +0200
++++ kdebase-3.4.1/kcontrol/randr/Makefile.in 2005-05-24 16:27:55.897059248 +0200
@@ -333,6 +333,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -25161,44 +16164,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kcontrol/samba/Makefile.in kdebase-3.4.0/kcontrol/samba/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/samba/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/samba/Makefile.in 2005-05-07 12:35:18.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -80,18 +80,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_samba_la_SOURCES)
- DIST_SOURCES = $(kcm_samba_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/samba/Makefile.in kdebase-3.4.1/kcontrol/samba/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/samba/Makefile.in 2005-05-23 18:38:23.000000000 +0200
++++ kdebase-3.4.1/kcontrol/samba/Makefile.in 2005-05-24 16:27:55.921057080 +0200
@@ -285,6 +285,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -25230,44 +16198,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kcontrol/screensaver/Makefile.in kdebase-3.4.0/kcontrol/screensaver/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/screensaver/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/screensaver/Makefile.in 2005-05-07 12:35:18.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -84,18 +84,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_screensaver_la_SOURCES)
- DIST_SOURCES = $(kcm_screensaver_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/screensaver/Makefile.in kdebase-3.4.1/kcontrol/screensaver/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/screensaver/Makefile.in 2005-05-23 18:38:23.000000000 +0200
++++ kdebase-3.4.1/kcontrol/screensaver/Makefile.in 2005-05-24 16:27:55.954054100 +0200
@@ -290,6 +290,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -25299,44 +16232,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kcontrol/smartcard/Makefile.in kdebase-3.4.0/kcontrol/smartcard/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/smartcard/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/smartcard/Makefile.in 2005-05-07 12:35:18.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -80,18 +80,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_smartcard_la_SOURCES)
- DIST_SOURCES = $(kcm_smartcard_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/smartcard/Makefile.in kdebase-3.4.1/kcontrol/smartcard/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/smartcard/Makefile.in 2005-05-23 18:38:23.000000000 +0200
++++ kdebase-3.4.1/kcontrol/smartcard/Makefile.in 2005-05-24 16:27:55.978051932 +0200
@@ -286,6 +286,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -25368,44 +16266,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kcontrol/smserver/Makefile.in kdebase-3.4.0/kcontrol/smserver/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/smserver/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/smserver/Makefile.in 2005-05-07 12:35:18.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -79,18 +79,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_smserver_la_SOURCES)
- DIST_SOURCES = $(kcm_smserver_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/smserver/Makefile.in kdebase-3.4.1/kcontrol/smserver/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/smserver/Makefile.in 2005-05-23 18:38:23.000000000 +0200
++++ kdebase-3.4.1/kcontrol/smserver/Makefile.in 2005-05-24 16:27:56.000049945 +0200
@@ -285,6 +285,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -25437,44 +16300,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kcontrol/spellchecking/Makefile.in kdebase-3.4.0/kcontrol/spellchecking/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/spellchecking/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/spellchecking/Makefile.in 2005-05-07 12:35:18.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -74,18 +74,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_spellchecking_la_SOURCES)
- DIST_SOURCES = $(kcm_spellchecking_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/spellchecking/Makefile.in kdebase-3.4.1/kcontrol/spellchecking/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/spellchecking/Makefile.in 2005-05-23 18:38:23.000000000 +0200
++++ kdebase-3.4.1/kcontrol/spellchecking/Makefile.in 2005-05-24 16:27:56.019048229 +0200
@@ -279,6 +279,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -25506,44 +16334,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kcontrol/style/keramik/Makefile.in kdebase-3.4.0/kcontrol/style/keramik/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/style/keramik/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/style/keramik/Makefile.in 2005-05-07 12:35:18.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -76,18 +76,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kstyle_keramik_config_la_SOURCES)
- DIST_SOURCES = $(kstyle_keramik_config_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/style/keramik/Makefile.in kdebase-3.4.1/kcontrol/style/keramik/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/style/keramik/Makefile.in 2005-05-23 18:38:23.000000000 +0200
++++ kdebase-3.4.1/kcontrol/style/keramik/Makefile.in 2005-05-24 16:27:56.087042088 +0200
@@ -280,6 +280,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -25575,44 +16368,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kcontrol/style/Makefile.in kdebase-3.4.0/kcontrol/style/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/style/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/style/Makefile.in 2005-05-07 12:35:18.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -82,18 +82,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_style_la_SOURCES)
- DIST_SOURCES = $(kcm_style_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/style/Makefile.in kdebase-3.4.1/kcontrol/style/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/style/Makefile.in 2005-05-23 18:38:23.000000000 +0200
++++ kdebase-3.4.1/kcontrol/style/Makefile.in 2005-05-24 16:27:56.059044617 +0200
@@ -302,6 +302,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -25644,92 +16402,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -743,7 +746,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -755,7 +764,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -763,7 +772,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -784,7 +799,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kcontrol/taskbar/Makefile.in kdebase-3.4.0/kcontrol/taskbar/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/taskbar/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/taskbar/Makefile.in 2005-05-07 12:35:18.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -79,18 +79,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_taskbar_la_SOURCES)
- DIST_SOURCES = $(kcm_taskbar_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/taskbar/Makefile.in kdebase-3.4.1/kcontrol/taskbar/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/taskbar/Makefile.in 2005-05-23 18:38:23.000000000 +0200
++++ kdebase-3.4.1/kcontrol/taskbar/Makefile.in 2005-05-24 16:27:56.108040191 +0200
@@ -285,6 +285,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -25761,44 +16436,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kcontrol/usbview/Makefile.in kdebase-3.4.0/kcontrol/usbview/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/usbview/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/usbview/Makefile.in 2005-05-07 12:35:19.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -78,18 +78,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_usb_la_SOURCES)
- DIST_SOURCES = $(kcm_usb_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/usbview/Makefile.in kdebase-3.4.1/kcontrol/usbview/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/usbview/Makefile.in 2005-05-23 18:38:23.000000000 +0200
++++ kdebase-3.4.1/kcontrol/usbview/Makefile.in 2005-05-24 16:27:56.130038204 +0200
@@ -284,6 +284,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -25830,44 +16470,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kcontrol/view1394/Makefile.in kdebase-3.4.0/kcontrol/view1394/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/view1394/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/view1394/Makefile.in 2005-05-07 12:35:19.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -78,18 +78,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_view1394_la_SOURCES)
- DIST_SOURCES = $(kcm_view1394_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/view1394/Makefile.in kdebase-3.4.1/kcontrol/view1394/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/view1394/Makefile.in 2005-05-23 18:38:23.000000000 +0200
++++ kdebase-3.4.1/kcontrol/view1394/Makefile.in 2005-05-24 16:27:56.152036217 +0200
@@ -284,6 +284,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -25899,44 +16504,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kcontrol/xinerama/Makefile.in kdebase-3.4.0/kcontrol/xinerama/Makefile.in
---- kdebase-3.4.0.orig/kcontrol/xinerama/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/xinerama/Makefile.in 2005-05-07 12:35:19.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -79,18 +79,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_xinerama_la_SOURCES)
- DIST_SOURCES = $(kcm_xinerama_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kcontrol/xinerama/Makefile.in kdebase-3.4.1/kcontrol/xinerama/Makefile.in
+--- kdebase-3.4.1.orig/kcontrol/xinerama/Makefile.in 2005-05-23 18:38:23.000000000 +0200
++++ kdebase-3.4.1/kcontrol/xinerama/Makefile.in 2005-05-24 16:27:56.171034501 +0200
@@ -285,6 +285,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -25968,44 +16538,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kdcop/Makefile.in kdebase-3.4.0/kdcop/Makefile.in
---- kdebase-3.4.0.orig/kdcop/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdcop/Makefile.in 2005-05-07 12:35:19.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -82,18 +82,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kdcop_SOURCES)
- DIST_SOURCES = $(kdcop_SOURCES)
+diff -rua kdebase-3.4.1.orig/kdcop/Makefile.in kdebase-3.4.1/kdcop/Makefile.in
+--- kdebase-3.4.1.orig/kdcop/Makefile.in 2005-05-23 18:38:23.000000000 +0200
++++ kdebase-3.4.1/kdcop/Makefile.in 2005-05-24 16:27:56.199031972 +0200
@@ -294,6 +294,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -26037,44 +16572,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kdebugdialog/Makefile.in kdebase-3.4.0/kdebugdialog/Makefile.in
---- kdebase-3.4.0.orig/kdebugdialog/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdebugdialog/Makefile.in 2005-05-07 12:35:19.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -75,18 +75,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kdebugdialog_SOURCES)
- DIST_SOURCES = $(kdebugdialog_SOURCES)
+diff -rua kdebase-3.4.1.orig/kdebugdialog/Makefile.in kdebase-3.4.1/kdebugdialog/Makefile.in
+--- kdebase-3.4.1.orig/kdebugdialog/Makefile.in 2005-05-23 18:38:23.000000000 +0200
++++ kdebase-3.4.1/kdebugdialog/Makefile.in 2005-05-24 16:27:56.214030617 +0200
@@ -278,6 +278,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -26106,44 +16606,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kdepasswd/kcm/Makefile.in kdebase-3.4.0/kdepasswd/kcm/Makefile.in
---- kdebase-3.4.0.orig/kdepasswd/kcm/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdepasswd/kcm/Makefile.in 2005-05-07 12:35:19.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -79,18 +79,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_useraccount_la_SOURCES)
- DIST_SOURCES = $(kcm_useraccount_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kdepasswd/kcm/Makefile.in kdebase-3.4.1/kdepasswd/kcm/Makefile.in
+--- kdebase-3.4.1.orig/kdepasswd/kcm/Makefile.in 2005-05-23 18:38:23.000000000 +0200
++++ kdebase-3.4.1/kdepasswd/kcm/Makefile.in 2005-05-24 16:27:56.261026373 +0200
@@ -300,6 +300,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -26175,69 +16640,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -762,7 +765,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -774,7 +783,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -782,7 +791,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -803,7 +818,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kdepasswd/kcm/pics/Makefile.in kdebase-3.4.0/kdepasswd/kcm/pics/Makefile.in
---- kdebase-3.4.0.orig/kdepasswd/kcm/pics/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdepasswd/kcm/pics/Makefile.in 2005-05-07 12:35:19.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kdepasswd/kcm/pics/Makefile.in kdebase-3.4.1/kdepasswd/kcm/pics/Makefile.in
+--- kdebase-3.4.1.orig/kdepasswd/kcm/pics/Makefile.in 2005-05-23 18:38:23.000000000 +0200
++++ kdebase-3.4.1/kdepasswd/kcm/pics/Makefile.in 2005-05-24 16:27:56.276025018 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -26269,44 +16674,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kdepasswd/Makefile.in kdebase-3.4.0/kdepasswd/Makefile.in
---- kdebase-3.4.0.orig/kdepasswd/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdepasswd/Makefile.in 2005-05-07 12:35:19.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -76,18 +76,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kdepasswd_SOURCES)
- DIST_SOURCES = $(kdepasswd_SOURCES)
+diff -rua kdebase-3.4.1.orig/kdepasswd/Makefile.in kdebase-3.4.1/kdepasswd/Makefile.in
+--- kdebase-3.4.1.orig/kdepasswd/Makefile.in 2005-05-23 18:38:23.000000000 +0200
++++ kdebase-3.4.1/kdepasswd/Makefile.in 2005-05-24 16:27:56.231029082 +0200
@@ -302,6 +302,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -26338,92 +16708,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -737,7 +740,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -749,7 +758,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -757,7 +766,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -778,7 +793,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kdeprint/descriptions/Makefile.in kdebase-3.4.0/kdeprint/descriptions/Makefile.in
---- kdebase-3.4.0.orig/kdeprint/descriptions/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdeprint/descriptions/Makefile.in 2005-05-07 12:35:19.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -63,18 +63,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(sortthem_SOURCES)
- DIST_SOURCES = $(sortthem_SOURCES)
+diff -rua kdebase-3.4.1.orig/kdeprint/descriptions/Makefile.in kdebase-3.4.1/kdeprint/descriptions/Makefile.in
+--- kdebase-3.4.1.orig/kdeprint/descriptions/Makefile.in 2005-05-23 18:38:23.000000000 +0200
++++ kdebase-3.4.1/kdeprint/descriptions/Makefile.in 2005-05-24 16:27:56.307022218 +0200
@@ -266,6 +266,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -26455,44 +16742,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
sortthem$(EXEEXT): $(sortthem_OBJECTS) $(sortthem_DEPENDENCIES)
@rm -f sortthem$(EXEEXT)
-diff -Nru kdebase-3.4.0.orig/kdeprint/kdeprintfax/Makefile.in kdebase-3.4.0/kdeprint/kdeprintfax/Makefile.in
---- kdebase-3.4.0.orig/kdeprint/kdeprintfax/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdeprint/kdeprintfax/Makefile.in 2005-05-07 12:35:19.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -83,18 +83,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kdeprintfax_SOURCES)
- DIST_SOURCES = $(kdeprintfax_SOURCES)
+diff -rua kdebase-3.4.1.orig/kdeprint/kdeprintfax/Makefile.in kdebase-3.4.1/kdeprint/kdeprintfax/Makefile.in
+--- kdebase-3.4.1.orig/kdeprint/kdeprintfax/Makefile.in 2005-05-23 18:38:24.000000000 +0200
++++ kdebase-3.4.1/kdeprint/kdeprintfax/Makefile.in 2005-05-24 16:27:56.365016980 +0200
@@ -295,6 +295,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -26524,131 +16776,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -967,18 +970,18 @@
- .NOEXPORT:
-
- #>+ 3
--faxab.moc: $(srcdir)/faxab.h
-- $(MOC) $(srcdir)/faxab.h -o faxab.moc
-+conffilters.moc: $(srcdir)/conffilters.h
-+ $(MOC) $(srcdir)/conffilters.h -o conffilters.moc
-
- #>+ 2
--mocs: faxab.moc
-+mocs: conffilters.moc
-
- #>+ 3
--conffilters.moc: $(srcdir)/conffilters.h
-- $(MOC) $(srcdir)/conffilters.h -o conffilters.moc
-+faxab.moc: $(srcdir)/faxab.h
-+ $(MOC) $(srcdir)/faxab.h -o faxab.moc
-
- #>+ 2
--mocs: conffilters.moc
-+mocs: faxab.moc
-
- #>+ 3
- confsystem.moc: $(srcdir)/confsystem.h
-@@ -1010,38 +1013,38 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f faxab.moc conffilters.moc confsystem.moc kdeprintfax.moc filterdlg.moc faxctrl.moc
-+ -rm -f conffilters.moc faxab.moc confsystem.moc kdeprintfax.moc filterdlg.moc faxctrl.moc
-
- #>+ 2
--KDE_DIST=conffax.h faxfilters faxctrl.h Makefile.in conffilters.h crsc-app-kdeprintfax.svgz anytops cr16-app-kdeprintfax.png kdeprintfax.desktop cr16-action-abentry.png faxab.h configdlg.h cr64-app-kdeprintfax.png kdeprintfax.h cr48-app-kdeprintfax.png filterdlg.h defcmds.h confgeneral.h cr32-app-kdeprintfax.png kdeprintfaxui.rc cr128-app-kdeprintfax.png Makefile.am confsystem.h
-+KDE_DIST=conffax.h faxfilters faxctrl.h conffilters.h Makefile.in crsc-app-kdeprintfax.svgz anytops cr16-app-kdeprintfax.png kdeprintfax.desktop cr16-action-abentry.png faxab.h configdlg.h cr64-app-kdeprintfax.png kdeprintfax.h cr48-app-kdeprintfax.png filterdlg.h confgeneral.h defcmds.h cr32-app-kdeprintfax.png kdeprintfaxui.rc cr128-app-kdeprintfax.png Makefile.am confsystem.h
-
- #>+ 2
- docs-am:
-
- #>+ 25
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdeprintfax.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdeprintfax.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-kdeprintfax.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kdeprintfax.svgz
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
- $(INSTALL_DATA) $(srcdir)/cr128-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdeprintfax.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdeprintfax.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdeprintfax.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- $(INSTALL_DATA) $(srcdir)/cr64-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kdeprintfax.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-- $(INSTALL_DATA) $(srcdir)/crsc-app-kdeprintfax.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kdeprintfax.svgz
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdeprintfax.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdeprintfax.png
- $(mkinstalldirs) $(DESTDIR)$(picdir)/crystalsvg/16x16/actions
- $(INSTALL_DATA) $(srcdir)/cr16-action-abentry.png $(DESTDIR)$(picdir)/crystalsvg/16x16/actions/abentry.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdeprintfax.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdeprintfax.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kdeprintfax.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdeprintfax.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdeprintfax.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdeprintfax.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kdeprintfax.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kdeprintfax.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdeprintfax.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdeprintfax.png
- -rm -f $(DESTDIR)$(picdir)/crystalsvg/16x16/actions/abentry.png
-
- #>+ 15
-@@ -1083,7 +1086,7 @@
-
-
- #>+ 11
--kdeprintfax.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kdeprintfax.cpp $(srcdir)/faxab.cpp $(srcdir)/faxctrl.cpp $(srcdir)/confgeneral.cpp $(srcdir)/configdlg.cpp $(srcdir)/conffax.cpp $(srcdir)/confsystem.cpp $(srcdir)/conffilters.cpp $(srcdir)/filterdlg.cpp $(srcdir)/defcmds.cpp conffilters.moc faxab.moc confsystem.moc faxctrl.moc filterdlg.moc kdeprintfax.moc
-+kdeprintfax.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kdeprintfax.cpp $(srcdir)/faxab.cpp $(srcdir)/faxctrl.cpp $(srcdir)/confgeneral.cpp $(srcdir)/configdlg.cpp $(srcdir)/conffax.cpp $(srcdir)/confsystem.cpp $(srcdir)/conffilters.cpp $(srcdir)/filterdlg.cpp $(srcdir)/defcmds.cpp faxab.moc conffilters.moc confsystem.moc faxctrl.moc filterdlg.moc kdeprintfax.moc
- @echo 'creating kdeprintfax.all_cpp.cpp ...'; \
- rm -f kdeprintfax.all_cpp.files kdeprintfax.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> kdeprintfax.all_cpp.final; \
-diff -Nru kdebase-3.4.0.orig/kdeprint/kdeprint_part/Makefile.in kdebase-3.4.0/kdeprint/kdeprint_part/Makefile.in
---- kdebase-3.4.0.orig/kdeprint/kdeprint_part/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdeprint/kdeprint_part/Makefile.in 2005-05-07 12:35:19.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkdeprint_part_la_SOURCES)
- DIST_SOURCES = $(libkdeprint_part_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kdeprint/kdeprint_part/Makefile.in kdebase-3.4.1/kdeprint/kdeprint_part/Makefile.in
+--- kdebase-3.4.1.orig/kdeprint/kdeprint_part/Makefile.in 2005-05-23 18:38:24.000000000 +0200
++++ kdebase-3.4.1/kdeprint/kdeprint_part/Makefile.in 2005-05-24 16:27:56.327020412 +0200
@@ -284,6 +284,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -26680,44 +16810,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kdeprint/kjobviewer/Makefile.in kdebase-3.4.0/kdeprint/kjobviewer/Makefile.in
---- kdebase-3.4.0.orig/kdeprint/kjobviewer/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdeprint/kjobviewer/Makefile.in 2005-05-07 12:35:19.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -92,18 +92,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kjobviewer_la_SOURCES)
- #>- DIST_SOURCES = $(kjobviewer_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kdeprint/kjobviewer/Makefile.in kdebase-3.4.1/kdeprint/kjobviewer/Makefile.in
+--- kdebase-3.4.1.orig/kdeprint/kjobviewer/Makefile.in 2005-05-23 18:38:24.000000000 +0200
++++ kdebase-3.4.1/kdeprint/kjobviewer/Makefile.in 2005-05-24 16:27:56.394014360 +0200
@@ -301,6 +301,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -26749,83 +16844,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1051,29 +1054,29 @@
-
- #>+ 25
- install-kde-icons:
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kjobviewer.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
- $(INSTALL_DATA) $(srcdir)/cr128-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kjobviewer.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kjobviewer.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
- $(INSTALL_DATA) $(srcdir)/cr22-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kjobviewer.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kjobviewer.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kjobviewer.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kjobviewer.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- $(INSTALL_DATA) $(srcdir)/cr64-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kjobviewer.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
- $(INSTALL_DATA) $(srcdir)/crsc-app-kjobviewer.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kjobviewer.svgz
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kjobviewer.png
-
- uninstall-kde-icons:
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kjobviewer.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kjobviewer.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kjobviewer.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kjobviewer.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kjobviewer.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kjobviewer.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kjobviewer.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kjobviewer.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kjobviewer.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kjobviewer.png
-
- #>+ 15
- force-reedit:
-diff -Nru kdebase-3.4.0.orig/kdeprint/kprinter/Makefile.in kdebase-3.4.0/kdeprint/kprinter/Makefile.in
---- kdebase-3.4.0.orig/kdeprint/kprinter/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdeprint/kprinter/Makefile.in 2005-05-07 12:35:19.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -89,18 +89,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kprinter_la_SOURCES)
- #>- DIST_SOURCES = $(kprinter_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kdeprint/kprinter/Makefile.in kdebase-3.4.1/kdeprint/kprinter/Makefile.in
+--- kdebase-3.4.1.orig/kdeprint/kprinter/Makefile.in 2005-05-23 18:38:24.000000000 +0200
++++ kdebase-3.4.1/kdeprint/kprinter/Makefile.in 2005-05-24 16:27:56.421011922 +0200
@@ -295,6 +295,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -26857,21 +16878,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kdeprint/Makefile.in kdebase-3.4.0/kdeprint/Makefile.in
---- kdebase-3.4.0.orig/kdeprint/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdeprint/Makefile.in 2005-05-07 12:35:19.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kdeprint/Makefile.in kdebase-3.4.1/kdeprint/Makefile.in
+--- kdebase-3.4.1.orig/kdeprint/Makefile.in 2005-05-23 18:38:23.000000000 +0200
++++ kdebase-3.4.1/kdeprint/Makefile.in 2005-05-24 16:27:56.291023663 +0200
@@ -251,6 +251,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -26903,92 +16912,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -599,7 +602,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -611,7 +620,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -619,7 +628,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -640,7 +655,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kdeprint/printmgr/Makefile.in kdebase-3.4.0/kdeprint/printmgr/Makefile.in
---- kdebase-3.4.0.orig/kdeprint/printmgr/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdeprint/printmgr/Makefile.in 2005-05-07 12:35:20.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -76,18 +76,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_printmgr_la_SOURCES)
- DIST_SOURCES = $(kcm_printmgr_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kdeprint/printmgr/Makefile.in kdebase-3.4.1/kdeprint/printmgr/Makefile.in
+--- kdebase-3.4.1.orig/kdeprint/printmgr/Makefile.in 2005-05-23 18:38:24.000000000 +0200
++++ kdebase-3.4.1/kdeprint/printmgr/Makefile.in 2005-05-24 16:27:56.439010296 +0200
@@ -282,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -27020,95 +16946,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -919,7 +922,7 @@
-
-
- #>+ 2
--KDE_DIST=cr64-app-printmgr.png Makefile.in cr32-app-printmgr.png printmgr.desktop cr128-app-printmgr.png cr22-app-printmgr.png crsc-app-printmgr.svgz cr48-app-printmgr.png cr16-app-printmgr.png printers.desktop Makefile.am
-+KDE_DIST=cr64-app-printmgr.png Makefile.in cr32-app-printmgr.png cr128-app-printmgr.png printmgr.desktop cr22-app-printmgr.png crsc-app-printmgr.svgz cr48-app-printmgr.png cr16-app-printmgr.png printers.desktop Makefile.am
-
- #>+ 3
- clean-closures:
-@@ -930,29 +933,29 @@
-
- #>+ 25
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-- $(INSTALL_DATA) $(srcdir)/cr128-app-printmgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/printmgr.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-printmgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/printmgr.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
- $(INSTALL_DATA) $(srcdir)/cr22-app-printmgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/printmgr.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-printmgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/printmgr.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-printmgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/printmgr.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-printmgr.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/printmgr.svgz
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-printmgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/printmgr.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-printmgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/printmgr.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-printmgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/printmgr.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- $(INSTALL_DATA) $(srcdir)/cr64-app-printmgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/printmgr.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-- $(INSTALL_DATA) $(srcdir)/crsc-app-printmgr.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/printmgr.svgz
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/printmgr.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/printmgr.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/printmgr.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/printmgr.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/printmgr.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/printmgr.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/printmgr.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/printmgr.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/printmgr.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/printmgr.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/printmgr.svgz
-
- #>+ 15
- force-reedit:
-diff -Nru kdebase-3.4.0.orig/kdeprint/slave/Makefile.in kdebase-3.4.0/kdeprint/slave/Makefile.in
---- kdebase-3.4.0.orig/kdeprint/slave/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdeprint/slave/Makefile.in 2005-05-07 12:35:20.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kio_print_la_SOURCES)
- DIST_SOURCES = $(kio_print_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kdeprint/slave/Makefile.in kdebase-3.4.1/kdeprint/slave/Makefile.in
+--- kdebase-3.4.1.orig/kdeprint/slave/Makefile.in 2005-05-23 18:38:24.000000000 +0200
++++ kdebase-3.4.1/kdeprint/slave/Makefile.in 2005-05-24 16:27:56.466007858 +0200
@@ -297,6 +297,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -27140,69 +16980,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -736,7 +739,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -748,7 +757,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -756,7 +765,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -777,7 +792,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kdeprint/slave/mimetypes/Makefile.in kdebase-3.4.0/kdeprint/slave/mimetypes/Makefile.in
---- kdebase-3.4.0.orig/kdeprint/slave/mimetypes/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdeprint/slave/mimetypes/Makefile.in 2005-05-07 12:35:20.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kdeprint/slave/mimetypes/Makefile.in kdebase-3.4.1/kdeprint/slave/mimetypes/Makefile.in
+--- kdebase-3.4.1.orig/kdeprint/slave/mimetypes/Makefile.in 2005-05-23 18:38:24.000000000 +0200
++++ kdebase-3.4.1/kdeprint/slave/mimetypes/Makefile.in 2005-05-24 16:27:56.476006955 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -27234,21 +17014,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kdeprint/slave/templates/Makefile.in kdebase-3.4.0/kdeprint/slave/templates/Makefile.in
---- kdebase-3.4.0.orig/kdeprint/slave/templates/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdeprint/slave/templates/Makefile.in 2005-05-07 12:35:20.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kdeprint/slave/templates/Makefile.in kdebase-3.4.1/kdeprint/slave/templates/Makefile.in
+--- kdebase-3.4.1.orig/kdeprint/slave/templates/Makefile.in 2005-05-23 18:38:24.000000000 +0200
++++ kdebase-3.4.1/kdeprint/slave/templates/Makefile.in 2005-05-24 16:27:56.485006142 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -27280,21 +17048,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kdesktop/init/Makefile.in kdebase-3.4.0/kdesktop/init/Makefile.in
---- kdebase-3.4.0.orig/kdesktop/init/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdesktop/init/Makefile.in 2005-05-07 12:35:22.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kdesktop/init/Makefile.in kdebase-3.4.1/kdesktop/init/Makefile.in
+--- kdebase-3.4.1.orig/kdesktop/init/Makefile.in 2005-05-23 18:38:25.000000000 +0200
++++ kdebase-3.4.1/kdesktop/init/Makefile.in 2005-05-24 16:27:56.600995665 +0200
@@ -263,6 +263,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -27326,69 +17082,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -649,7 +652,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -661,7 +670,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -669,7 +678,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -690,7 +705,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kdesktop/init/Templates/Makefile.in kdebase-3.4.0/kdesktop/init/Templates/Makefile.in
---- kdebase-3.4.0.orig/kdesktop/init/Templates/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdesktop/init/Templates/Makefile.in 2005-05-07 12:35:22.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kdesktop/init/Templates/Makefile.in kdebase-3.4.1/kdesktop/init/Templates/Makefile.in
+--- kdebase-3.4.1.orig/kdesktop/init/Templates/Makefile.in 2005-05-23 18:38:25.000000000 +0200
++++ kdebase-3.4.1/kdesktop/init/Templates/Makefile.in 2005-05-24 16:27:56.614994400 +0200
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -27420,53 +17116,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -774,7 +777,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=linkCDROM.desktop ZIP-Device.desktop linkCAMERA.desktop HD.desktop linkCDWRITER.desktop NFS.desktop linkProgram.desktop Makefile.in linkHD.desktop linkNFS.desktop linkZIP.desktop CDROM-Device.desktop TextFile.desktop DVDROM-Device.desktop Program.desktop linkDVDROM.desktop MO-Device.desktop HTMLFile.html CAMERA-Device.desktop linkFloppy.desktop Directory.desktop Floppy.desktop linkURL.desktop CDWRITER-Device.desktop linkMO.desktop TextFile.txt URL.desktop HTMLFile.desktop Makefile.am
-+KDE_DIST=ZIP-Device.desktop linkCDROM.desktop linkCAMERA.desktop HD.desktop linkCDWRITER.desktop NFS.desktop linkProgram.desktop Makefile.in linkHD.desktop linkNFS.desktop linkZIP.desktop CDROM-Device.desktop TextFile.desktop DVDROM-Device.desktop Program.desktop linkDVDROM.desktop MO-Device.desktop CAMERA-Device.desktop HTMLFile.html linkFloppy.desktop Directory.desktop Floppy.desktop linkURL.desktop CDWRITER-Device.desktop linkMO.desktop TextFile.txt URL.desktop HTMLFile.desktop Makefile.am
-
- #>+ 2
- docs-am:
-diff -Nru kdebase-3.4.0.orig/kdesktop/kwebdesktop/Makefile.in kdebase-3.4.0/kdesktop/kwebdesktop/Makefile.in
---- kdebase-3.4.0.orig/kdesktop/kwebdesktop/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdesktop/kwebdesktop/Makefile.in 2005-05-07 12:35:22.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -74,18 +74,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kwebdesktop_SOURCES)
- DIST_SOURCES = $(kwebdesktop_SOURCES)
+diff -rua kdebase-3.4.1.orig/kdesktop/kwebdesktop/Makefile.in kdebase-3.4.1/kdesktop/kwebdesktop/Makefile.in
+--- kdebase-3.4.1.orig/kdesktop/kwebdesktop/Makefile.in 2005-05-23 18:38:25.000000000 +0200
++++ kdebase-3.4.1/kdesktop/kwebdesktop/Makefile.in 2005-05-24 16:27:56.633992684 +0200
@@ -286,6 +286,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -27498,44 +17150,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kdesktop/lock/Makefile.in kdebase-3.4.0/kdesktop/lock/Makefile.in
---- kdebase-3.4.0.orig/kdesktop/lock/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdesktop/lock/Makefile.in 2005-05-07 12:35:23.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kdesktop_lock_SOURCES)
- DIST_SOURCES = $(kdesktop_lock_SOURCES)
+diff -rua kdebase-3.4.1.orig/kdesktop/lock/Makefile.in kdebase-3.4.1/kdesktop/lock/Makefile.in
+--- kdebase-3.4.1.orig/kdesktop/lock/Makefile.in 2005-05-23 18:38:25.000000000 +0200
++++ kdebase-3.4.1/kdesktop/lock/Makefile.in 2005-05-24 16:27:56.669989433 +0200
@@ -281,6 +281,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -27567,57 +17184,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kdesktop/Makefile.in kdebase-3.4.0/kdesktop/Makefile.in
---- kdebase-3.4.0.orig/kdesktop/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdesktop/Makefile.in 2005-05-07 12:35:22.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -115,29 +115,29 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kdesktop_la_SOURCES) $(libkdesktopsettings_la_SOURCES) \
- $(kcheckrunning_SOURCES)
+diff -rua kdebase-3.4.1.orig/kdesktop/Makefile.in kdebase-3.4.1/kdesktop/Makefile.in
+--- kdebase-3.4.1.orig/kdesktop/Makefile.in 2005-05-23 18:38:25.000000000 +0200
++++ kdebase-3.4.1/kdesktop/Makefile.in 2005-05-24 16:27:56.586996929 +0200
@@ -356,6 +356,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -27649,149 +17218,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1048,7 +1051,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1060,7 +1069,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -1068,7 +1077,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -1089,7 +1104,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1416,18 +1431,18 @@
- $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KBackgroundIface.kidl
-
- #>+ 3
--minicli.moc: $(srcdir)/minicli.h
-- $(MOC) $(srcdir)/minicli.h -o minicli.moc
-+krootwm.moc: $(srcdir)/krootwm.h
-+ $(MOC) $(srcdir)/krootwm.h -o krootwm.moc
-
- #>+ 2
--mocs: minicli.moc
-+mocs: krootwm.moc
-
- #>+ 3
--krootwm.moc: $(srcdir)/krootwm.h
-- $(MOC) $(srcdir)/krootwm.h -o krootwm.moc
-+minicli.moc: $(srcdir)/minicli.h
-+ $(MOC) $(srcdir)/minicli.h -o minicli.moc
-
- #>+ 2
--mocs: krootwm.moc
-+mocs: minicli.moc
-
- #>+ 3
- startupid.moc: $(srcdir)/startupid.h
-@@ -1451,6 +1466,13 @@
- mocs: desktop.moc
-
- #>+ 3
-+pixmapserver.moc: $(srcdir)/pixmapserver.h
-+ $(MOC) $(srcdir)/pixmapserver.h -o pixmapserver.moc
-+
-+#>+ 2
-+mocs: pixmapserver.moc
-+
-+#>+ 3
- kcustommenu.moc: $(srcdir)/kcustommenu.h
- $(MOC) $(srcdir)/kcustommenu.h -o kcustommenu.moc
-
-@@ -1465,13 +1487,6 @@
- mocs: kdiconview.moc
-
- #>+ 3
--pixmapserver.moc: $(srcdir)/pixmapserver.h
-- $(MOC) $(srcdir)/pixmapserver.h -o pixmapserver.moc
--
--#>+ 2
--mocs: pixmapserver.moc
--
--#>+ 3
- xautolock.moc: $(srcdir)/xautolock.h
- $(MOC) $(srcdir)/xautolock.h -o xautolock.moc
-
-@@ -1496,7 +1511,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f minicli.moc krootwm.moc startupid.moc lockeng.moc desktop.moc kcustommenu.moc kdiconview.moc pixmapserver.moc xautolock.moc bgmanager.moc
-+ -rm -f krootwm.moc minicli.moc startupid.moc lockeng.moc desktop.moc pixmapserver.moc kcustommenu.moc kdiconview.moc xautolock.moc bgmanager.moc
-
- #>+ 2
- KDE_DIST=DESIGN Makefile.in kdesktop.kcfg kdesktop_custom_menu1 klaunchsettings.kcfgc kdesktopSetAsBackground.desktop minicli_ui.ui kshadowengine.h configure.in.in kfileividesktop.h kdesktopshadowsettings.h kdesktop_custom_menu2 kcustommenu.h kdesktopbindings.cpp kshadowsettings.h kdesktopsettings.kcfgc kdesktop.desktop klaunch.kcfg kdiconview.h kdeeject Makefile.am
-@@ -1565,7 +1580,7 @@
-
-
- #>+ 11
--libkdeinit_kdesktop_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/main.cc kdesktopsettings.h $(srcdir)/krootwm.cc kdesktopsettings.h $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc kdesktopsettings.h $(srcdir)/desktop.cc klaunchsettings.h $(srcdir)/lockeng.cc kdesktopsettings.h $(srcdir)/bgmanager.cc kdesktopsettings.h $(srcdir)/init.cc kdesktopsettings.h $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc minicli_ui.cc krootwm.moc minicli.moc startupid.moc lockeng.moc desktop.moc pixmapserver.moc kcustommenu.moc kdiconview.moc bgmanager.moc xautolock.moc
-+libkdeinit_kdesktop_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/main.cc kdesktopsettings.h $(srcdir)/krootwm.cc kdesktopsettings.h $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc kdesktopsettings.h $(srcdir)/desktop.cc klaunchsettings.h $(srcdir)/lockeng.cc kdesktopsettings.h $(srcdir)/bgmanager.cc kdesktopsettings.h $(srcdir)/init.cc kdesktopsettings.h $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc minicli_ui.cc minicli.moc krootwm.moc startupid.moc lockeng.moc desktop.moc kdiconview.moc pixmapserver.moc kcustommenu.moc bgmanager.moc xautolock.moc
- @echo 'creating libkdeinit_kdesktop_la.all_cc.cc ...'; \
- rm -f libkdeinit_kdesktop_la.all_cc.files libkdeinit_kdesktop_la.all_cc.final; \
- echo "#define KDE_USE_FINAL 1" >> libkdeinit_kdesktop_la.all_cc.final; \
-@@ -1577,7 +1592,7 @@
- rm -f libkdeinit_kdesktop_la.all_cc.final libkdeinit_kdesktop_la.all_cc.files
-
- #>+ 11
--libkdeinit_kdesktop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/minicli.cpp kdesktopsettings.h $(srcdir)/startupid.cpp klaunchsettings.h $(srcdir)/kshadowengine.cpp $(srcdir)/kshadowsettings.cpp $(srcdir)/kdesktopshadowsettings.cpp $(srcdir)/kfileividesktop.cpp krootwm.moc minicli.moc startupid.moc lockeng.moc desktop.moc pixmapserver.moc kcustommenu.moc kdiconview.moc bgmanager.moc xautolock.moc
-+libkdeinit_kdesktop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/minicli.cpp kdesktopsettings.h $(srcdir)/startupid.cpp klaunchsettings.h $(srcdir)/kshadowengine.cpp $(srcdir)/kshadowsettings.cpp $(srcdir)/kdesktopshadowsettings.cpp $(srcdir)/kfileividesktop.cpp minicli.moc krootwm.moc startupid.moc lockeng.moc desktop.moc kdiconview.moc pixmapserver.moc kcustommenu.moc bgmanager.moc xautolock.moc
- @echo 'creating libkdeinit_kdesktop_la.all_cpp.cpp ...'; \
- rm -f libkdeinit_kdesktop_la.all_cpp.files libkdeinit_kdesktop_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libkdeinit_kdesktop_la.all_cpp.final; \
-diff -Nru kdebase-3.4.0.orig/kdesktop/patterns/Makefile.in kdebase-3.4.0/kdesktop/patterns/Makefile.in
---- kdebase-3.4.0.orig/kdesktop/patterns/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdesktop/patterns/Makefile.in 2005-05-07 12:35:23.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kdesktop/patterns/Makefile.in kdebase-3.4.1/kdesktop/patterns/Makefile.in
+--- kdebase-3.4.1.orig/kdesktop/patterns/Makefile.in 2005-05-23 18:38:25.000000000 +0200
++++ kdebase-3.4.1/kdesktop/patterns/Makefile.in 2005-05-24 16:27:56.682988259 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -27823,21 +17252,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kdesktop/pics/Makefile.in kdebase-3.4.0/kdesktop/pics/Makefile.in
---- kdebase-3.4.0.orig/kdesktop/pics/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdesktop/pics/Makefile.in 2005-05-07 12:35:23.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kdesktop/pics/Makefile.in kdebase-3.4.1/kdesktop/pics/Makefile.in
+--- kdebase-3.4.1.orig/kdesktop/pics/Makefile.in 2005-05-23 18:38:25.000000000 +0200
++++ kdebase-3.4.1/kdesktop/pics/Makefile.in 2005-05-24 16:27:56.696986995 +0200
@@ -247,6 +247,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -27869,21 +17286,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kdesktop/programs/Makefile.in kdebase-3.4.0/kdesktop/programs/Makefile.in
---- kdebase-3.4.0.orig/kdesktop/programs/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdesktop/programs/Makefile.in 2005-05-07 12:35:23.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kdesktop/programs/Makefile.in kdebase-3.4.1/kdesktop/programs/Makefile.in
+--- kdebase-3.4.1.orig/kdesktop/programs/Makefile.in 2005-05-23 18:38:25.000000000 +0200
++++ kdebase-3.4.1/kdesktop/programs/Makefile.in 2005-05-24 16:27:56.704986272 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -27915,44 +17320,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kdesu/kdesu/Makefile.in kdebase-3.4.0/kdesu/kdesu/Makefile.in
---- kdebase-3.4.0.orig/kdesu/kdesu/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdesu/kdesu/Makefile.in 2005-05-07 12:35:23.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -73,18 +73,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kdesu_SOURCES)
- DIST_SOURCES = $(kdesu_SOURCES)
+diff -rua kdebase-3.4.1.orig/kdesu/kdesu/Makefile.in kdebase-3.4.1/kdesu/kdesu/Makefile.in
+--- kdebase-3.4.1.orig/kdesu/kdesu/Makefile.in 2005-05-23 18:38:25.000000000 +0200
++++ kdebase-3.4.1/kdesu/kdesu/Makefile.in 2005-05-24 16:27:56.727984195 +0200
@@ -277,6 +277,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -27984,44 +17354,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kdesu/kdesud/Makefile.in kdebase-3.4.0/kdesu/kdesud/Makefile.in
---- kdebase-3.4.0.orig/kdesu/kdesud/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdesu/kdesud/Makefile.in 2005-05-07 12:35:23.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -75,18 +75,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kdesud_SOURCES)
- DIST_SOURCES = $(kdesud_SOURCES)
+diff -rua kdebase-3.4.1.orig/kdesu/kdesud/Makefile.in kdebase-3.4.1/kdesu/kdesud/Makefile.in
+--- kdebase-3.4.1.orig/kdesu/kdesud/Makefile.in 2005-05-23 18:38:25.000000000 +0200
++++ kdebase-3.4.1/kdesu/kdesud/Makefile.in 2005-05-24 16:27:56.740983021 +0200
@@ -279,6 +279,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -28053,21 +17388,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kdesu/Makefile.in kdebase-3.4.0/kdesu/Makefile.in
---- kdebase-3.4.0.orig/kdesu/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdesu/Makefile.in 2005-05-07 12:35:23.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kdesu/Makefile.in kdebase-3.4.1/kdesu/Makefile.in
+--- kdebase-3.4.1.orig/kdesu/Makefile.in 2005-05-23 18:38:25.000000000 +0200
++++ kdebase-3.4.1/kdesu/Makefile.in 2005-05-24 16:27:56.714985369 +0200
@@ -252,6 +252,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -28099,92 +17422,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -600,7 +603,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -612,7 +621,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -620,7 +629,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -641,7 +656,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kdialog/Makefile.in kdebase-3.4.0/kdialog/Makefile.in
---- kdebase-3.4.0.orig/kdialog/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdialog/Makefile.in 2005-05-07 12:35:23.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -73,18 +73,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kdialog_SOURCES)
- DIST_SOURCES = $(kdialog_SOURCES)
+diff -rua kdebase-3.4.1.orig/kdialog/Makefile.in kdebase-3.4.1/kdialog/Makefile.in
+--- kdebase-3.4.1.orig/kdialog/Makefile.in 2005-05-23 18:38:25.000000000 +0200
++++ kdebase-3.4.1/kdialog/Makefile.in 2005-05-24 16:27:56.756981576 +0200
@@ -276,6 +276,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -28216,35 +17456,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kdm/backend/Makefile.in kdebase-3.4.0/kdm/backend/Makefile.in
---- kdebase-3.4.0.orig/kdm/backend/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdm/backend/Makefile.in 2005-05-07 12:35:23.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -94,11 +94,11 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kdm_SOURCES)
- DIST_SOURCES = $(kdm_SOURCES)
+diff -rua kdebase-3.4.1.orig/kdm/backend/Makefile.in kdebase-3.4.1/kdm/backend/Makefile.in
+--- kdebase-3.4.1.orig/kdm/backend/Makefile.in 2005-05-23 18:38:25.000000000 +0200
++++ kdebase-3.4.1/kdm/backend/Makefile.in 2005-05-24 16:27:56.795978053 +0200
@@ -291,6 +291,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -28285,57 +17499,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kdm/kfrontend/Makefile.in kdebase-3.4.0/kdm/kfrontend/Makefile.in
---- kdebase-3.4.0.orig/kdm/kfrontend/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdm/kfrontend/Makefile.in 2005-05-07 12:35:23.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -101,29 +101,29 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(genkdmconf_SOURCES) $(kdm_config_SOURCES) \
- $(kdm_greet_SOURCES) $(kdmctl_SOURCES) $(krootimage_SOURCES)
+diff -rua kdebase-3.4.1.orig/kdm/kfrontend/Makefile.in kdebase-3.4.1/kdm/kfrontend/Makefile.in
+--- kdebase-3.4.1.orig/kdm/kfrontend/Makefile.in 2005-05-23 18:38:25.000000000 +0200
++++ kdebase-3.4.1/kdm/kfrontend/Makefile.in 2005-05-24 16:27:56.852972905 +0200
@@ -332,6 +332,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -28376,119 +17542,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -838,7 +841,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -850,7 +859,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -858,7 +867,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -879,7 +894,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1135,36 +1150,36 @@
- mocs: kgverify.moc
-
- #>+ 3
--kdmclock.moc: $(srcdir)/kdmclock.h
-- $(MOC) $(srcdir)/kdmclock.h -o kdmclock.moc
-+kgreeter.moc: $(srcdir)/kgreeter.h
-+ $(MOC) $(srcdir)/kgreeter.h -o kgreeter.moc
-
- #>+ 2
--mocs: kdmclock.moc
-+mocs: kgreeter.moc
-
- #>+ 3
--kgreeter.moc: $(srcdir)/kgreeter.h
-- $(MOC) $(srcdir)/kgreeter.h -o kgreeter.moc
-+kchooser.moc: $(srcdir)/kchooser.h
-+ $(MOC) $(srcdir)/kchooser.h -o kchooser.moc
-
- #>+ 2
--mocs: kgreeter.moc
-+mocs: kchooser.moc
-
- #>+ 3
--kconsole.moc: $(srcdir)/kconsole.h
-- $(MOC) $(srcdir)/kconsole.h -o kconsole.moc
-+kdmclock.moc: $(srcdir)/kdmclock.h
-+ $(MOC) $(srcdir)/kdmclock.h -o kdmclock.moc
-
- #>+ 2
--mocs: kconsole.moc
-+mocs: kdmclock.moc
-
- #>+ 3
--kchooser.moc: $(srcdir)/kchooser.h
-- $(MOC) $(srcdir)/kchooser.h -o kchooser.moc
-+kconsole.moc: $(srcdir)/kconsole.h
-+ $(MOC) $(srcdir)/kconsole.h -o kconsole.moc
-
- #>+ 2
--mocs: kchooser.moc
-+mocs: kconsole.moc
-
- #>+ 3
- clean-metasources:
-- -rm -f krootimage.moc kdmshutdown.moc kgdialog.moc kgverify.moc kdmclock.moc kgreeter.moc kconsole.moc kchooser.moc
-+ -rm -f krootimage.moc kdmshutdown.moc kgdialog.moc kgverify.moc kgreeter.moc kchooser.moc kdmclock.moc kconsole.moc
-
- #>+ 2
- KDE_DIST=Makefile.in Makefile.am
-diff -Nru kdebase-3.4.0.orig/kdm/kfrontend/pics/Makefile.in kdebase-3.4.0/kdm/kfrontend/pics/Makefile.in
---- kdebase-3.4.0.orig/kdm/kfrontend/pics/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdm/kfrontend/pics/Makefile.in 2005-05-07 12:35:23.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kdm/kfrontend/pics/Makefile.in kdebase-3.4.1/kdm/kfrontend/pics/Makefile.in
+--- kdebase-3.4.1.orig/kdm/kfrontend/pics/Makefile.in 2005-05-23 18:38:25.000000000 +0200
++++ kdebase-3.4.1/kdm/kfrontend/pics/Makefile.in 2005-05-24 16:27:56.865971731 +0200
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -28520,21 +17576,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kdm/kfrontend/sessions/Makefile.in kdebase-3.4.0/kdm/kfrontend/sessions/Makefile.in
---- kdebase-3.4.0.orig/kdm/kfrontend/sessions/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdm/kfrontend/sessions/Makefile.in 2005-05-07 12:35:23.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kdm/kfrontend/sessions/Makefile.in kdebase-3.4.1/kdm/kfrontend/sessions/Makefile.in
+--- kdebase-3.4.1.orig/kdm/kfrontend/sessions/Makefile.in 2005-05-23 18:38:25.000000000 +0200
++++ kdebase-3.4.1/kdm/kfrontend/sessions/Makefile.in 2005-05-24 16:27:56.879970467 +0200
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -28566,53 +17610,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
kde.desktop: $(top_builddir)/config.status $(srcdir)/kde.desktop.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-@@ -784,7 +787,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=9wm.desktop ratpoison.desktop golem.desktop amiwm.desktop sapphire.desktop enlightenment.desktop aewm.desktop ude.desktop cde.desktop openbox.desktop Makefile.in xfce.desktop wm2.desktop fvwm95.desktop twm.desktop evilwm.desktop ion.desktop fluxbox.desktop xfce4.desktop amaterus.desktop vtwm.desktop olvwm.desktop metacity.desktop sawfish.desktop oroborus.desktop aewm++.desktop asclassic.desktop pwm.desktop w9wm.desktop fvwm.desktop mwm.desktop ctwm.desktop wmaker.desktop icewm.desktop afterstep.desktop phluid.desktop qvwm.desktop matchbox.desktop gnome.desktop blackbox.desktop olwm.desktop cwwm.desktop waimea.desktop larswm.desktop flwm.desktop kde.desktop.in lwm.desktop Makefile.am
-+KDE_DIST=9wm.desktop golem.desktop ratpoison.desktop amiwm.desktop sapphire.desktop enlightenment.desktop aewm.desktop ude.desktop cde.desktop openbox.desktop Makefile.in xfce.desktop wm2.desktop fvwm95.desktop twm.desktop evilwm.desktop ion.desktop fluxbox.desktop xfce4.desktop amaterus.desktop vtwm.desktop olvwm.desktop metacity.desktop sawfish.desktop oroborus.desktop aewm++.desktop asclassic.desktop pwm.desktop w9wm.desktop fvwm.desktop mwm.desktop ctwm.desktop wmaker.desktop icewm.desktop afterstep.desktop phluid.desktop qvwm.desktop matchbox.desktop gnome.desktop blackbox.desktop olwm.desktop cwwm.desktop larswm.desktop waimea.desktop flwm.desktop kde.desktop.in lwm.desktop Makefile.am
-
- #>+ 2
- docs-am:
-diff -Nru kdebase-3.4.0.orig/kdm/kfrontend/themer/Makefile.in kdebase-3.4.0/kdm/kfrontend/themer/Makefile.in
---- kdebase-3.4.0.orig/kdm/kfrontend/themer/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdm/kfrontend/themer/Makefile.in 2005-05-07 12:35:23.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -73,18 +73,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkdmthemer_a_SOURCES)
- DIST_SOURCES = $(libkdmthemer_a_SOURCES)
+diff -rua kdebase-3.4.1.orig/kdm/kfrontend/themer/Makefile.in kdebase-3.4.1/kdm/kfrontend/themer/Makefile.in
+--- kdebase-3.4.1.orig/kdm/kfrontend/themer/Makefile.in 2005-05-23 18:38:25.000000000 +0200
++++ kdebase-3.4.1/kdm/kfrontend/themer/Makefile.in 2005-05-24 16:27:56.905968118 +0200
@@ -276,6 +276,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -28644,74 +17644,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLIBRARIES:
-@@ -862,18 +865,18 @@
- mocs: kdmitem.moc
-
- #>+ 3
--kdmthemer.moc: $(srcdir)/kdmthemer.h
-- $(MOC) $(srcdir)/kdmthemer.h -o kdmthemer.moc
-+kdmpixmap.moc: $(srcdir)/kdmpixmap.h
-+ $(MOC) $(srcdir)/kdmpixmap.h -o kdmpixmap.moc
-
- #>+ 2
--mocs: kdmthemer.moc
-+mocs: kdmpixmap.moc
-
- #>+ 3
--kdmpixmap.moc: $(srcdir)/kdmpixmap.h
-- $(MOC) $(srcdir)/kdmpixmap.h -o kdmpixmap.moc
-+kdmthemer.moc: $(srcdir)/kdmthemer.h
-+ $(MOC) $(srcdir)/kdmthemer.h -o kdmthemer.moc
-
- #>+ 2
--mocs: kdmpixmap.moc
-+mocs: kdmthemer.moc
-
- #>+ 3
- kdmrect.moc: $(srcdir)/kdmrect.h
-@@ -884,7 +887,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f kdmlabel.moc kdmitem.moc kdmthemer.moc kdmpixmap.moc kdmrect.moc
-+ -rm -f kdmlabel.moc kdmitem.moc kdmpixmap.moc kdmthemer.moc kdmrect.moc
-
- #>+ 2
- KDE_DIST=Makefile.in kdmthemer.h kdmitem.h kdmlayout.h kdmpixmap.h kdmlabel.h kdmrect.h Makefile.am
-@@ -931,7 +934,7 @@
-
-
- #>+ 11
--libkdmthemer_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kdmthemer.cpp $(srcdir)/kdmitem.cpp $(srcdir)/kdmpixmap.cpp $(srcdir)/kdmrect.cpp $(srcdir)/kdmlabel.cpp $(srcdir)/kdmlayout.cpp kdmlabel.moc kdmitem.moc kdmpixmap.moc kdmthemer.moc kdmrect.moc
-+libkdmthemer_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kdmthemer.cpp $(srcdir)/kdmitem.cpp $(srcdir)/kdmpixmap.cpp $(srcdir)/kdmrect.cpp $(srcdir)/kdmlabel.cpp $(srcdir)/kdmlayout.cpp kdmlabel.moc kdmitem.moc kdmthemer.moc kdmpixmap.moc kdmrect.moc
- @echo 'creating libkdmthemer_a.all_cpp.cpp ...'; \
- rm -f libkdmthemer_a.all_cpp.files libkdmthemer_a.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libkdmthemer_a.all_cpp.final; \
-@@ -977,8 +980,8 @@
- kdmlabel.o: kdmlabel.moc
- $(srcdir)/kdmitem.cpp: ../../config.ci
- $(srcdir)/kdmlayout.cpp: ../../config.ci
--kdmrect.o: kdmrect.moc
- kdmpixmap.o: kdmpixmap.moc
-+kdmrect.o: kdmrect.moc
- kdmitem.lo: kdmitem.moc
- kdmpixmap.lo: kdmpixmap.moc
- nmcheck:
-diff -Nru kdebase-3.4.0.orig/kdm/kfrontend/themes/circles/Makefile.in kdebase-3.4.0/kdm/kfrontend/themes/circles/Makefile.in
---- kdebase-3.4.0.orig/kdm/kfrontend/themes/circles/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdm/kfrontend/themes/circles/Makefile.in 2005-05-07 12:35:24.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kdm/kfrontend/themes/circles/Makefile.in kdebase-3.4.1/kdm/kfrontend/themes/circles/Makefile.in
+--- kdebase-3.4.1.orig/kdm/kfrontend/themes/circles/Makefile.in 2005-05-23 18:38:25.000000000 +0200
++++ kdebase-3.4.1/kdm/kfrontend/themes/circles/Makefile.in 2005-05-24 16:27:56.931965770 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -28743,21 +17678,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kdm/kfrontend/themes/Makefile.in kdebase-3.4.0/kdm/kfrontend/themes/Makefile.in
---- kdebase-3.4.0.orig/kdm/kfrontend/themes/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdm/kfrontend/themes/Makefile.in 2005-05-07 12:35:24.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kdm/kfrontend/themes/Makefile.in kdebase-3.4.1/kdm/kfrontend/themes/Makefile.in
+--- kdebase-3.4.1.orig/kdm/kfrontend/themes/Makefile.in 2005-05-23 18:38:25.000000000 +0200
++++ kdebase-3.4.1/kdm/kfrontend/themes/Makefile.in 2005-05-24 16:27:56.918966944 +0200
@@ -251,6 +251,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -28789,69 +17712,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -599,7 +602,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -611,7 +620,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -619,7 +628,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -640,7 +655,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kdm/Makefile.in kdebase-3.4.0/kdm/Makefile.in
---- kdebase-3.4.0.orig/kdm/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdm/Makefile.in 2005-05-07 12:35:23.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kdm/Makefile.in kdebase-3.4.1/kdm/Makefile.in
+--- kdebase-3.4.1.orig/kdm/Makefile.in 2005-05-23 18:38:25.000000000 +0200
++++ kdebase-3.4.1/kdm/Makefile.in 2005-05-24 16:27:56.771980221 +0200
@@ -262,6 +262,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -28883,92 +17746,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -632,7 +635,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -644,7 +653,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -652,7 +661,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -673,7 +688,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kdmlib/Makefile.in kdebase-3.4.0/kdmlib/Makefile.in
---- kdebase-3.4.0.orig/kdmlib/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdmlib/Makefile.in 2005-05-07 12:35:24.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -86,18 +86,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kgreet_classic_la_SOURCES) $(kgreet_winbind_la_SOURCES) \
- $(libdmctl_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kdmlib/Makefile.in kdebase-3.4.1/kdmlib/Makefile.in
+--- kdebase-3.4.1.orig/kdmlib/Makefile.in 2005-05-23 18:38:25.000000000 +0200
++++ kdebase-3.4.1/kdmlib/Makefile.in 2005-05-24 16:27:56.962962970 +0200
@@ -293,6 +293,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -29000,44 +17780,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kfind/Makefile.in kdebase-3.4.0/kfind/Makefile.in
---- kdebase-3.4.0.orig/kfind/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kfind/Makefile.in 2005-05-07 12:35:24.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -101,18 +101,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkfind_common_la_SOURCES) $(libkfindpart_la_SOURCES) \
- $(kfind_SOURCES)
+diff -rua kdebase-3.4.1.orig/kfind/Makefile.in kdebase-3.4.1/kfind/Makefile.in
+--- kdebase-3.4.1.orig/kfind/Makefile.in 2005-05-23 18:38:25.000000000 +0200
++++ kdebase-3.4.1/kfind/Makefile.in 2005-05-24 16:27:56.998959719 +0200
@@ -325,6 +325,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -29069,139 +17814,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -859,7 +862,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -871,7 +880,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -879,7 +888,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -900,7 +915,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1160,18 +1175,18 @@
- mocs: kfindpart.moc
-
- #>+ 3
--kquery.moc: $(srcdir)/kquery.h
-- $(MOC) $(srcdir)/kquery.h -o kquery.moc
-+kdatecombo.moc: $(srcdir)/kdatecombo.h
-+ $(MOC) $(srcdir)/kdatecombo.h -o kdatecombo.moc
-
- #>+ 2
--mocs: kquery.moc
-+mocs: kdatecombo.moc
-
- #>+ 3
--kdatecombo.moc: $(srcdir)/kdatecombo.h
-- $(MOC) $(srcdir)/kdatecombo.h -o kdatecombo.moc
-+kquery.moc: $(srcdir)/kquery.h
-+ $(MOC) $(srcdir)/kquery.h -o kquery.moc
-
- #>+ 2
--mocs: kdatecombo.moc
-+mocs: kquery.moc
-
- #>+ 3
- kfinddlg.moc: $(srcdir)/kfinddlg.h
-@@ -1205,7 +1220,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f kfwin.moc kfindpart.moc kquery.moc kdatecombo.moc kfinddlg.moc kftabdlg.moc kfind.moc
-+ -rm -f kfwin.moc kfindpart.moc kdatecombo.moc kquery.moc kfinddlg.moc kftabdlg.moc kfind.moc
-
- #>+ 2
- KDE_DIST=Kfind.desktop kfindpart.kdevprj kfindpart.h Makefile.in kfinddlg.h findpart.desktop cr32-app-kfind.png cr16-app-kfind.png cr64-app-kfind.png kfwin.h cr48-app-kfind.png kfindpart.desktop kfindpart.kdevses Makefile.am
-@@ -1219,20 +1234,20 @@
-
- #>+ 16
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kfind.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfind.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-kfind.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfind.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kfind.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfind.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kfind.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfind.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- $(INSTALL_DATA) $(srcdir)/cr64-app-kfind.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kfind.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kfind.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfind.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfind.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfind.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfind.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfind.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kfind.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfind.png
-
- #>+ 15
- force-reedit:
-@@ -1273,7 +1288,7 @@
-
-
- #>+ 11
--libkfind_common_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kftabdlg.cpp $(srcdir)/kfind.cpp $(srcdir)/kquery.cpp $(srcdir)/kdatecombo.cpp kdatecombo.moc kquery.moc kfind.moc kftabdlg.moc
-+libkfind_common_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kftabdlg.cpp $(srcdir)/kfind.cpp $(srcdir)/kquery.cpp $(srcdir)/kdatecombo.cpp kquery.moc kdatecombo.moc kfind.moc kftabdlg.moc
- @echo 'creating libkfind_common_la.all_cpp.cpp ...'; \
- rm -f libkfind_common_la.all_cpp.files libkfind_common_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libkfind_common_la.all_cpp.final; \
-diff -Nru kdebase-3.4.0.orig/kfind/pics/Makefile.in kdebase-3.4.0/kfind/pics/Makefile.in
---- kdebase-3.4.0.orig/kfind/pics/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kfind/pics/Makefile.in 2005-05-07 12:35:24.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kfind/pics/Makefile.in kdebase-3.4.1/kfind/pics/Makefile.in
+--- kdebase-3.4.1.orig/kfind/pics/Makefile.in 2005-05-23 18:38:25.000000000 +0200
++++ kdebase-3.4.1/kfind/pics/Makefile.in 2005-05-24 16:27:57.009958725 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -29233,70 +17848,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -715,21 +718,21 @@
- #>+ 19
- install-kde-icons:
- $(mkinstalldirs) $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions
-- $(INSTALL_DATA) $(srcdir)/lo22-action-archive.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/archive.png
- $(INSTALL_DATA) $(srcdir)/lo22-action-delete.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/delete.png
-+ $(INSTALL_DATA) $(srcdir)/lo22-action-archive.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/archive.png
-+ $(INSTALL_DATA) $(srcdir)/lo22-action-save.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/save.png
- $(INSTALL_DATA) $(srcdir)/lo22-action-idea.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/idea.png
- $(INSTALL_DATA) $(srcdir)/lo22-action-info.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/info.png
- $(INSTALL_DATA) $(srcdir)/lo22-action-openfile.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/openfile.png
-- $(INSTALL_DATA) $(srcdir)/lo22-action-save.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/save.png
- $(INSTALL_DATA) $(srcdir)/lo22-action-search.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/search.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/archive.png
- -rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/delete.png
-+ -rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/archive.png
-+ -rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/save.png
- -rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/idea.png
- -rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/info.png
- -rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/openfile.png
-- -rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/save.png
- -rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/search.png
-
- #>+ 15
-diff -Nru kdebase-3.4.0.orig/khelpcenter/htmlsearch/Makefile.in kdebase-3.4.0/khelpcenter/htmlsearch/Makefile.in
---- kdebase-3.4.0.orig/khelpcenter/htmlsearch/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/khelpcenter/htmlsearch/Makefile.in 2005-05-07 12:35:24.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -104,18 +104,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libhtmlsearch_la_SOURCES) $(libkcm_htmlsearch_la_SOURCES) \
- $(khtmlindex_SOURCES)
+diff -rua kdebase-3.4.1.orig/khelpcenter/htmlsearch/Makefile.in kdebase-3.4.1/khelpcenter/htmlsearch/Makefile.in
+--- kdebase-3.4.1.orig/khelpcenter/htmlsearch/Makefile.in 2005-05-23 18:38:25.000000000 +0200
++++ kdebase-3.4.1/khelpcenter/htmlsearch/Makefile.in 2005-05-24 16:27:57.113949333 +0200
@@ -316,6 +316,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -29328,44 +17882,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/khelpcenter/Makefile.in kdebase-3.4.0/khelpcenter/Makefile.in
---- kdebase-3.4.0.orig/khelpcenter/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/khelpcenter/Makefile.in 2005-05-07 12:35:24.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -109,18 +109,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(khelpcenter_la_SOURCES) $(khc_indexbuilder_SOURCES) \
- $(testmetainfo_SOURCES)
+diff -rua kdebase-3.4.1.orig/khelpcenter/Makefile.in kdebase-3.4.1/khelpcenter/Makefile.in
+--- kdebase-3.4.1.orig/khelpcenter/Makefile.in 2005-05-23 18:38:25.000000000 +0200
++++ kdebase-3.4.1/khelpcenter/Makefile.in 2005-05-24 16:27:57.082952132 +0200
@@ -336,6 +336,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -29397,282 +17916,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -951,7 +954,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -963,7 +972,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -971,7 +980,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -992,7 +1007,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1276,123 +1291,123 @@
- $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kcmhelpcenter.kidl
-
- #>+ 3
--glossary.moc: $(srcdir)/glossary.h
-- $(MOC) $(srcdir)/glossary.h -o glossary.moc
-+history.moc: $(srcdir)/history.h
-+ $(MOC) $(srcdir)/history.h -o history.moc
-
- #>+ 2
--mocs: glossary.moc
-+mocs: history.moc
-
- #>+ 3
--infotree.moc: $(srcdir)/infotree.h
-- $(MOC) $(srcdir)/infotree.h -o infotree.moc
-+navigator.moc: $(srcdir)/navigator.h
-+ $(MOC) $(srcdir)/navigator.h -o navigator.moc
-
- #>+ 2
--mocs: infotree.moc
-+mocs: navigator.moc
-
- #>+ 3
--htmlsearchconfig.moc: $(srcdir)/htmlsearchconfig.h
-- $(MOC) $(srcdir)/htmlsearchconfig.h -o htmlsearchconfig.moc
-+scrollkeepertreebuilder.moc: $(srcdir)/scrollkeepertreebuilder.h
-+ $(MOC) $(srcdir)/scrollkeepertreebuilder.h -o scrollkeepertreebuilder.moc
-
- #>+ 2
--mocs: htmlsearchconfig.moc
-+mocs: scrollkeepertreebuilder.moc
-
- #>+ 3
--searchhandler.moc: $(srcdir)/searchhandler.h
-- $(MOC) $(srcdir)/searchhandler.h -o searchhandler.moc
-+fontdialog.moc: $(srcdir)/fontdialog.h
-+ $(MOC) $(srcdir)/fontdialog.h -o fontdialog.moc
-
- #>+ 2
--mocs: searchhandler.moc
-+mocs: fontdialog.moc
-
- #>+ 3
--view.moc: $(srcdir)/view.h
-- $(MOC) $(srcdir)/view.h -o view.moc
-+glossary.moc: $(srcdir)/glossary.h
-+ $(MOC) $(srcdir)/glossary.h -o glossary.moc
-
- #>+ 2
--mocs: view.moc
-+mocs: glossary.moc
-
- #>+ 3
--htmlsearch.moc: $(srcdir)/htmlsearch.h
-- $(MOC) $(srcdir)/htmlsearch.h -o htmlsearch.moc
-+treebuilder.moc: $(srcdir)/treebuilder.h
-+ $(MOC) $(srcdir)/treebuilder.h -o treebuilder.moc
-
- #>+ 2
--mocs: htmlsearch.moc
-+mocs: treebuilder.moc
-
- #>+ 3
--toc.moc: $(srcdir)/toc.h
-- $(MOC) $(srcdir)/toc.h -o toc.moc
-+infotree.moc: $(srcdir)/infotree.h
-+ $(MOC) $(srcdir)/infotree.h -o infotree.moc
-
- #>+ 2
--mocs: toc.moc
-+mocs: infotree.moc
-
- #>+ 3
--searchwidget.moc: $(srcdir)/searchwidget.h
-- $(MOC) $(srcdir)/searchwidget.h -o searchwidget.moc
-+htmlsearchconfig.moc: $(srcdir)/htmlsearchconfig.h
-+ $(MOC) $(srcdir)/htmlsearchconfig.h -o htmlsearchconfig.moc
-
- #>+ 2
--mocs: searchwidget.moc
-+mocs: htmlsearchconfig.moc
-
- #>+ 3
--searchengine.moc: $(srcdir)/searchengine.h
-- $(MOC) $(srcdir)/searchengine.h -o searchengine.moc
-+mainwindow.moc: $(srcdir)/mainwindow.h
-+ $(MOC) $(srcdir)/mainwindow.h -o mainwindow.moc
-
- #>+ 2
--mocs: searchengine.moc
-+mocs: mainwindow.moc
-
- #>+ 3
--khc_indexbuilder.moc: $(srcdir)/khc_indexbuilder.h
-- $(MOC) $(srcdir)/khc_indexbuilder.h -o khc_indexbuilder.moc
-+searchhandler.moc: $(srcdir)/searchhandler.h
-+ $(MOC) $(srcdir)/searchhandler.h -o searchhandler.moc
-
- #>+ 2
--mocs: khc_indexbuilder.moc
-+mocs: searchhandler.moc
-
- #>+ 3
--history.moc: $(srcdir)/history.h
-- $(MOC) $(srcdir)/history.h -o history.moc
-+kcmhelpcenter.moc: $(srcdir)/kcmhelpcenter.h
-+ $(MOC) $(srcdir)/kcmhelpcenter.h -o kcmhelpcenter.moc
-
- #>+ 2
--mocs: history.moc
-+mocs: kcmhelpcenter.moc
-
- #>+ 3
--navigator.moc: $(srcdir)/navigator.h
-- $(MOC) $(srcdir)/navigator.h -o navigator.moc
-+view.moc: $(srcdir)/view.h
-+ $(MOC) $(srcdir)/view.h -o view.moc
-
- #>+ 2
--mocs: navigator.moc
-+mocs: view.moc
-
- #>+ 3
--scrollkeepertreebuilder.moc: $(srcdir)/scrollkeepertreebuilder.h
-- $(MOC) $(srcdir)/scrollkeepertreebuilder.h -o scrollkeepertreebuilder.moc
-+htmlsearch.moc: $(srcdir)/htmlsearch.h
-+ $(MOC) $(srcdir)/htmlsearch.h -o htmlsearch.moc
-
- #>+ 2
--mocs: scrollkeepertreebuilder.moc
-+mocs: htmlsearch.moc
-
- #>+ 3
--fontdialog.moc: $(srcdir)/fontdialog.h
-- $(MOC) $(srcdir)/fontdialog.h -o fontdialog.moc
-+toc.moc: $(srcdir)/toc.h
-+ $(MOC) $(srcdir)/toc.h -o toc.moc
-
- #>+ 2
--mocs: fontdialog.moc
-+mocs: toc.moc
-
- #>+ 3
--treebuilder.moc: $(srcdir)/treebuilder.h
-- $(MOC) $(srcdir)/treebuilder.h -o treebuilder.moc
-+searchwidget.moc: $(srcdir)/searchwidget.h
-+ $(MOC) $(srcdir)/searchwidget.h -o searchwidget.moc
-
- #>+ 2
--mocs: treebuilder.moc
-+mocs: searchwidget.moc
-
- #>+ 3
--mainwindow.moc: $(srcdir)/mainwindow.h
-- $(MOC) $(srcdir)/mainwindow.h -o mainwindow.moc
-+khc_indexbuilder.moc: $(srcdir)/khc_indexbuilder.h
-+ $(MOC) $(srcdir)/khc_indexbuilder.h -o khc_indexbuilder.moc
-
- #>+ 2
--mocs: mainwindow.moc
-+mocs: khc_indexbuilder.moc
-
- #>+ 3
--kcmhelpcenter.moc: $(srcdir)/kcmhelpcenter.h
-- $(MOC) $(srcdir)/kcmhelpcenter.h -o kcmhelpcenter.moc
-+searchengine.moc: $(srcdir)/searchengine.h
-+ $(MOC) $(srcdir)/searchengine.h -o searchengine.moc
-
- #>+ 2
--mocs: kcmhelpcenter.moc
-+mocs: searchengine.moc
-
- #>+ 8
- khelpcenter.la.closure: $(khelpcenter_la_OBJECTS) $(khelpcenter_la_DEPENDENCIES)
-@@ -1405,7 +1420,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f glossary.moc infotree.moc htmlsearchconfig.moc searchhandler.moc view.moc htmlsearch.moc toc.moc searchwidget.moc searchengine.moc khc_indexbuilder.moc history.moc navigator.moc scrollkeepertreebuilder.moc fontdialog.moc treebuilder.moc mainwindow.moc kcmhelpcenter.moc
-+ -rm -f history.moc navigator.moc scrollkeepertreebuilder.moc fontdialog.moc glossary.moc treebuilder.moc infotree.moc htmlsearchconfig.moc mainwindow.moc searchhandler.moc kcmhelpcenter.moc view.moc htmlsearch.moc toc.moc searchwidget.moc khc_indexbuilder.moc searchengine.moc
-
- #>+ 2
- KDE_DIST=fontdialog.h glossary.xslt kcmhelpcenter.desktop khc_indexbuilder.h navigator.h DESIGN docentrytraverser.h glossary.html.in htmlsearchconfig.h htmlsearch.h plugintraverser.h view.h Makefile.in searchhandler.h scrollkeepertreebuilder.h scopeitem.h mainwindow.h glossary.h treebuilder.h khelpcenterui.rc docentry.h searchengine.h navigatorappitem.h history.h table-of-contents.xslt formatter.h application.h prefs.kcfgc README.metadata khelpcenter.kcfg docmetainfo.h Help.desktop navigatoritem.h khelpcenter.desktop toc.h infotree.h searchwidget.h intro.html.in kcmhelpcenter.h README.htdig version.h Makefile.am
-@@ -1468,7 +1483,7 @@
-
-
- #>+ 11
--libkdeinit_khelpcenter_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/navigator.cpp $(srcdir)/navigatoritem.cpp $(srcdir)/navigatorappitem.cpp $(srcdir)/view.cpp $(srcdir)/searchwidget.cpp $(srcdir)/searchengine.cpp $(srcdir)/docmetainfo.cpp $(srcdir)/docentrytraverser.cpp $(srcdir)/formatter.cpp $(srcdir)/glossary.cpp $(srcdir)/toc.cpp $(srcdir)/mainwindow.cpp $(srcdir)/docentry.cpp $(srcdir)/htmlsearch.cpp $(srcdir)/history.cpp $(srcdir)/application.cpp $(srcdir)/treebuilder.cpp $(srcdir)/infotree.cpp $(srcdir)/kcmhelpcenter.cpp $(srcdir)/htmlsearchconfig.cpp $(srcdir)/fontdialog.cpp $(srcdir)/plugintraverser.cpp $(srcdir)/scrollkeepertreebuilder.cpp $(srcdir)/searchhandler.cpp searchwidget_skel.cpp mainwindow_skel.cpp kcmhelpcenter_skel.cpp prefs.cpp glossary.moc infotree.moc htmlsearchconfig.moc searchhandler.moc view.moc htmlsearch.moc toc.moc searchwidget.moc searchengine.moc history.moc navigator.moc scrollkeepertreebuilder.moc fontdialog.moc treebuilder.moc mainwindow.moc kcmhelpcenter.moc
-+libkdeinit_khelpcenter_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/navigator.cpp $(srcdir)/navigatoritem.cpp $(srcdir)/navigatorappitem.cpp $(srcdir)/view.cpp $(srcdir)/searchwidget.cpp $(srcdir)/searchengine.cpp $(srcdir)/docmetainfo.cpp $(srcdir)/docentrytraverser.cpp $(srcdir)/formatter.cpp $(srcdir)/glossary.cpp $(srcdir)/toc.cpp $(srcdir)/mainwindow.cpp $(srcdir)/docentry.cpp $(srcdir)/htmlsearch.cpp $(srcdir)/history.cpp $(srcdir)/application.cpp $(srcdir)/treebuilder.cpp $(srcdir)/infotree.cpp $(srcdir)/kcmhelpcenter.cpp $(srcdir)/htmlsearchconfig.cpp $(srcdir)/fontdialog.cpp $(srcdir)/plugintraverser.cpp $(srcdir)/scrollkeepertreebuilder.cpp $(srcdir)/searchhandler.cpp searchwidget_skel.cpp mainwindow_skel.cpp kcmhelpcenter_skel.cpp prefs.cpp glossary.moc infotree.moc htmlsearchconfig.moc searchhandler.moc htmlsearch.moc view.moc toc.moc searchwidget.moc searchengine.moc history.moc navigator.moc scrollkeepertreebuilder.moc fontdialog.moc treebuilder.moc mainwindow.moc kcmhelpcenter.moc
- @echo 'creating libkdeinit_khelpcenter_la.all_cpp.cpp ...'; \
- rm -f libkdeinit_khelpcenter_la.all_cpp.files libkdeinit_khelpcenter_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libkdeinit_khelpcenter_la.all_cpp.final; \
-@@ -1534,8 +1549,8 @@
- searchwidget.o: searchwidget.moc
- toc.lo: toc.moc
- $(srcdir)/htmlsearch.cpp: prefs.h
--treebuilder.lo: treebuilder.moc
- toc.o: toc.moc
-+treebuilder.lo: treebuilder.moc
- $(srcdir)/history.cpp: prefs.h
- infotree.lo: infotree.moc
- htmlsearch.o: htmlsearch.moc
-@@ -1582,8 +1597,8 @@
- glossary.o: glossary.moc
- searchengine.lo: searchengine.moc
- history.lo: history.moc
--kcmhelpcenter.lo: kcmhelpcenter.moc
- htmlsearchconfig.lo: htmlsearchconfig.moc
-+kcmhelpcenter.lo: kcmhelpcenter.moc
- $(srcdir)/htmlsearchconfig.cpp: prefs.h
- infotree.o: infotree.moc
- mainwindow.o: mainwindow.moc
-diff -Nru kdebase-3.4.0.orig/khelpcenter/pics/Makefile.in kdebase-3.4.0/khelpcenter/pics/Makefile.in
---- kdebase-3.4.0.orig/khelpcenter/pics/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/khelpcenter/pics/Makefile.in 2005-05-07 12:35:24.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/khelpcenter/pics/Makefile.in kdebase-3.4.1/khelpcenter/pics/Makefile.in
+--- kdebase-3.4.1.orig/khelpcenter/pics/Makefile.in 2005-05-23 18:38:25.000000000 +0200
++++ kdebase-3.4.1/khelpcenter/pics/Makefile.in 2005-05-24 16:27:57.130947797 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -29704,63 +17950,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -715,29 +718,29 @@
-
- #>+ 25
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-- $(INSTALL_DATA) $(srcdir)/cr128-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/khelpcenter.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/khelpcenter.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/khelpcenter.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/khelpcenter.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-- $(INSTALL_DATA) $(srcdir)/cr64-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/khelpcenter.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
-- $(INSTALL_DATA) $(srcdir)/cr22-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/khelpcenter.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
- $(INSTALL_DATA) $(srcdir)/crsc-app-khelpcenter.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/khelpcenter.svgz
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/khelpcenter.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/khelpcenter.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/khelpcenter.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/khelpcenter.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/khelpcenter.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/khelpcenter.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/khelpcenter.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/khelpcenter.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/khelpcenter.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/khelpcenter.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/khelpcenter.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/khelpcenter.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/khelpcenter.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/khelpcenter.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/khelpcenter.png
-
- #>+ 15
- force-reedit:
-diff -Nru kdebase-3.4.0.orig/khelpcenter/plugins/Applications/Makefile.in kdebase-3.4.0/khelpcenter/plugins/Applications/Makefile.in
---- kdebase-3.4.0.orig/khelpcenter/plugins/Applications/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/khelpcenter/plugins/Applications/Makefile.in 2005-05-07 12:35:24.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/khelpcenter/plugins/Applications/Makefile.in kdebase-3.4.1/khelpcenter/plugins/Applications/Makefile.in
+--- kdebase-3.4.1.orig/khelpcenter/plugins/Applications/Makefile.in 2005-05-23 18:38:25.000000000 +0200
++++ kdebase-3.4.1/khelpcenter/plugins/Applications/Makefile.in 2005-05-24 16:27:57.144946533 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -29792,21 +17984,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/khelpcenter/plugins/Makefile.in kdebase-3.4.0/khelpcenter/plugins/Makefile.in
---- kdebase-3.4.0.orig/khelpcenter/plugins/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/khelpcenter/plugins/Makefile.in 2005-05-07 12:35:25.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/khelpcenter/plugins/Makefile.in kdebase-3.4.1/khelpcenter/plugins/Makefile.in
+--- kdebase-3.4.1.orig/khelpcenter/plugins/Makefile.in 2005-05-23 18:38:25.000000000 +0200
++++ kdebase-3.4.1/khelpcenter/plugins/Makefile.in 2005-05-24 16:27:57.160945088 +0200
@@ -261,6 +261,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -29838,69 +18018,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -632,7 +635,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -644,7 +653,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -652,7 +661,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -673,7 +688,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/khelpcenter/plugins/Manpages/Makefile.in kdebase-3.4.0/khelpcenter/plugins/Manpages/Makefile.in
---- kdebase-3.4.0.orig/khelpcenter/plugins/Manpages/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/khelpcenter/plugins/Manpages/Makefile.in 2005-05-07 12:35:25.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/khelpcenter/plugins/Manpages/Makefile.in kdebase-3.4.1/khelpcenter/plugins/Manpages/Makefile.in
+--- kdebase-3.4.1.orig/khelpcenter/plugins/Manpages/Makefile.in 2005-05-23 18:38:25.000000000 +0200
++++ kdebase-3.4.1/khelpcenter/plugins/Manpages/Makefile.in 2005-05-24 16:27:57.174943823 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -29932,21 +18052,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/khelpcenter/plugins/Scrollkeeper/Makefile.in kdebase-3.4.0/khelpcenter/plugins/Scrollkeeper/Makefile.in
---- kdebase-3.4.0.orig/khelpcenter/plugins/Scrollkeeper/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/khelpcenter/plugins/Scrollkeeper/Makefile.in 2005-05-07 12:35:25.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/khelpcenter/plugins/Scrollkeeper/Makefile.in kdebase-3.4.1/khelpcenter/plugins/Scrollkeeper/Makefile.in
+--- kdebase-3.4.1.orig/khelpcenter/plugins/Scrollkeeper/Makefile.in 2005-05-23 18:38:26.000000000 +0200
++++ kdebase-3.4.1/khelpcenter/plugins/Scrollkeeper/Makefile.in 2005-05-24 16:27:57.188942559 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -29978,21 +18086,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/khelpcenter/plugins/Tutorials/Makefile.in kdebase-3.4.0/khelpcenter/plugins/Tutorials/Makefile.in
---- kdebase-3.4.0.orig/khelpcenter/plugins/Tutorials/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/khelpcenter/plugins/Tutorials/Makefile.in 2005-05-07 12:35:25.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/khelpcenter/plugins/Tutorials/Makefile.in kdebase-3.4.1/khelpcenter/plugins/Tutorials/Makefile.in
+--- kdebase-3.4.1.orig/khelpcenter/plugins/Tutorials/Makefile.in 2005-05-23 18:38:26.000000000 +0200
++++ kdebase-3.4.1/khelpcenter/plugins/Tutorials/Makefile.in 2005-05-24 16:27:57.202941294 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -30024,21 +18120,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/khelpcenter/searchhandlers/Makefile.in kdebase-3.4.0/khelpcenter/searchhandlers/Makefile.in
---- kdebase-3.4.0.orig/khelpcenter/searchhandlers/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/khelpcenter/searchhandlers/Makefile.in 2005-05-07 12:35:25.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/khelpcenter/searchhandlers/Makefile.in kdebase-3.4.1/khelpcenter/searchhandlers/Makefile.in
+--- kdebase-3.4.1.orig/khelpcenter/searchhandlers/Makefile.in 2005-05-23 18:38:26.000000000 +0200
++++ kdebase-3.4.1/khelpcenter/searchhandlers/Makefile.in 2005-05-24 16:27:57.218939849 +0200
@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -30070,44 +18154,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_binSCRIPTS: $(kde_bin_SCRIPTS)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/khotkeys/app/Makefile.in kdebase-3.4.0/khotkeys/app/Makefile.in
---- kdebase-3.4.0.orig/khotkeys/app/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/khotkeys/app/Makefile.in 2005-05-07 12:35:25.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -104,18 +104,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kded_khotkeys_la_SOURCES) $(khotkeys_la_SOURCES)
- #>- DIST_SOURCES = $(kded_khotkeys_la_SOURCES) $(khotkeys_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/khotkeys/app/Makefile.in kdebase-3.4.1/khotkeys/app/Makefile.in
+--- kdebase-3.4.1.orig/khotkeys/app/Makefile.in 2005-05-23 18:38:26.000000000 +0200
++++ kdebase-3.4.1/khotkeys/app/Makefile.in 2005-05-24 16:27:57.263935785 +0200
@@ -312,6 +312,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -30139,21 +18188,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/khotkeys/data/Makefile.in kdebase-3.4.0/khotkeys/data/Makefile.in
---- kdebase-3.4.0.orig/khotkeys/data/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/khotkeys/data/Makefile.in 2005-05-07 12:35:25.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/khotkeys/data/Makefile.in kdebase-3.4.1/khotkeys/data/Makefile.in
+--- kdebase-3.4.1.orig/khotkeys/data/Makefile.in 2005-05-23 18:38:26.000000000 +0200
++++ kdebase-3.4.1/khotkeys/data/Makefile.in 2005-05-24 16:27:57.276934611 +0200
@@ -247,6 +247,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -30185,44 +18222,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/khotkeys/kcontrol/Makefile.in kdebase-3.4.0/khotkeys/kcontrol/Makefile.in
---- kdebase-3.4.0.orig/khotkeys/kcontrol/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/khotkeys/kcontrol/Makefile.in 2005-05-07 12:35:25.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -98,18 +98,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_khotkeys_la_SOURCES)
- DIST_SOURCES = $(kcm_khotkeys_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/khotkeys/kcontrol/Makefile.in kdebase-3.4.1/khotkeys/kcontrol/Makefile.in
+--- kdebase-3.4.1.orig/khotkeys/kcontrol/Makefile.in 2005-05-23 18:38:26.000000000 +0200
++++ kdebase-3.4.1/khotkeys/kcontrol/Makefile.in 2005-05-24 16:27:57.331929644 +0200
@@ -318,6 +318,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -30254,234 +18256,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -796,7 +799,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -808,7 +817,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -816,7 +825,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -837,7 +852,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1079,18 +1094,18 @@
-
-
- #>+ 3
--windowdef_simple_widget.moc: $(srcdir)/windowdef_simple_widget.h
-- $(MOC) $(srcdir)/windowdef_simple_widget.h -o windowdef_simple_widget.moc
-+gesturedrawer.moc: $(srcdir)/gesturedrawer.h
-+ $(MOC) $(srcdir)/gesturedrawer.h -o gesturedrawer.moc
-
- #>+ 2
--mocs: windowdef_simple_widget.moc
-+mocs: gesturedrawer.moc
-
- #>+ 3
--gesturedrawer.moc: $(srcdir)/gesturedrawer.h
-- $(MOC) $(srcdir)/gesturedrawer.h -o gesturedrawer.moc
-+windowdef_simple_widget.moc: $(srcdir)/windowdef_simple_widget.h
-+ $(MOC) $(srcdir)/windowdef_simple_widget.h -o windowdef_simple_widget.moc
-
- #>+ 2
--mocs: gesturedrawer.moc
-+mocs: windowdef_simple_widget.moc
-
- #>+ 3
- gestures_settings_tab.moc: $(srcdir)/gestures_settings_tab.h
-@@ -1128,13 +1143,6 @@
- mocs: tab_widget.moc
-
- #>+ 3
--condition_list_widget.moc: $(srcdir)/condition_list_widget.h
-- $(MOC) $(srcdir)/condition_list_widget.h -o condition_list_widget.moc
--
--#>+ 2
--mocs: condition_list_widget.moc
--
--#>+ 3
- dcop_widget.moc: $(srcdir)/dcop_widget.h
- $(MOC) $(srcdir)/dcop_widget.h -o dcop_widget.moc
-
-@@ -1142,11 +1150,11 @@
- mocs: dcop_widget.moc
-
- #>+ 3
--action_list_widget.moc: $(srcdir)/action_list_widget.h
-- $(MOC) $(srcdir)/action_list_widget.h -o action_list_widget.moc
-+condition_list_widget.moc: $(srcdir)/condition_list_widget.h
-+ $(MOC) $(srcdir)/condition_list_widget.h -o condition_list_widget.moc
-
- #>+ 2
--mocs: action_list_widget.moc
-+mocs: condition_list_widget.moc
-
- #>+ 3
- actions_listview_widget.moc: $(srcdir)/actions_listview_widget.h
-@@ -1156,11 +1164,18 @@
- mocs: actions_listview_widget.moc
-
- #>+ 3
--menuentry_widget.moc: $(srcdir)/menuentry_widget.h
-- $(MOC) $(srcdir)/menuentry_widget.h -o menuentry_widget.moc
-+action_list_widget.moc: $(srcdir)/action_list_widget.h
-+ $(MOC) $(srcdir)/action_list_widget.h -o action_list_widget.moc
-
- #>+ 2
--mocs: menuentry_widget.moc
-+mocs: action_list_widget.moc
-+
-+#>+ 3
-+gesturerecorder.moc: $(srcdir)/gesturerecorder.h
-+ $(MOC) $(srcdir)/gesturerecorder.h -o gesturerecorder.moc
-+
-+#>+ 2
-+mocs: gesturerecorder.moc
-
- #>+ 3
- main_buttons_widget.moc: $(srcdir)/main_buttons_widget.h
-@@ -1170,11 +1185,11 @@
- mocs: main_buttons_widget.moc
-
- #>+ 3
--gesturerecorder.moc: $(srcdir)/gesturerecorder.h
-- $(MOC) $(srcdir)/gesturerecorder.h -o gesturerecorder.moc
-+menuentry_widget.moc: $(srcdir)/menuentry_widget.h
-+ $(MOC) $(srcdir)/menuentry_widget.h -o menuentry_widget.moc
-
- #>+ 2
--mocs: gesturerecorder.moc
-+mocs: menuentry_widget.moc
-
- #>+ 3
- general_tab.moc: $(srcdir)/general_tab.h
-@@ -1198,18 +1213,18 @@
- mocs: gesturerecordpage.moc
-
- #>+ 3
--windowselector.moc: $(srcdir)/windowselector.h
-- $(MOC) $(srcdir)/windowselector.h -o windowselector.moc
-+triggers_tab.moc: $(srcdir)/triggers_tab.h
-+ $(MOC) $(srcdir)/triggers_tab.h -o triggers_tab.moc
-
- #>+ 2
--mocs: windowselector.moc
-+mocs: triggers_tab.moc
-
- #>+ 3
--triggers_tab.moc: $(srcdir)/triggers_tab.h
-- $(MOC) $(srcdir)/triggers_tab.h -o triggers_tab.moc
-+windowselector.moc: $(srcdir)/windowselector.h
-+ $(MOC) $(srcdir)/windowselector.h -o windowselector.moc
-
- #>+ 2
--mocs: triggers_tab.moc
-+mocs: windowselector.moc
-
- #>+ 3
- command_url_widget.moc: $(srcdir)/command_url_widget.h
-@@ -1248,7 +1263,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f windowdef_simple_widget.moc gesturedrawer.moc gestures_settings_tab.moc gesture_triggers_tab.moc action_group_tab.moc kcmkhotkeys.moc tab_widget.moc condition_list_widget.moc dcop_widget.moc action_list_widget.moc actions_listview_widget.moc menuentry_widget.moc main_buttons_widget.moc gesturerecorder.moc general_tab.moc window_trigger_widget.moc gesturerecordpage.moc windowselector.moc triggers_tab.moc command_url_widget.moc keyboard_input_widget.moc info_tab.moc general_settings_tab.moc windowdef_list_widget.moc
-+ -rm -f gesturedrawer.moc windowdef_simple_widget.moc gestures_settings_tab.moc gesture_triggers_tab.moc action_group_tab.moc kcmkhotkeys.moc tab_widget.moc dcop_widget.moc condition_list_widget.moc actions_listview_widget.moc action_list_widget.moc gesturerecorder.moc main_buttons_widget.moc menuentry_widget.moc general_tab.moc window_trigger_widget.moc gesturerecordpage.moc triggers_tab.moc windowselector.moc command_url_widget.moc keyboard_input_widget.moc info_tab.moc general_settings_tab.moc windowdef_list_widget.moc
-
- #>+ 2
- KDE_DIST=hi32-app-khotkeys.png Makefile.in khotkeys.desktop hi16-app-khotkeys.png Makefile.am
-@@ -1310,7 +1325,7 @@
-
-
- #>+ 11
--kcm_khotkeys_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/menuedit.cpp $(srcdir)/window_trigger_widget.cpp $(srcdir)/tab_widget.cpp $(srcdir)/main_buttons_widget.cpp $(srcdir)/actions_listview_widget.cpp $(srcdir)/menuentry_widget.cpp $(srcdir)/general_tab.cpp $(srcdir)/action_group_tab.cpp $(srcdir)/kcmkhotkeys.cpp $(srcdir)/command_url_widget.cpp $(srcdir)/windowdef_list_widget.cpp $(srcdir)/windowdef_simple_widget.cpp $(srcdir)/triggers_tab.cpp $(srcdir)/dcop_widget.cpp $(srcdir)/info_tab.cpp $(srcdir)/action_list_widget.cpp $(srcdir)/keyboard_input_widget.cpp $(srcdir)/condition_list_widget.cpp $(srcdir)/gesturedrawer.cpp $(srcdir)/gesturerecorder.cpp $(srcdir)/gesturerecordpage.cpp $(srcdir)/gesture_triggers_tab.cpp $(srcdir)/windowselector.cpp $(srcdir)/gestures_settings_tab.cpp $(srcdir)/general_settings_tab.cpp gesturedrawer.moc windowdef_simple_widget.moc gestures_settings_tab.moc action_group_tab.moc gesture_triggers_tab.moc kcmkhotkeys.moc tab_widget.moc condition_list_widget.moc dcop_widget.moc actions_listview_widget.moc action_list_widget.moc gesturerecorder.moc main_buttons_widget.moc menuentry_widget.moc general_tab.moc window_trigger_widget.moc gesturerecordpage.moc command_url_widget.moc triggers_tab.moc windowselector.moc keyboard_input_widget.moc info_tab.moc general_settings_tab.moc windowdef_list_widget.moc
-+kcm_khotkeys_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/menuedit.cpp $(srcdir)/window_trigger_widget.cpp $(srcdir)/tab_widget.cpp $(srcdir)/main_buttons_widget.cpp $(srcdir)/actions_listview_widget.cpp $(srcdir)/menuentry_widget.cpp $(srcdir)/general_tab.cpp $(srcdir)/action_group_tab.cpp $(srcdir)/kcmkhotkeys.cpp $(srcdir)/command_url_widget.cpp $(srcdir)/windowdef_list_widget.cpp $(srcdir)/windowdef_simple_widget.cpp $(srcdir)/triggers_tab.cpp $(srcdir)/dcop_widget.cpp $(srcdir)/info_tab.cpp $(srcdir)/action_list_widget.cpp $(srcdir)/keyboard_input_widget.cpp $(srcdir)/condition_list_widget.cpp $(srcdir)/gesturedrawer.cpp $(srcdir)/gesturerecorder.cpp $(srcdir)/gesturerecordpage.cpp $(srcdir)/gesture_triggers_tab.cpp $(srcdir)/windowselector.cpp $(srcdir)/gestures_settings_tab.cpp $(srcdir)/general_settings_tab.cpp windowdef_simple_widget.moc gesturedrawer.moc gestures_settings_tab.moc action_group_tab.moc gesture_triggers_tab.moc kcmkhotkeys.moc tab_widget.moc dcop_widget.moc condition_list_widget.moc action_list_widget.moc actions_listview_widget.moc menuentry_widget.moc main_buttons_widget.moc gesturerecorder.moc general_tab.moc window_trigger_widget.moc gesturerecordpage.moc command_url_widget.moc windowselector.moc triggers_tab.moc keyboard_input_widget.moc info_tab.moc general_settings_tab.moc windowdef_list_widget.moc
- @echo 'creating kcm_khotkeys_la.all_cpp.cpp ...'; \
- rm -f kcm_khotkeys_la.all_cpp.files kcm_khotkeys_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> kcm_khotkeys_la.all_cpp.final; \
-@@ -1397,6 +1412,6 @@
- windowdef_list_widget.lo: windowdef_list_widget.moc
- gesture_triggers_tab.lo: gesture_triggers_tab.moc
- dcop_widget.lo: dcop_widget.moc
--condition_list_widget.o: condition_list_widget.moc
- tab_widget.lo: tab_widget.moc
-+condition_list_widget.o: condition_list_widget.moc
- windowselector.o: windowselector.moc
-diff -Nru kdebase-3.4.0.orig/khotkeys/kcontrol/ui/Makefile.in kdebase-3.4.0/khotkeys/kcontrol/ui/Makefile.in
---- kdebase-3.4.0.orig/khotkeys/kcontrol/ui/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/khotkeys/kcontrol/ui/Makefile.in 2005-05-07 12:35:25.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -69,18 +69,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libui_la_SOURCES)
- DIST_SOURCES = $(libui_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/khotkeys/kcontrol/ui/Makefile.in kdebase-3.4.1/khotkeys/kcontrol/ui/Makefile.in
+--- kdebase-3.4.1.orig/khotkeys/kcontrol/ui/Makefile.in 2005-05-23 18:38:26.000000000 +0200
++++ kdebase-3.4.1/khotkeys/kcontrol/ui/Makefile.in 2005-05-24 16:27:57.355927476 +0200
@@ -272,6 +272,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -30513,30 +18290,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -853,7 +856,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=general_settings_tab_ui.ui general_tab_ui.ui window_trigger_widget_ui.ui triggers_tab_ui.ui windowdef_list_widget_ui.ui actions_listview_widget_ui.ui Makefile.in dcop_widget_ui.ui menuentry_widget_ui.ui action_list_widget_ui.ui windowdef_simple_widget_ui.ui info_tab_ui.ui keyboard_input_widget_ui.ui command_url_widget_ui.ui condition_list_widget_ui.ui action_group_tab_ui.ui main_buttons_widget_ui.ui gesture_triggers_tab_ui.ui gestures_settings_tab_ui.ui Makefile.am
-+KDE_DIST=general_settings_tab_ui.ui general_tab_ui.ui window_trigger_widget_ui.ui triggers_tab_ui.ui windowdef_list_widget_ui.ui actions_listview_widget_ui.ui dcop_widget_ui.ui Makefile.in menuentry_widget_ui.ui action_list_widget_ui.ui windowdef_simple_widget_ui.ui info_tab_ui.ui keyboard_input_widget_ui.ui command_url_widget_ui.ui condition_list_widget_ui.ui action_group_tab_ui.ui main_buttons_widget_ui.ui gesture_triggers_tab_ui.ui gestures_settings_tab_ui.ui Makefile.am
-
- #>+ 21
- clean-ui:
-diff -Nru kdebase-3.4.0.orig/khotkeys/Makefile.in kdebase-3.4.0/khotkeys/Makefile.in
---- kdebase-3.4.0.orig/khotkeys/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/khotkeys/Makefile.in 2005-05-07 12:35:25.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/khotkeys/Makefile.in kdebase-3.4.1/khotkeys/Makefile.in
+--- kdebase-3.4.1.orig/khotkeys/Makefile.in 2005-05-23 18:38:26.000000000 +0200
++++ kdebase-3.4.1/khotkeys/Makefile.in 2005-05-24 16:27:57.232938585 +0200
@@ -262,6 +262,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -30568,92 +18324,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -630,7 +633,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -642,7 +651,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -650,7 +659,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -671,7 +686,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/khotkeys/shared/Makefile.in kdebase-3.4.0/khotkeys/shared/Makefile.in
---- kdebase-3.4.0.orig/khotkeys/shared/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/khotkeys/shared/Makefile.in 2005-05-07 12:35:26.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -75,18 +75,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libshared_la_SOURCES)
- DIST_SOURCES = $(libshared_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/khotkeys/shared/Makefile.in kdebase-3.4.1/khotkeys/shared/Makefile.in
+--- kdebase-3.4.1.orig/khotkeys/shared/Makefile.in 2005-05-23 18:38:26.000000000 +0200
++++ kdebase-3.4.1/khotkeys/shared/Makefile.in 2005-05-24 16:27:57.391924225 +0200
@@ -279,6 +279,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -30685,83 +18358,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -907,22 +910,22 @@
- mocs: khlistview.moc
-
- #>+ 3
--triggers.moc: $(srcdir)/triggers.h
-- $(MOC) $(srcdir)/triggers.h -o triggers.moc
-+conditions.moc: $(srcdir)/conditions.h
-+ $(MOC) $(srcdir)/conditions.h -o conditions.moc
-
- #>+ 2
--mocs: triggers.moc
-+mocs: conditions.moc
-
- #>+ 3
--conditions.moc: $(srcdir)/conditions.h
-- $(MOC) $(srcdir)/conditions.h -o conditions.moc
-+triggers.moc: $(srcdir)/triggers.h
-+ $(MOC) $(srcdir)/triggers.h -o triggers.moc
-
- #>+ 2
--mocs: conditions.moc
-+mocs: triggers.moc
-
- #>+ 3
- clean-metasources:
-- -rm -f gestures.moc khlistbox.moc input.moc windows.moc khlistview.moc triggers.moc conditions.moc
-+ -rm -f gestures.moc khlistbox.moc input.moc windows.moc khlistview.moc conditions.moc triggers.moc
-
- #>+ 2
- KDE_DIST=Makefile.in Makefile.am
-@@ -973,7 +976,7 @@
-
-
- #>+ 11
--libshared_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/action_data.cpp $(srcdir)/khotkeysglobal.cpp $(srcdir)/triggers.cpp $(srcdir)/windows.cpp $(srcdir)/settings.cpp $(srcdir)/actions.cpp $(srcdir)/input.cpp $(srcdir)/conditions.cpp $(srcdir)/khlistview.cpp $(srcdir)/khlistbox.cpp $(srcdir)/gestures.cpp gestures.moc khlistbox.moc input.moc windows.moc khlistview.moc conditions.moc triggers.moc
-+libshared_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/action_data.cpp $(srcdir)/khotkeysglobal.cpp $(srcdir)/triggers.cpp $(srcdir)/windows.cpp $(srcdir)/settings.cpp $(srcdir)/actions.cpp $(srcdir)/input.cpp $(srcdir)/conditions.cpp $(srcdir)/khlistview.cpp $(srcdir)/khlistbox.cpp $(srcdir)/gestures.cpp gestures.moc khlistbox.moc input.moc windows.moc khlistview.moc triggers.moc conditions.moc
- @echo 'creating libshared_la.all_cpp.cpp ...'; \
- rm -f libshared_la.all_cpp.files libshared_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libshared_la.all_cpp.final; \
-diff -Nru kdebase-3.4.0.orig/khotkeys/update/Makefile.in kdebase-3.4.0/khotkeys/update/Makefile.in
---- kdebase-3.4.0.orig/khotkeys/update/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/khotkeys/update/Makefile.in 2005-05-07 12:35:26.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -69,18 +69,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(khotkeys_update_SOURCES)
- DIST_SOURCES = $(khotkeys_update_SOURCES)
+diff -rua kdebase-3.4.1.orig/khotkeys/update/Makefile.in kdebase-3.4.1/khotkeys/update/Makefile.in
+--- kdebase-3.4.1.orig/khotkeys/update/Makefile.in 2005-05-23 18:38:26.000000000 +0200
++++ kdebase-3.4.1/khotkeys/update/Makefile.in 2005-05-24 16:27:57.409922599 +0200
@@ -272,6 +272,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -30793,44 +18392,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kconfPROGRAMS: $(kconf_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kicker/applets/clock/Makefile.in kdebase-3.4.0/kicker/applets/clock/Makefile.in
---- kdebase-3.4.0.orig/kicker/applets/clock/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/kicker/applets/clock/Makefile.in 2005-05-07 12:35:27.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(clock_panelapplet_la_SOURCES)
- DIST_SOURCES = $(clock_panelapplet_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kicker/applets/clock/Makefile.in kdebase-3.4.1/kicker/applets/clock/Makefile.in
+--- kdebase-3.4.1.orig/kicker/applets/clock/Makefile.in 2005-05-23 18:38:26.000000000 +0200
++++ kdebase-3.4.1/kicker/applets/clock/Makefile.in 2005-05-24 16:27:57.487915554 +0200
@@ -284,6 +284,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -30862,44 +18426,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kicker/applets/launcher/Makefile.in kdebase-3.4.0/kicker/applets/launcher/Makefile.in
---- kdebase-3.4.0.orig/kicker/applets/launcher/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/kicker/applets/launcher/Makefile.in 2005-05-07 12:35:27.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -85,18 +85,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(launcher_panelapplet_la_SOURCES)
- DIST_SOURCES = $(launcher_panelapplet_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kicker/applets/launcher/Makefile.in kdebase-3.4.1/kicker/applets/launcher/Makefile.in
+--- kdebase-3.4.1.orig/kicker/applets/launcher/Makefile.in 2005-05-23 18:38:26.000000000 +0200
++++ kdebase-3.4.1/kicker/applets/launcher/Makefile.in 2005-05-24 16:27:57.506913838 +0200
@@ -291,6 +291,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -30931,44 +18460,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kicker/applets/lockout/Makefile.in kdebase-3.4.0/kicker/applets/lockout/Makefile.in
---- kdebase-3.4.0.orig/kicker/applets/lockout/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/kicker/applets/lockout/Makefile.in 2005-05-07 12:35:28.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -76,18 +76,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(lockout_panelapplet_la_SOURCES)
- DIST_SOURCES = $(lockout_panelapplet_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kicker/applets/lockout/Makefile.in kdebase-3.4.1/kicker/applets/lockout/Makefile.in
+--- kdebase-3.4.1.orig/kicker/applets/lockout/Makefile.in 2005-05-23 18:38:26.000000000 +0200
++++ kdebase-3.4.1/kicker/applets/lockout/Makefile.in 2005-05-24 16:27:57.520912574 +0200
@@ -282,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -31000,21 +18494,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kicker/applets/Makefile.in kdebase-3.4.0/kicker/applets/Makefile.in
---- kdebase-3.4.0.orig/kicker/applets/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/kicker/applets/Makefile.in 2005-05-07 12:35:26.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kicker/applets/Makefile.in kdebase-3.4.1/kicker/applets/Makefile.in
+--- kdebase-3.4.1.orig/kicker/applets/Makefile.in 2005-05-23 18:38:26.000000000 +0200
++++ kdebase-3.4.1/kicker/applets/Makefile.in 2005-05-24 16:27:57.444919438 +0200
@@ -251,6 +251,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -31046,92 +18528,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -599,7 +602,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -611,7 +620,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -619,7 +628,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -640,7 +655,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kicker/applets/media/Makefile.in kdebase-3.4.0/kicker/applets/media/Makefile.in
---- kdebase-3.4.0.orig/kicker/applets/media/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/kicker/applets/media/Makefile.in 2005-05-07 12:35:28.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -83,18 +83,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(media_panelapplet_la_SOURCES)
- DIST_SOURCES = $(media_panelapplet_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kicker/applets/media/Makefile.in kdebase-3.4.1/kicker/applets/media/Makefile.in
+--- kdebase-3.4.1.orig/kicker/applets/media/Makefile.in 2005-05-23 18:38:26.000000000 +0200
++++ kdebase-3.4.1/kicker/applets/media/Makefile.in 2005-05-24 16:27:57.535911219 +0200
@@ -289,6 +289,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -31163,87 +18562,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -918,18 +921,18 @@
-
-
- #>+ 3
--preferencesdialog.moc: $(srcdir)/preferencesdialog.h
-- $(MOC) $(srcdir)/preferencesdialog.h -o preferencesdialog.moc
-+mediaapplet.moc: $(srcdir)/mediaapplet.h
-+ $(MOC) $(srcdir)/mediaapplet.h -o mediaapplet.moc
-
- #>+ 2
--mocs: preferencesdialog.moc
-+mocs: mediaapplet.moc
-
- #>+ 3
--mediaapplet.moc: $(srcdir)/mediaapplet.h
-- $(MOC) $(srcdir)/mediaapplet.h -o mediaapplet.moc
-+preferencesdialog.moc: $(srcdir)/preferencesdialog.h
-+ $(MOC) $(srcdir)/preferencesdialog.h -o preferencesdialog.moc
-
- #>+ 2
--mocs: mediaapplet.moc
-+mocs: preferencesdialog.moc
-
- #>+ 3
- mediumbutton.moc: $(srcdir)/mediumbutton.h
-@@ -940,7 +943,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f preferencesdialog.moc mediaapplet.moc mediumbutton.moc
-+ -rm -f mediaapplet.moc preferencesdialog.moc mediumbutton.moc
-
- #>+ 2
- KDE_DIST=Makefile.in mediaapplet.desktop Makefile.am
-@@ -991,7 +994,7 @@
-
-
- #>+ 11
--media_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/preferencesdialog.cpp $(srcdir)/mediumbutton.cpp $(srcdir)/mediaapplet.cpp mediaapplet.moc preferencesdialog.moc mediumbutton.moc
-+media_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/preferencesdialog.cpp $(srcdir)/mediumbutton.cpp $(srcdir)/mediaapplet.cpp preferencesdialog.moc mediaapplet.moc mediumbutton.moc
- @echo 'creating media_panelapplet_la.all_cpp.cpp ...'; \
- rm -f media_panelapplet_la.all_cpp.files media_panelapplet_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> media_panelapplet_la.all_cpp.final; \
-diff -Nru kdebase-3.4.0.orig/kicker/applets/menu/Makefile.in kdebase-3.4.0/kicker/applets/menu/Makefile.in
---- kdebase-3.4.0.orig/kicker/applets/menu/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/kicker/applets/menu/Makefile.in 2005-05-07 12:35:28.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -79,18 +79,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(menu_panelapplet_la_SOURCES)
- DIST_SOURCES = $(menu_panelapplet_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kicker/applets/menu/Makefile.in kdebase-3.4.1/kicker/applets/menu/Makefile.in
+--- kdebase-3.4.1.orig/kicker/applets/menu/Makefile.in 2005-05-23 18:38:26.000000000 +0200
++++ kdebase-3.4.1/kicker/applets/menu/Makefile.in 2005-05-24 16:27:57.552909684 +0200
@@ -285,6 +285,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -31275,44 +18596,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kicker/applets/minipager/Makefile.in kdebase-3.4.0/kicker/applets/minipager/Makefile.in
---- kdebase-3.4.0.orig/kicker/applets/minipager/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/kicker/applets/minipager/Makefile.in 2005-05-07 12:35:29.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(minipager_panelapplet_la_SOURCES)
- DIST_SOURCES = $(minipager_panelapplet_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kicker/applets/minipager/Makefile.in kdebase-3.4.1/kicker/applets/minipager/Makefile.in
+--- kdebase-3.4.1.orig/kicker/applets/minipager/Makefile.in 2005-05-23 18:38:26.000000000 +0200
++++ kdebase-3.4.1/kicker/applets/minipager/Makefile.in 2005-05-24 16:27:57.565908509 +0200
@@ -283,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -31344,44 +18630,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kicker/applets/naughty/Makefile.in kdebase-3.4.0/kicker/applets/naughty/Makefile.in
---- kdebase-3.4.0.orig/kicker/applets/naughty/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/kicker/applets/naughty/Makefile.in 2005-05-07 12:35:29.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -83,18 +83,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(naughty_panelapplet_la_SOURCES)
- DIST_SOURCES = $(naughty_panelapplet_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kicker/applets/naughty/Makefile.in kdebase-3.4.1/kicker/applets/naughty/Makefile.in
+--- kdebase-3.4.1.orig/kicker/applets/naughty/Makefile.in 2005-05-23 18:38:26.000000000 +0200
++++ kdebase-3.4.1/kicker/applets/naughty/Makefile.in 2005-05-24 16:27:57.581907064 +0200
@@ -290,6 +290,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -31413,44 +18664,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kicker/applets/run/Makefile.in kdebase-3.4.0/kicker/applets/run/Makefile.in
---- kdebase-3.4.0.orig/kicker/applets/run/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/kicker/applets/run/Makefile.in 2005-05-07 12:35:29.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(run_panelapplet_la_SOURCES)
- DIST_SOURCES = $(run_panelapplet_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kicker/applets/run/Makefile.in kdebase-3.4.1/kicker/applets/run/Makefile.in
+--- kdebase-3.4.1.orig/kicker/applets/run/Makefile.in 2005-05-23 18:38:26.000000000 +0200
++++ kdebase-3.4.1/kicker/applets/run/Makefile.in 2005-05-24 16:27:57.594905890 +0200
@@ -283,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -31482,44 +18698,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kicker/applets/swallow/Makefile.in kdebase-3.4.0/kicker/applets/swallow/Makefile.in
---- kdebase-3.4.0.orig/kicker/applets/swallow/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/kicker/applets/swallow/Makefile.in 2005-05-07 12:35:29.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -81,18 +81,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(swallow_panelapplet_la_SOURCES)
- DIST_SOURCES = $(swallow_panelapplet_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kicker/applets/swallow/Makefile.in kdebase-3.4.1/kicker/applets/swallow/Makefile.in
+--- kdebase-3.4.1.orig/kicker/applets/swallow/Makefile.in 2005-05-23 18:38:26.000000000 +0200
++++ kdebase-3.4.1/kicker/applets/swallow/Makefile.in 2005-05-24 16:27:57.609904536 +0200
@@ -287,6 +287,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -31551,93 +18732,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -916,22 +919,22 @@
-
-
- #>+ 3
--swallow.moc: $(srcdir)/swallow.h
-- $(MOC) $(srcdir)/swallow.h -o swallow.moc
-+prefwidget.moc: $(srcdir)/prefwidget.h
-+ $(MOC) $(srcdir)/prefwidget.h -o prefwidget.moc
-
- #>+ 2
--mocs: swallow.moc
-+mocs: prefwidget.moc
-
- #>+ 3
--prefwidget.moc: $(srcdir)/prefwidget.h
-- $(MOC) $(srcdir)/prefwidget.h -o prefwidget.moc
-+swallow.moc: $(srcdir)/swallow.h
-+ $(MOC) $(srcdir)/swallow.h -o swallow.moc
-
- #>+ 2
--mocs: prefwidget.moc
-+mocs: swallow.moc
-
- #>+ 3
- clean-metasources:
-- -rm -f swallow.moc prefwidget.moc
-+ -rm -f prefwidget.moc swallow.moc
-
- #>+ 2
- KDE_DIST=swallowapplet.desktop Makefile.in prefwidgetbase.ui Makefile.am
-@@ -987,7 +990,7 @@
-
-
- #>+ 11
--swallow_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/swallow.cpp $(srcdir)/prefwidget.cpp prefwidgetbase.cpp prefwidgetbase.moc prefwidget.moc swallow.moc
-+swallow_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/swallow.cpp $(srcdir)/prefwidget.cpp prefwidgetbase.cpp prefwidgetbase.moc swallow.moc prefwidget.moc
- @echo 'creating swallow_panelapplet_la.all_cpp.cpp ...'; \
- rm -f swallow_panelapplet_la.all_cpp.files swallow_panelapplet_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> swallow_panelapplet_la.all_cpp.final; \
-@@ -1031,8 +1034,8 @@
- swallow.o: swallow.moc
- $(srcdir)/prefwidget.cpp: prefwidgetbase.h
- nmcheck-am: nmcheck
--prefwidget.lo: prefwidget.moc
- swallow.lo: swallow.moc
-+prefwidget.lo: prefwidget.moc
- $(srcdir)/swallow.cpp: prefwidgetbase.h
- prefwidget.o: prefwidget.moc
-
-diff -Nru kdebase-3.4.0.orig/kicker/applets/systemtray/Makefile.in kdebase-3.4.0/kicker/applets/systemtray/Makefile.in
---- kdebase-3.4.0.orig/kicker/applets/systemtray/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/kicker/applets/systemtray/Makefile.in 2005-05-07 12:35:29.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -83,18 +83,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(systemtray_panelapplet_la_SOURCES)
- DIST_SOURCES = $(systemtray_panelapplet_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kicker/applets/systemtray/Makefile.in kdebase-3.4.1/kicker/applets/systemtray/Makefile.in
+--- kdebase-3.4.1.orig/kicker/applets/systemtray/Makefile.in 2005-05-23 18:38:26.000000000 +0200
++++ kdebase-3.4.1/kicker/applets/systemtray/Makefile.in 2005-05-24 16:27:57.623903271 +0200
@@ -289,6 +289,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -31669,44 +18766,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kicker/applets/taskbar/Makefile.in kdebase-3.4.0/kicker/applets/taskbar/Makefile.in
---- kdebase-3.4.0.orig/kicker/applets/taskbar/Makefile.in 2005-03-04 08:14:58.000000000 -0500
-+++ kdebase-3.4.0/kicker/applets/taskbar/Makefile.in 2005-05-07 12:35:29.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(taskbar_panelapplet_la_SOURCES)
- DIST_SOURCES = $(taskbar_panelapplet_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kicker/applets/taskbar/Makefile.in kdebase-3.4.1/kicker/applets/taskbar/Makefile.in
+--- kdebase-3.4.1.orig/kicker/applets/taskbar/Makefile.in 2005-05-23 18:38:26.000000000 +0200
++++ kdebase-3.4.1/kicker/applets/taskbar/Makefile.in 2005-05-24 16:27:57.636902097 +0200
@@ -283,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -31738,44 +18800,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kicker/applets/trash/Makefile.in kdebase-3.4.0/kicker/applets/trash/Makefile.in
---- kdebase-3.4.0.orig/kicker/applets/trash/Makefile.in 2005-03-04 08:14:58.000000000 -0500
-+++ kdebase-3.4.0/kicker/applets/trash/Makefile.in 2005-05-07 12:35:29.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -81,18 +81,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(trash_panelapplet_la_SOURCES)
- DIST_SOURCES = $(trash_panelapplet_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kicker/applets/trash/Makefile.in kdebase-3.4.1/kicker/applets/trash/Makefile.in
+--- kdebase-3.4.1.orig/kicker/applets/trash/Makefile.in 2005-05-23 18:38:26.000000000 +0200
++++ kdebase-3.4.1/kicker/applets/trash/Makefile.in 2005-05-24 16:27:57.650900833 +0200
@@ -287,6 +287,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -31807,44 +18834,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kicker/buttons/Makefile.in kdebase-3.4.0/kicker/buttons/Makefile.in
---- kdebase-3.4.0.orig/kicker/buttons/Makefile.in 2005-03-04 08:14:58.000000000 -0500
-+++ kdebase-3.4.0/kicker/buttons/Makefile.in 2005-05-07 12:35:29.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -76,18 +76,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkicker_buttons_la_SOURCES)
- DIST_SOURCES = $(libkicker_buttons_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kicker/buttons/Makefile.in kdebase-3.4.1/kicker/buttons/Makefile.in
+--- kdebase-3.4.1.orig/kicker/buttons/Makefile.in 2005-05-23 18:38:26.000000000 +0200
++++ kdebase-3.4.1/kicker/buttons/Makefile.in 2005-05-24 16:27:57.666899388 +0200
@@ -279,6 +279,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -31876,125 +18868,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -884,18 +887,18 @@
- mocs: urlbutton.moc
-
- #>+ 3
--windowlistbutton.moc: $(srcdir)/windowlistbutton.h
-- $(MOC) $(srcdir)/windowlistbutton.h -o windowlistbutton.moc
-+extensionbutton.moc: $(srcdir)/extensionbutton.h
-+ $(MOC) $(srcdir)/extensionbutton.h -o extensionbutton.moc
-
- #>+ 2
--mocs: windowlistbutton.moc
-+mocs: extensionbutton.moc
-
- #>+ 3
--extensionbutton.moc: $(srcdir)/extensionbutton.h
-- $(MOC) $(srcdir)/extensionbutton.h -o extensionbutton.moc
-+windowlistbutton.moc: $(srcdir)/windowlistbutton.h
-+ $(MOC) $(srcdir)/windowlistbutton.h -o windowlistbutton.moc
-
- #>+ 2
--mocs: extensionbutton.moc
-+mocs: windowlistbutton.moc
-
- #>+ 3
- servicebutton.moc: $(srcdir)/servicebutton.h
-@@ -905,6 +908,13 @@
- mocs: servicebutton.moc
-
- #>+ 3
-+desktopbutton.moc: $(srcdir)/desktopbutton.h
-+ $(MOC) $(srcdir)/desktopbutton.h -o desktopbutton.moc
-+
-+#>+ 2
-+mocs: desktopbutton.moc
-+
-+#>+ 3
- servicemenubutton.moc: $(srcdir)/servicemenubutton.h
- $(MOC) $(srcdir)/servicemenubutton.h -o servicemenubutton.moc
-
-@@ -919,13 +929,6 @@
- mocs: kbutton.moc
-
- #>+ 3
--desktopbutton.moc: $(srcdir)/desktopbutton.h
-- $(MOC) $(srcdir)/desktopbutton.h -o desktopbutton.moc
--
--#>+ 2
--mocs: desktopbutton.moc
--
--#>+ 3
- nonkdeappbutton.moc: $(srcdir)/nonkdeappbutton.h
- $(MOC) $(srcdir)/nonkdeappbutton.h -o nonkdeappbutton.moc
-
-@@ -941,7 +944,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f browserbutton.moc urlbutton.moc windowlistbutton.moc extensionbutton.moc servicebutton.moc servicemenubutton.moc kbutton.moc desktopbutton.moc nonkdeappbutton.moc bookmarksbutton.moc
-+ -rm -f browserbutton.moc urlbutton.moc extensionbutton.moc windowlistbutton.moc servicebutton.moc desktopbutton.moc servicemenubutton.moc kbutton.moc nonkdeappbutton.moc bookmarksbutton.moc
-
- #>+ 2
- KDE_DIST=servicemenubutton.h servicebutton.h windowlistbutton.h Makefile.in desktopbutton.h urlbutton.h nonkdeappbutton.h bookmarksbutton.h extensionbutton.h browserbutton.h kbutton.h Makefile.am
-@@ -988,7 +991,7 @@
-
-
- #>+ 11
--libkicker_buttons_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/servicebutton.cpp ../share/kickerSettings.h $(srcdir)/bookmarksbutton.cpp $(srcdir)/browserbutton.cpp ../share/kickerSettings.h $(srcdir)/desktopbutton.cpp ../share/kickerSettings.h $(srcdir)/extensionbutton.cpp $(srcdir)/kbutton.cpp $(srcdir)/nonkdeappbutton.cpp $(srcdir)/servicemenubutton.cpp $(srcdir)/urlbutton.cpp ../share/kickerSettings.h $(srcdir)/windowlistbutton.cpp browserbutton.moc urlbutton.moc extensionbutton.moc windowlistbutton.moc servicebutton.moc desktopbutton.moc kbutton.moc servicemenubutton.moc nonkdeappbutton.moc bookmarksbutton.moc
-+libkicker_buttons_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/servicebutton.cpp ../share/kickerSettings.h $(srcdir)/bookmarksbutton.cpp $(srcdir)/browserbutton.cpp ../share/kickerSettings.h $(srcdir)/desktopbutton.cpp ../share/kickerSettings.h $(srcdir)/extensionbutton.cpp $(srcdir)/kbutton.cpp $(srcdir)/nonkdeappbutton.cpp $(srcdir)/servicemenubutton.cpp $(srcdir)/urlbutton.cpp ../share/kickerSettings.h $(srcdir)/windowlistbutton.cpp browserbutton.moc urlbutton.moc windowlistbutton.moc extensionbutton.moc servicebutton.moc kbutton.moc servicemenubutton.moc desktopbutton.moc nonkdeappbutton.moc bookmarksbutton.moc
- @echo 'creating libkicker_buttons_la.all_cpp.cpp ...'; \
- rm -f libkicker_buttons_la.all_cpp.files libkicker_buttons_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libkicker_buttons_la.all_cpp.final; \
-@@ -1031,8 +1034,8 @@
- extensionbutton.o: extensionbutton.moc
- urlbutton.o: urlbutton.moc
- nonkdeappbutton.lo: nonkdeappbutton.moc
--desktopbutton.o: desktopbutton.moc
- servicemenubutton.lo: servicemenubutton.moc
-+desktopbutton.o: desktopbutton.moc
- extensionbutton.lo: extensionbutton.moc
- bookmarksbutton.lo: bookmarksbutton.moc
- kbutton.o: kbutton.moc
-diff -Nru kdebase-3.4.0.orig/kicker/core/Makefile.in kdebase-3.4.0/kicker/core/Makefile.in
---- kdebase-3.4.0.orig/kicker/core/Makefile.in 2005-03-04 08:14:58.000000000 -0500
-+++ kdebase-3.4.0/kicker/core/Makefile.in 2005-05-07 12:35:30.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -80,18 +80,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkicker_core_la_SOURCES)
- DIST_SOURCES = $(libkicker_core_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kicker/core/Makefile.in kdebase-3.4.1/kicker/core/Makefile.in
+--- kdebase-3.4.1.orig/kicker/core/Makefile.in 2005-05-23 18:38:26.000000000 +0200
++++ kdebase-3.4.1/kicker/core/Makefile.in 2005-05-24 16:27:57.770889995 +0200
@@ -294,6 +294,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -32026,89 +18902,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -967,18 +970,18 @@
- $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub panelextension.kidl
-
- #>+ 3
--container_extension.moc: $(srcdir)/container_extension.h
-- $(MOC) $(srcdir)/container_extension.h -o container_extension.moc
-+container_base.moc: $(srcdir)/container_base.h
-+ $(MOC) $(srcdir)/container_base.h -o container_base.moc
-
- #>+ 2
--mocs: container_extension.moc
-+mocs: container_base.moc
-
- #>+ 3
--container_base.moc: $(srcdir)/container_base.h
-- $(MOC) $(srcdir)/container_base.h -o container_base.moc
-+container_extension.moc: $(srcdir)/container_extension.h
-+ $(MOC) $(srcdir)/container_extension.h -o container_extension.moc
-
- #>+ 2
--mocs: container_base.moc
-+mocs: container_extension.moc
-
- #>+ 3
- container_applet.moc: $(srcdir)/container_applet.h
-@@ -995,18 +998,18 @@
- mocs: applethandle.moc
-
- #>+ 3
--menumanager.moc: $(srcdir)/menumanager.h
-- $(MOC) $(srcdir)/menumanager.h -o menumanager.moc
-+containerarea.moc: $(srcdir)/containerarea.h
-+ $(MOC) $(srcdir)/containerarea.h -o containerarea.moc
-
- #>+ 2
--mocs: menumanager.moc
-+mocs: containerarea.moc
-
- #>+ 3
--containerarea.moc: $(srcdir)/containerarea.h
-- $(MOC) $(srcdir)/containerarea.h -o containerarea.moc
-+menumanager.moc: $(srcdir)/menumanager.h
-+ $(MOC) $(srcdir)/menumanager.h -o menumanager.moc
-
- #>+ 2
--mocs: containerarea.moc
-+mocs: menumanager.moc
-
- #>+ 3
- pluginmanager.moc: $(srcdir)/pluginmanager.h
-@@ -1066,7 +1069,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f container_extension.moc container_base.moc container_applet.moc applethandle.moc menumanager.moc containerarea.moc pluginmanager.moc unhidetrigger.moc container_button.moc showdesktop.moc extensionmanager.moc panelextension.moc kicker.moc userrectsel.moc
-+ -rm -f container_base.moc container_extension.moc container_applet.moc applethandle.moc containerarea.moc menumanager.moc pluginmanager.moc unhidetrigger.moc container_button.moc showdesktop.moc extensionmanager.moc panelextension.moc kicker.moc userrectsel.moc
-
- #>+ 2
- KDE_DIST=extensionmanager.h kicker.h container_extension.h showdesktop.h paneldrag.h menumanager.h container_button.h Makefile.in panelextension.h default-apps extensionSettings.kcfgc childpanelextension.desktop unhidetrigger.h applethandle.h container_base.h extensionSettings.kcfg kickerbindings.cpp pluginmanager.h containerarea.h containerarealayout.h container_applet.h userrectsel.h Makefile.am
-@@ -1124,7 +1127,7 @@
-
-
- #>+ 11
--libkicker_core_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kicker.cpp ../share/kickerSettings.h $(srcdir)/userrectsel.cpp $(srcdir)/containerarea.cpp ../share/kickerSettings.h $(srcdir)/applethandle.cpp $(srcdir)/container_base.cpp $(srcdir)/container_button.cpp $(srcdir)/container_applet.cpp ../share/kickerSettings.h $(srcdir)/container_extension.cpp ../share/kickerSettings.h $(srcdir)/extensionmanager.cpp $(srcdir)/menumanager.cpp $(srcdir)/pluginmanager.cpp $(srcdir)/showdesktop.cpp ../share/kickerSettings.h $(srcdir)/unhidetrigger.cpp $(srcdir)/containerarealayout.cpp $(srcdir)/paneldrag.cpp $(srcdir)/panelextension.cpp kicker_skel.cpp panelextension_skel.cpp extensionSettings.cpp container_base.moc container_extension.moc applethandle.moc container_applet.moc containerarea.moc menumanager.moc pluginmanager.moc container_button.moc unhidetrigger.moc showdesktop.moc extensionmanager.moc kicker.moc panelextension.moc userrectsel.moc
-+libkicker_core_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kicker.cpp ../share/kickerSettings.h $(srcdir)/userrectsel.cpp $(srcdir)/containerarea.cpp ../share/kickerSettings.h $(srcdir)/applethandle.cpp $(srcdir)/container_base.cpp $(srcdir)/container_button.cpp $(srcdir)/container_applet.cpp ../share/kickerSettings.h $(srcdir)/container_extension.cpp ../share/kickerSettings.h $(srcdir)/extensionmanager.cpp $(srcdir)/menumanager.cpp $(srcdir)/pluginmanager.cpp $(srcdir)/showdesktop.cpp ../share/kickerSettings.h $(srcdir)/unhidetrigger.cpp $(srcdir)/containerarealayout.cpp $(srcdir)/paneldrag.cpp $(srcdir)/panelextension.cpp kicker_skel.cpp panelextension_skel.cpp extensionSettings.cpp container_extension.moc container_base.moc applethandle.moc container_applet.moc menumanager.moc containerarea.moc pluginmanager.moc container_button.moc unhidetrigger.moc showdesktop.moc extensionmanager.moc kicker.moc panelextension.moc userrectsel.moc
- @echo 'creating libkicker_core_la.all_cpp.cpp ...'; \
- rm -f libkicker_core_la.all_cpp.files libkicker_core_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libkicker_core_la.all_cpp.final; \
-diff -Nru kdebase-3.4.0.orig/kicker/data/app_start_anim/Makefile.in kdebase-3.4.0/kicker/data/app_start_anim/Makefile.in
---- kdebase-3.4.0.orig/kicker/data/app_start_anim/Makefile.in 2005-03-04 08:14:58.000000000 -0500
-+++ kdebase-3.4.0/kicker/data/app_start_anim/Makefile.in 2005-05-07 12:35:30.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kicker/data/app_start_anim/Makefile.in kdebase-3.4.1/kicker/data/app_start_anim/Makefile.in
+--- kdebase-3.4.1.orig/kicker/data/app_start_anim/Makefile.in 2005-05-23 18:38:26.000000000 +0200
++++ kdebase-3.4.1/kicker/data/app_start_anim/Makefile.in 2005-05-24 16:27:57.798887466 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -32140,21 +18936,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kicker/data/icons/actions/Makefile.in kdebase-3.4.0/kicker/data/icons/actions/Makefile.in
---- kdebase-3.4.0.orig/kicker/data/icons/actions/Makefile.in 2005-03-04 08:14:58.000000000 -0500
-+++ kdebase-3.4.0/kicker/data/icons/actions/Makefile.in 2005-05-07 12:35:30.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kicker/data/icons/actions/Makefile.in kdebase-3.4.1/kicker/data/icons/actions/Makefile.in
+--- kdebase-3.4.1.orig/kicker/data/icons/actions/Makefile.in 2005-05-23 18:38:26.000000000 +0200
++++ kdebase-3.4.1/kicker/data/icons/actions/Makefile.in 2005-05-24 16:27:57.833884305 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -32186,21 +18970,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kicker/data/icons/Makefile.in kdebase-3.4.0/kicker/data/icons/Makefile.in
---- kdebase-3.4.0.orig/kicker/data/icons/Makefile.in 2005-03-04 08:14:58.000000000 -0500
-+++ kdebase-3.4.0/kicker/data/icons/Makefile.in 2005-05-07 12:35:30.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kicker/data/icons/Makefile.in kdebase-3.4.1/kicker/data/icons/Makefile.in
+--- kdebase-3.4.1.orig/kicker/data/icons/Makefile.in 2005-05-23 18:38:26.000000000 +0200
++++ kdebase-3.4.1/kicker/data/icons/Makefile.in 2005-05-24 16:27:57.819885569 +0200
@@ -251,6 +251,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -32232,141 +19004,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -600,7 +603,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -612,7 +621,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -620,7 +629,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -641,7 +656,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -866,45 +881,45 @@
-
- #>+ 41
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-- $(INSTALL_DATA) $(srcdir)/cr128-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kmenu.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kdisknav.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdisknav.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kicker.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmenu.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-panel.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-window_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/window_list.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kdisknav.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdisknav.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmenu.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-- $(INSTALL_DATA) $(srcdir)/crsc-app-kmenu.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kmenu.svgz
-- $(INSTALL_DATA) $(srcdir)/cr32-app-window_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/window_list.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kmenu.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kdisknav.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdisknav.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kmenu.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-window_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/window_list.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kicker.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- $(INSTALL_DATA) $(srcdir)/cr64-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kmenu.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
-- $(INSTALL_DATA) $(srcdir)/cr22-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kmenu.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kdisknav.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdisknav.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-kmenu.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kmenu.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kmenu.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kmenu.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kdisknav.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdisknav.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kdisknav.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdisknav.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-window_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/window_list.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmenu.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-panel.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kmenu.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdisknav.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kicker.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmenu.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/window_list.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdisknav.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmenu.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kmenu.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/window_list.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdisknav.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kmenu.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kmenu.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/window_list.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kicker.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kmenu.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kmenu.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdisknav.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kmenu.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kmenu.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kmenu.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdisknav.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdisknav.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/window_list.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmenu.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel.png
-
- #>+ 15
- force-reedit:
-diff -Nru kdebase-3.4.0.orig/kicker/data/kmenu_side/Makefile.in kdebase-3.4.0/kicker/data/kmenu_side/Makefile.in
---- kdebase-3.4.0.orig/kicker/data/kmenu_side/Makefile.in 2005-03-04 08:14:58.000000000 -0500
-+++ kdebase-3.4.0/kicker/data/kmenu_side/Makefile.in 2005-05-07 12:35:30.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kicker/data/kmenu_side/Makefile.in kdebase-3.4.1/kicker/data/kmenu_side/Makefile.in
+--- kdebase-3.4.1.orig/kicker/data/kmenu_side/Makefile.in 2005-05-23 18:38:26.000000000 +0200
++++ kdebase-3.4.1/kicker/data/kmenu_side/Makefile.in 2005-05-24 16:27:57.846883131 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -32398,21 +19038,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kicker/data/Makefile.in kdebase-3.4.0/kicker/data/Makefile.in
---- kdebase-3.4.0.orig/kicker/data/Makefile.in 2005-03-04 08:14:58.000000000 -0500
-+++ kdebase-3.4.0/kicker/data/Makefile.in 2005-05-07 12:35:30.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kicker/data/Makefile.in kdebase-3.4.1/kicker/data/Makefile.in
+--- kdebase-3.4.1.orig/kicker/data/Makefile.in 2005-05-23 18:38:26.000000000 +0200
++++ kdebase-3.4.1/kicker/data/Makefile.in 2005-05-24 16:27:57.785888640 +0200
@@ -251,6 +251,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -32444,69 +19072,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -599,7 +602,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -611,7 +620,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -619,7 +628,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -640,7 +655,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kicker/data/tiles/Makefile.in kdebase-3.4.0/kicker/data/tiles/Makefile.in
---- kdebase-3.4.0.orig/kicker/data/tiles/Makefile.in 2005-03-04 08:14:58.000000000 -0500
-+++ kdebase-3.4.0/kicker/data/tiles/Makefile.in 2005-05-07 12:35:30.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kicker/data/tiles/Makefile.in kdebase-3.4.1/kicker/data/tiles/Makefile.in
+--- kdebase-3.4.1.orig/kicker/data/tiles/Makefile.in 2005-05-23 18:38:26.000000000 +0200
++++ kdebase-3.4.1/kicker/data/tiles/Makefile.in 2005-05-24 16:27:57.863881595 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -32538,30 +19106,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -786,7 +789,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=light_pastel_tiny_up.png nuts_and_bolts_large_down.png KDE_button_normal_up.png light_gray_large_up.png green_wood_large_up.png solid_tigereye_normal_down.png KDE_button_tiny_up.png blue_wood_normal_down.png solid_red_large_down.png light_gray_large_down.png solid_purple_tiny_down.png nuts_and_bolts_tiny_up.png green_wood_normal_up.png solid_green_tiny_up.png red_wood_tiny_down.png solid_gray_tiny_down.png solid_pastel_large_up.png solid_orange_tiny_down.png solid_pastel_normal_up.png light_purple_normal_up.png solid_blue_large_up.png solid_pastel_tiny_up.png Makefile.in light_green_tiny_down.png KDE_button_large_down.png solid_blue_normal_down.png solid_red_tiny_up.png solid_orange_large_up.png red_wood_tiny_up.png solid_orange_large_down.png green_wood_tiny_down.png KDE_button_normal_down.png light_pastel_tiny_down.png solid_red_tiny_down.png light_gray_normal_up.png solid_orange_normal_down.png solid_red_large_up.png solid_green_large_down.png solid_tigereye_large_up.png solid_tigereye_tiny_down.png light_green_tiny_up.png solid_green_large_up.png green_wood_normal_down.png light_green_large_up.png solid_gray_normal_up.png solid_blue_tiny_up.png blue_wood_tiny_up.png solid_gray_tiny_up.png solid_pastel_normal_down.png nuts_and_bolts_tiny_down.png light_purple_normal_down.png red_wood_large_down.png solid_blue_normal_up.png solid_tigereye_large_down.png solid_green_normal_down.png KDE_button_tiny_down.png solid_orange_tiny_up.png solid_purple_large_down.png solid_pastel_tiny_down.png solid_purple_large_up.png light_purple_large_down.png blue_wood_tiny_down.png solid_tigereye_tiny_up.png solid_gray_large_up.png solid_purple_tiny_up.png solid_red_normal_down.png solid_green_normal_up.png blue_wood_large_up.png green_wood_tiny_up.png light_pastel_large_up.png light_gray_tiny_up.png solid_purple_normal_up.png solid_gray_large_down.png light_pastel_large_down.png blue_wood_large_down.png nuts_and_bolts_large_up.png light_purple_tiny_down.png light_green_normal_down.png red_wood_normal_down.png nuts_and_bolts_normal_up.png solid_blue_large_down.png red_wood_large_up.png solid_green_tiny_down.png solid_blue_tiny_down.png red_wood_normal_up.png light_green_large_down.png light_green_normal_up.png solid_orange_normal_up.png solid_red_normal_up.png solid_tigereye_normal_up.png light_purple_tiny_up.png solid_gray_normal_down.png light_pastel_normal_up.png KDE_button_large_up.png light_purple_large_up.png nuts_and_bolts_normal_down.png solid_purple_normal_down.png green_wood_large_down.png light_gray_tiny_down.png solid_pastel_large_down.png Makefile.am blue_wood_normal_up.png
-+KDE_DIST=light_pastel_tiny_up.png nuts_and_bolts_large_down.png KDE_button_normal_up.png light_gray_large_up.png green_wood_large_up.png KDE_button_tiny_up.png solid_tigereye_normal_down.png blue_wood_normal_down.png solid_red_large_down.png light_gray_large_down.png solid_purple_tiny_down.png nuts_and_bolts_tiny_up.png green_wood_normal_up.png solid_green_tiny_up.png red_wood_tiny_down.png solid_gray_tiny_down.png solid_pastel_large_up.png solid_orange_tiny_down.png solid_pastel_normal_up.png light_purple_normal_up.png solid_blue_large_up.png solid_pastel_tiny_up.png Makefile.in light_green_tiny_down.png KDE_button_large_down.png solid_blue_normal_down.png solid_red_tiny_up.png solid_orange_large_up.png red_wood_tiny_up.png solid_orange_large_down.png KDE_button_normal_down.png green_wood_tiny_down.png light_pastel_tiny_down.png solid_red_tiny_down.png light_gray_normal_up.png solid_orange_normal_down.png solid_red_large_up.png solid_green_large_down.png solid_tigereye_large_up.png solid_tigereye_tiny_down.png light_green_tiny_up.png solid_green_large_up.png green_wood_normal_down.png light_green_large_up.png solid_gray_normal_up.png solid_blue_tiny_up.png blue_wood_tiny_up.png solid_gray_tiny_up.png solid_pastel_normal_down.png nuts_and_bolts_tiny_down.png light_purple_normal_down.png red_wood_large_down.png solid_blue_normal_up.png solid_tigereye_large_down.png solid_green_normal_down.png KDE_button_tiny_down.png solid_orange_tiny_up.png solid_purple_large_down.png solid_pastel_tiny_down.png solid_purple_large_up.png light_purple_large_down.png blue_wood_tiny_down.png solid_gray_large_up.png solid_tigereye_tiny_up.png solid_purple_tiny_up.png solid_red_normal_down.png solid_green_normal_up.png blue_wood_large_up.png green_wood_tiny_up.png light_pastel_large_up.png light_gray_tiny_up.png solid_purple_normal_up.png solid_gray_large_down.png light_pastel_large_down.png blue_wood_large_down.png nuts_and_bolts_large_up.png light_purple_tiny_down.png light_green_normal_down.png red_wood_normal_down.png nuts_and_bolts_normal_up.png solid_blue_large_down.png red_wood_large_up.png solid_green_tiny_down.png solid_blue_tiny_down.png red_wood_normal_up.png light_green_large_down.png light_green_normal_up.png solid_orange_normal_up.png solid_red_normal_up.png solid_tigereye_normal_up.png light_purple_tiny_up.png solid_gray_normal_down.png light_pastel_normal_up.png KDE_button_large_up.png light_purple_large_up.png nuts_and_bolts_normal_down.png solid_purple_normal_down.png green_wood_large_down.png light_gray_tiny_down.png solid_pastel_large_down.png Makefile.am blue_wood_normal_up.png
-
- #>+ 2
- docs-am:
-diff -Nru kdebase-3.4.0.orig/kicker/data/wallpaper/Makefile.in kdebase-3.4.0/kicker/data/wallpaper/Makefile.in
---- kdebase-3.4.0.orig/kicker/data/wallpaper/Makefile.in 2005-03-04 08:14:58.000000000 -0500
-+++ kdebase-3.4.0/kicker/data/wallpaper/Makefile.in 2005-05-07 12:35:30.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kicker/data/wallpaper/Makefile.in kdebase-3.4.1/kicker/data/wallpaper/Makefile.in
+--- kdebase-3.4.1.orig/kicker/data/wallpaper/Makefile.in 2005-05-23 18:38:26.000000000 +0200
++++ kdebase-3.4.1/kicker/data/wallpaper/Makefile.in 2005-05-24 16:27:57.875880511 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -32593,44 +19140,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kicker/extensions/dockbar/Makefile.in kdebase-3.4.0/kicker/extensions/dockbar/Makefile.in
---- kdebase-3.4.0.orig/kicker/extensions/dockbar/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/extensions/dockbar/Makefile.in 2005-05-07 12:35:30.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -82,18 +82,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(dockbar_panelextension_la_SOURCES)
- DIST_SOURCES = $(dockbar_panelextension_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kicker/extensions/dockbar/Makefile.in kdebase-3.4.1/kicker/extensions/dockbar/Makefile.in
+--- kdebase-3.4.1.orig/kicker/extensions/dockbar/Makefile.in 2005-05-23 18:38:26.000000000 +0200
++++ kdebase-3.4.1/kicker/extensions/dockbar/Makefile.in 2005-05-24 16:27:57.903877983 +0200
@@ -288,6 +288,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -32662,44 +19174,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kicker/extensions/kasbar/Makefile.in kdebase-3.4.0/kicker/extensions/kasbar/Makefile.in
---- kdebase-3.4.0.orig/kicker/extensions/kasbar/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/extensions/kasbar/Makefile.in 2005-05-07 12:35:30.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -104,18 +104,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kasbar_panelextension_la_SOURCES) $(libkasbar_la_SOURCES) \
- $(kasbar_SOURCES)
+diff -rua kdebase-3.4.1.orig/kicker/extensions/kasbar/Makefile.in kdebase-3.4.1/kicker/extensions/kasbar/Makefile.in
+--- kdebase-3.4.1.orig/kicker/extensions/kasbar/Makefile.in 2005-05-23 18:38:26.000000000 +0200
++++ kdebase-3.4.1/kicker/extensions/kasbar/Makefile.in 2005-05-24 16:27:57.933875273 +0200
@@ -312,6 +312,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -32731,73 +19208,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1086,11 +1089,11 @@
- mocs: kasbarextension.moc
-
- #>+ 3
--kasitem.moc: $(srcdir)/kasitem.h
-- $(MOC) $(srcdir)/kasitem.h -o kasitem.moc
-+kasaboutdlg.moc: $(srcdir)/kasaboutdlg.h
-+ $(MOC) $(srcdir)/kasaboutdlg.h -o kasaboutdlg.moc
-
- #>+ 2
--mocs: kasitem.moc
-+mocs: kasaboutdlg.moc
-
- #>+ 3
- kasclockitem.moc: $(srcdir)/kasclockitem.h
-@@ -1100,11 +1103,11 @@
- mocs: kasclockitem.moc
-
- #>+ 3
--kasaboutdlg.moc: $(srcdir)/kasaboutdlg.h
-- $(MOC) $(srcdir)/kasaboutdlg.h -o kasaboutdlg.moc
-+kasitem.moc: $(srcdir)/kasitem.h
-+ $(MOC) $(srcdir)/kasitem.h -o kasitem.moc
-
- #>+ 2
--mocs: kasaboutdlg.moc
-+mocs: kasitem.moc
-
- #>+ 3
- kasresources.moc: $(srcdir)/kasresources.h
-@@ -1166,10 +1169,10 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f kasgroupitem.moc kastaskitem.moc kastasker.moc kasbarextension.moc kasitem.moc kasclockitem.moc kasaboutdlg.moc kasresources.moc kaspopup.moc kasloaditem.moc kasbar.moc kasprefsdlg.moc kastaskpopup.moc kasstartupitem.moc
-+ -rm -f kasgroupitem.moc kastaskitem.moc kastasker.moc kasbarextension.moc kasaboutdlg.moc kasclockitem.moc kasitem.moc kasresources.moc kaspopup.moc kasloaditem.moc kasbar.moc kasprefsdlg.moc kastaskpopup.moc kasstartupitem.moc
-
- #>+ 2
--KDE_DIST=DESIGN Makefile.in kasclockitem.h kasloaditem.h Doxyfile docs.h kastaskpopup.h kasbarextension.desktop Makefile.am
-+KDE_DIST=DESIGN Makefile.in kasclockitem.h kasloaditem.h Doxyfile configure.in.in docs.h kastaskpopup.h kasbarextension.desktop Makefile.am
-
- #>+ 3
- clean-closures:
-@@ -1217,7 +1220,7 @@
-
-
- #>+ 11
--libkasbar_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kasbar.cpp $(srcdir)/kasitem.cpp $(srcdir)/kastaskitem.cpp $(srcdir)/kastasker.cpp $(srcdir)/kaspopup.cpp $(srcdir)/kastaskpopup.cpp $(srcdir)/kasstartupitem.cpp $(srcdir)/kasaboutdlg.cpp $(srcdir)/kasprefsdlg.cpp $(srcdir)/kasclockitem.cpp $(srcdir)/kasgroupitem.cpp $(srcdir)/kasresources.cpp $(srcdir)/kasgrouper.cpp $(srcdir)/kasloaditem.cpp kasgroupitem.moc kastaskitem.moc kastasker.moc kasaboutdlg.moc kasclockitem.moc kasitem.moc kaspopup.moc kasresources.moc kasloaditem.moc kasbar.moc kasprefsdlg.moc kastaskpopup.moc kasstartupitem.moc
-+libkasbar_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kasbar.cpp $(srcdir)/kasitem.cpp $(srcdir)/kastaskitem.cpp $(srcdir)/kastasker.cpp $(srcdir)/kaspopup.cpp $(srcdir)/kastaskpopup.cpp $(srcdir)/kasstartupitem.cpp $(srcdir)/kasaboutdlg.cpp $(srcdir)/kasprefsdlg.cpp $(srcdir)/kasclockitem.cpp $(srcdir)/kasgroupitem.cpp $(srcdir)/kasresources.cpp $(srcdir)/kasgrouper.cpp $(srcdir)/kasloaditem.cpp kasgroupitem.moc kastaskitem.moc kastasker.moc kasitem.moc kasclockitem.moc kasaboutdlg.moc kaspopup.moc kasresources.moc kasloaditem.moc kasbar.moc kasprefsdlg.moc kastaskpopup.moc kasstartupitem.moc
- @echo 'creating libkasbar_la.all_cpp.cpp ...'; \
- rm -f libkasbar_la.all_cpp.files libkasbar_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libkasbar_la.all_cpp.final; \
-diff -Nru kdebase-3.4.0.orig/kicker/extensions/Makefile.in kdebase-3.4.0/kicker/extensions/Makefile.in
---- kdebase-3.4.0.orig/kicker/extensions/Makefile.in 2005-03-04 08:14:58.000000000 -0500
-+++ kdebase-3.4.0/kicker/extensions/Makefile.in 2005-05-07 12:35:30.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kicker/extensions/Makefile.in kdebase-3.4.1/kicker/extensions/Makefile.in
+--- kdebase-3.4.1.orig/kicker/extensions/Makefile.in 2005-05-23 18:38:26.000000000 +0200
++++ kdebase-3.4.1/kicker/extensions/Makefile.in 2005-05-24 16:27:57.888879337 +0200
@@ -251,6 +251,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -32829,92 +19242,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -599,7 +602,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -611,7 +620,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -619,7 +628,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -640,7 +655,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kicker/extensions/sidebar/Makefile.in kdebase-3.4.0/kicker/extensions/sidebar/Makefile.in
---- kdebase-3.4.0.orig/kicker/extensions/sidebar/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/extensions/sidebar/Makefile.in 2005-05-07 12:35:31.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -76,18 +76,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(sidebar_panelextension_la_SOURCES)
- DIST_SOURCES = $(sidebar_panelextension_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kicker/extensions/sidebar/Makefile.in kdebase-3.4.1/kicker/extensions/sidebar/Makefile.in
+--- kdebase-3.4.1.orig/kicker/extensions/sidebar/Makefile.in 2005-05-23 18:38:26.000000000 +0200
++++ kdebase-3.4.1/kicker/extensions/sidebar/Makefile.in 2005-05-24 16:27:57.949873828 +0200
@@ -281,6 +281,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -32946,44 +19276,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kicker/extensions/taskbar/Makefile.in kdebase-3.4.0/kicker/extensions/taskbar/Makefile.in
---- kdebase-3.4.0.orig/kicker/extensions/taskbar/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/extensions/taskbar/Makefile.in 2005-05-07 12:35:31.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -83,18 +83,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(taskbar_panelextension_la_SOURCES)
- DIST_SOURCES = $(taskbar_panelextension_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kicker/extensions/taskbar/Makefile.in kdebase-3.4.1/kicker/extensions/taskbar/Makefile.in
+--- kdebase-3.4.1.orig/kicker/extensions/taskbar/Makefile.in 2005-05-23 18:38:26.000000000 +0200
++++ kdebase-3.4.1/kicker/extensions/taskbar/Makefile.in 2005-05-24 16:27:57.972871751 +0200
@@ -289,6 +289,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -33015,44 +19310,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kicker/Makefile.in kdebase-3.4.0/kicker/Makefile.in
---- kdebase-3.4.0.orig/kicker/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/kicker/Makefile.in 2005-05-07 12:35:26.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -108,18 +108,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kicker_la_SOURCES) $(kicker_3_4_reverseLayout_SOURCES)
- #>- DIST_SOURCES = $(kicker_la_SOURCES) \
+diff -rua kdebase-3.4.1.orig/kicker/Makefile.in kdebase-3.4.1/kicker/Makefile.in
+--- kdebase-3.4.1.orig/kicker/Makefile.in 2005-05-23 18:38:26.000000000 +0200
++++ kdebase-3.4.1/kicker/Makefile.in 2005-05-24 16:27:57.434920341 +0200
@@ -333,6 +333,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -33084,92 +19344,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -923,7 +926,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -935,7 +944,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -943,7 +952,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -964,7 +979,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kicker/menuext/find/Makefile.in kdebase-3.4.0/kicker/menuext/find/Makefile.in
---- kdebase-3.4.0.orig/kicker/menuext/find/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/menuext/find/Makefile.in 2005-05-07 12:35:31.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -75,18 +75,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kickermenu_find_la_SOURCES)
- DIST_SOURCES = $(kickermenu_find_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kicker/menuext/find/Makefile.in kdebase-3.4.1/kicker/menuext/find/Makefile.in
+--- kdebase-3.4.1.orig/kicker/menuext/find/Makefile.in 2005-05-23 18:38:27.000000000 +0200
++++ kdebase-3.4.1/kicker/menuext/find/Makefile.in 2005-05-24 16:27:58.007868590 +0200
@@ -281,6 +281,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -33201,44 +19378,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kicker/menuext/kdeprint/Makefile.in kdebase-3.4.0/kicker/menuext/kdeprint/Makefile.in
---- kdebase-3.4.0.orig/kicker/menuext/kdeprint/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/menuext/kdeprint/Makefile.in 2005-05-07 12:35:31.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -76,18 +76,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kickermenu_kdeprint_la_SOURCES)
- DIST_SOURCES = $(kickermenu_kdeprint_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kicker/menuext/kdeprint/Makefile.in kdebase-3.4.1/kicker/menuext/kdeprint/Makefile.in
+--- kdebase-3.4.1.orig/kicker/menuext/kdeprint/Makefile.in 2005-05-23 18:38:27.000000000 +0200
++++ kdebase-3.4.1/kicker/menuext/kdeprint/Makefile.in 2005-05-24 16:27:58.026866874 +0200
@@ -281,6 +281,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -33270,44 +19412,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kicker/menuext/konq-profiles/Makefile.in kdebase-3.4.0/kicker/menuext/konq-profiles/Makefile.in
---- kdebase-3.4.0.orig/kicker/menuext/konq-profiles/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/menuext/konq-profiles/Makefile.in 2005-05-07 12:35:31.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kickermenu_konqueror_la_SOURCES)
- DIST_SOURCES = $(kickermenu_konqueror_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kicker/menuext/konq-profiles/Makefile.in kdebase-3.4.1/kicker/menuext/konq-profiles/Makefile.in
+--- kdebase-3.4.1.orig/kicker/menuext/konq-profiles/Makefile.in 2005-05-23 18:38:27.000000000 +0200
++++ kdebase-3.4.1/kicker/menuext/konq-profiles/Makefile.in 2005-05-24 16:27:58.045865158 +0200
@@ -282,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -33339,44 +19446,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kicker/menuext/konsole/Makefile.in kdebase-3.4.0/kicker/menuext/konsole/Makefile.in
---- kdebase-3.4.0.orig/kicker/menuext/konsole/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/menuext/konsole/Makefile.in 2005-05-07 12:35:31.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -81,18 +81,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kickermenu_konsole_la_SOURCES)
- DIST_SOURCES = $(kickermenu_konsole_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kicker/menuext/konsole/Makefile.in kdebase-3.4.1/kicker/menuext/konsole/Makefile.in
+--- kdebase-3.4.1.orig/kicker/menuext/konsole/Makefile.in 2005-05-23 18:38:27.000000000 +0200
++++ kdebase-3.4.1/kicker/menuext/konsole/Makefile.in 2005-05-24 16:27:58.067863171 +0200
@@ -286,6 +286,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -33408,21 +19480,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kicker/menuext/Makefile.in kdebase-3.4.0/kicker/menuext/Makefile.in
---- kdebase-3.4.0.orig/kicker/menuext/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/menuext/Makefile.in 2005-05-07 12:35:31.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kicker/menuext/Makefile.in kdebase-3.4.1/kicker/menuext/Makefile.in
+--- kdebase-3.4.1.orig/kicker/menuext/Makefile.in 2005-05-23 18:38:26.000000000 +0200
++++ kdebase-3.4.1/kicker/menuext/Makefile.in 2005-05-24 16:27:57.987870396 +0200
@@ -251,6 +251,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -33454,92 +19514,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -599,7 +602,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -611,7 +620,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -619,7 +628,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -640,7 +655,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kicker/menuext/prefmenu/Makefile.in kdebase-3.4.0/kicker/menuext/prefmenu/Makefile.in
---- kdebase-3.4.0.orig/kicker/menuext/prefmenu/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/menuext/prefmenu/Makefile.in 2005-05-07 12:35:31.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -76,18 +76,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kickermenu_prefmenu_la_SOURCES)
- DIST_SOURCES = $(kickermenu_prefmenu_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kicker/menuext/prefmenu/Makefile.in kdebase-3.4.1/kicker/menuext/prefmenu/Makefile.in
+--- kdebase-3.4.1.orig/kicker/menuext/prefmenu/Makefile.in 2005-05-23 18:38:27.000000000 +0200
++++ kdebase-3.4.1/kicker/menuext/prefmenu/Makefile.in 2005-05-24 16:27:58.089861184 +0200
@@ -281,6 +281,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -33571,44 +19548,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kicker/menuext/recentdocs/Makefile.in kdebase-3.4.0/kicker/menuext/recentdocs/Makefile.in
---- kdebase-3.4.0.orig/kicker/menuext/recentdocs/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/menuext/recentdocs/Makefile.in 2005-05-07 12:35:31.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -76,18 +76,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kickermenu_recentdocs_la_SOURCES)
- DIST_SOURCES = $(kickermenu_recentdocs_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kicker/menuext/recentdocs/Makefile.in kdebase-3.4.1/kicker/menuext/recentdocs/Makefile.in
+--- kdebase-3.4.1.orig/kicker/menuext/recentdocs/Makefile.in 2005-05-23 18:38:27.000000000 +0200
++++ kdebase-3.4.1/kicker/menuext/recentdocs/Makefile.in 2005-05-24 16:27:58.109859377 +0200
@@ -281,6 +281,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -33640,44 +19582,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kicker/menuext/remote/Makefile.in kdebase-3.4.0/kicker/menuext/remote/Makefile.in
---- kdebase-3.4.0.orig/kicker/menuext/remote/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/menuext/remote/Makefile.in 2005-05-07 12:35:31.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -79,18 +79,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kickermenu_remotemenu_la_SOURCES)
- DIST_SOURCES = $(kickermenu_remotemenu_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kicker/menuext/remote/Makefile.in kdebase-3.4.1/kicker/menuext/remote/Makefile.in
+--- kdebase-3.4.1.orig/kicker/menuext/remote/Makefile.in 2005-05-23 18:38:27.000000000 +0200
++++ kdebase-3.4.1/kicker/menuext/remote/Makefile.in 2005-05-24 16:27:58.130857481 +0200
@@ -284,6 +284,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -33709,44 +19616,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kicker/menuext/system/Makefile.in kdebase-3.4.0/kicker/menuext/system/Makefile.in
---- kdebase-3.4.0.orig/kicker/menuext/system/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/menuext/system/Makefile.in 2005-05-07 12:35:31.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -76,18 +76,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kickermenu_systemmenu_la_SOURCES)
- DIST_SOURCES = $(kickermenu_systemmenu_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kicker/menuext/system/Makefile.in kdebase-3.4.1/kicker/menuext/system/Makefile.in
+--- kdebase-3.4.1.orig/kicker/menuext/system/Makefile.in 2005-05-23 18:38:27.000000000 +0200
++++ kdebase-3.4.1/kicker/menuext/system/Makefile.in 2005-05-24 16:27:58.149855765 +0200
@@ -281,6 +281,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -33778,44 +19650,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kicker/menuext/tom/Makefile.in kdebase-3.4.0/kicker/menuext/tom/Makefile.in
---- kdebase-3.4.0.orig/kicker/menuext/tom/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/menuext/tom/Makefile.in 2005-05-07 12:35:32.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -75,18 +75,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kickermenu_tom_la_SOURCES)
- DIST_SOURCES = $(kickermenu_tom_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kicker/menuext/tom/Makefile.in kdebase-3.4.1/kicker/menuext/tom/Makefile.in
+--- kdebase-3.4.1.orig/kicker/menuext/tom/Makefile.in 2005-05-23 18:38:27.000000000 +0200
++++ kdebase-3.4.1/kicker/menuext/tom/Makefile.in 2005-05-24 16:27:58.175853416 +0200
@@ -281,6 +281,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -33847,44 +19684,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kicker/proxy/Makefile.in kdebase-3.4.0/kicker/proxy/Makefile.in
---- kdebase-3.4.0.orig/kicker/proxy/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/proxy/Makefile.in 2005-05-07 12:35:32.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -105,18 +105,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(appletproxy_la_SOURCES) $(extensionproxy_la_SOURCES) \
- $(extensiondebugger_SOURCES)
+diff -rua kdebase-3.4.1.orig/kicker/proxy/Makefile.in kdebase-3.4.1/kicker/proxy/Makefile.in
+--- kdebase-3.4.1.orig/kicker/proxy/Makefile.in 2005-05-23 18:38:27.000000000 +0200
++++ kdebase-3.4.1/kicker/proxy/Makefile.in 2005-05-24 16:27:58.208850436 +0200
@@ -313,6 +313,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -33916,44 +19718,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kicker/share/Makefile.in kdebase-3.4.0/kicker/share/Makefile.in
---- kdebase-3.4.0.orig/kicker/share/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/share/Makefile.in 2005-05-07 12:35:32.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -78,18 +78,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkickermain_la_SOURCES)
- DIST_SOURCES = $(libkickermain_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kicker/share/Makefile.in kdebase-3.4.1/kicker/share/Makefile.in
+--- kdebase-3.4.1.orig/kicker/share/Makefile.in 2005-05-23 18:38:27.000000000 +0200
++++ kdebase-3.4.1/kicker/share/Makefile.in 2005-05-24 16:27:58.232848268 +0200
@@ -281,6 +281,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -33985,44 +19752,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kicker/taskbar/Makefile.in kdebase-3.4.0/kicker/taskbar/Makefile.in
---- kdebase-3.4.0.orig/kicker/taskbar/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/taskbar/Makefile.in 2005-05-07 12:35:32.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -81,18 +81,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libtaskbar_la_SOURCES)
- DIST_SOURCES = $(libtaskbar_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kicker/taskbar/Makefile.in kdebase-3.4.1/kicker/taskbar/Makefile.in
+--- kdebase-3.4.1.orig/kicker/taskbar/Makefile.in 2005-05-23 18:38:27.000000000 +0200
++++ kdebase-3.4.1/kicker/taskbar/Makefile.in 2005-05-24 16:27:58.249846733 +0200
@@ -286,6 +286,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -34054,44 +19786,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kicker/taskmanager/Makefile.in kdebase-3.4.0/kicker/taskmanager/Makefile.in
---- kdebase-3.4.0.orig/kicker/taskmanager/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/taskmanager/Makefile.in 2005-05-07 12:35:32.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -78,18 +78,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libtaskmanager_la_SOURCES)
- DIST_SOURCES = $(libtaskmanager_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kicker/taskmanager/Makefile.in kdebase-3.4.1/kicker/taskmanager/Makefile.in
+--- kdebase-3.4.1.orig/kicker/taskmanager/Makefile.in 2005-05-23 18:38:27.000000000 +0200
++++ kdebase-3.4.1/kicker/taskmanager/Makefile.in 2005-05-24 16:27:58.264845378 +0200
@@ -281,6 +281,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -34123,44 +19820,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kicker/ui/Makefile.in kdebase-3.4.0/kicker/ui/Makefile.in
---- kdebase-3.4.0.orig/kicker/ui/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kicker/ui/Makefile.in 2005-05-07 12:35:32.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -84,18 +84,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkicker_ui_la_SOURCES)
- DIST_SOURCES = $(libkicker_ui_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kicker/ui/Makefile.in kdebase-3.4.1/kicker/ui/Makefile.in
+--- kdebase-3.4.1.orig/kicker/ui/Makefile.in 2005-05-23 18:38:27.000000000 +0200
++++ kdebase-3.4.1/kicker/ui/Makefile.in 2005-05-24 16:27:58.295842579 +0200
@@ -288,6 +288,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -34192,112 +19854,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -999,18 +1002,18 @@
- mocs: service_mnu.moc
-
- #>+ 3
--browser_dlg.moc: $(srcdir)/browser_dlg.h
-- $(MOC) $(srcdir)/browser_dlg.h -o browser_dlg.moc
-+addcontainer_mnu.moc: $(srcdir)/addcontainer_mnu.h
-+ $(MOC) $(srcdir)/addcontainer_mnu.h -o addcontainer_mnu.moc
-
- #>+ 2
--mocs: browser_dlg.moc
-+mocs: addcontainer_mnu.moc
-
- #>+ 3
--addcontainer_mnu.moc: $(srcdir)/addcontainer_mnu.h
-- $(MOC) $(srcdir)/addcontainer_mnu.h -o addcontainer_mnu.moc
-+browser_dlg.moc: $(srcdir)/browser_dlg.h
-+ $(MOC) $(srcdir)/browser_dlg.h -o browser_dlg.moc
-
- #>+ 2
--mocs: addcontainer_mnu.moc
-+mocs: browser_dlg.moc
-
- #>+ 3
- addbutton_mnu.moc: $(srcdir)/addbutton_mnu.h
-@@ -1027,18 +1030,18 @@
- mocs: removebutton_mnu.moc
-
- #>+ 3
--client_mnu.moc: $(srcdir)/client_mnu.h
-- $(MOC) $(srcdir)/client_mnu.h -o client_mnu.moc
-+quickbrowser_mnu.moc: $(srcdir)/quickbrowser_mnu.h
-+ $(MOC) $(srcdir)/quickbrowser_mnu.h -o quickbrowser_mnu.moc
-
- #>+ 2
--mocs: client_mnu.moc
-+mocs: quickbrowser_mnu.moc
-
- #>+ 3
--quickbrowser_mnu.moc: $(srcdir)/quickbrowser_mnu.h
-- $(MOC) $(srcdir)/quickbrowser_mnu.h -o quickbrowser_mnu.moc
-+client_mnu.moc: $(srcdir)/client_mnu.h
-+ $(MOC) $(srcdir)/client_mnu.h -o client_mnu.moc
-
- #>+ 2
--mocs: quickbrowser_mnu.moc
-+mocs: client_mnu.moc
-
- #>+ 3
- removespecialbutton_mnu.moc: $(srcdir)/removespecialbutton_mnu.h
-@@ -1056,7 +1059,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f exe_dlg.moc addspecialbutton_mnu.moc hidebutton.moc browser_mnu.moc appletop_mnu.moc k_mnu.moc removecontainer_mnu.moc removeapplet_mnu.moc removeextension_mnu.moc addapplet_mnu.moc service_mnu.moc browser_dlg.moc addcontainer_mnu.moc addbutton_mnu.moc removebutton_mnu.moc client_mnu.moc quickbrowser_mnu.moc removespecialbutton_mnu.moc addextension_mnu.moc
-+ -rm -f exe_dlg.moc addspecialbutton_mnu.moc hidebutton.moc browser_mnu.moc appletop_mnu.moc k_mnu.moc removecontainer_mnu.moc removeapplet_mnu.moc removeextension_mnu.moc addapplet_mnu.moc service_mnu.moc addcontainer_mnu.moc browser_dlg.moc addbutton_mnu.moc removebutton_mnu.moc quickbrowser_mnu.moc client_mnu.moc removespecialbutton_mnu.moc addextension_mnu.moc
-
- #>+ 2
- KDE_DIST=Makefile.in nonKDEButtonSettings.ui panelmenuiteminfo.h Makefile.am
-@@ -1108,7 +1111,7 @@
-
-
- #>+ 11
--libkicker_ui_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/addbutton_mnu.cpp $(srcdir)/addapplet_mnu.cpp $(srcdir)/appletop_mnu.cpp ../share/kickerSettings.h $(srcdir)/browser_mnu.cpp $(srcdir)/client_mnu.cpp $(srcdir)/dirdrop_mnu.cpp $(srcdir)/exe_dlg.cpp $(srcdir)/k_mnu.cpp ../share/kickerSettings.h $(srcdir)/quickbrowser_mnu.cpp $(srcdir)/service_mnu.cpp ../share/kickerSettings.h $(srcdir)/addextension_mnu.cpp ../core/extensionSettings.h $(srcdir)/extensionop_mnu.cpp ../share/kickerSettings.h $(srcdir)/addcontainer_mnu.cpp $(srcdir)/recentapps.cpp $(srcdir)/browser_dlg.cpp $(srcdir)/removeapplet_mnu.cpp $(srcdir)/removeextension_mnu.cpp ../core/extensionSettings.h $(srcdir)/removecontainer_mnu.cpp ../core/extensionSettings.h $(srcdir)/addspecialbutton_mnu.cpp $(srcdir)/removespecialbutton_mnu.cpp $(srcdir)/removebutton_mnu.cpp $(srcdir)/popupmenutitle.cpp $(srcdir)/hidebutton.cpp nonKDEButtonSettings.cpp exe_dlg.moc addspecialbutton_mnu.moc hidebutton.moc nonKDEButtonSettings.moc browser_mnu.moc appletop_mnu.moc k_mnu.moc removecontainer_mnu.moc removeapplet_mnu.moc removeextension_mnu.moc addapplet_mnu.moc service_mnu.moc browser_dlg.moc addcontainer_mnu.moc addbutton_mnu.moc removebutton_mnu.moc quickbrowser_mnu.moc client_mnu.moc removespecialbutton_mnu.moc addextension_mnu.moc
-+libkicker_ui_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/addbutton_mnu.cpp $(srcdir)/addapplet_mnu.cpp $(srcdir)/appletop_mnu.cpp ../share/kickerSettings.h $(srcdir)/browser_mnu.cpp $(srcdir)/client_mnu.cpp $(srcdir)/dirdrop_mnu.cpp $(srcdir)/exe_dlg.cpp $(srcdir)/k_mnu.cpp ../share/kickerSettings.h $(srcdir)/quickbrowser_mnu.cpp $(srcdir)/service_mnu.cpp ../share/kickerSettings.h $(srcdir)/addextension_mnu.cpp ../core/extensionSettings.h $(srcdir)/extensionop_mnu.cpp ../share/kickerSettings.h $(srcdir)/addcontainer_mnu.cpp $(srcdir)/recentapps.cpp $(srcdir)/browser_dlg.cpp $(srcdir)/removeapplet_mnu.cpp $(srcdir)/removeextension_mnu.cpp ../core/extensionSettings.h $(srcdir)/removecontainer_mnu.cpp ../core/extensionSettings.h $(srcdir)/addspecialbutton_mnu.cpp $(srcdir)/removespecialbutton_mnu.cpp $(srcdir)/removebutton_mnu.cpp $(srcdir)/popupmenutitle.cpp $(srcdir)/hidebutton.cpp nonKDEButtonSettings.cpp exe_dlg.moc addspecialbutton_mnu.moc hidebutton.moc nonKDEButtonSettings.moc browser_mnu.moc appletop_mnu.moc k_mnu.moc removecontainer_mnu.moc removeapplet_mnu.moc removeextension_mnu.moc addapplet_mnu.moc service_mnu.moc addcontainer_mnu.moc browser_dlg.moc addbutton_mnu.moc removebutton_mnu.moc client_mnu.moc quickbrowser_mnu.moc removespecialbutton_mnu.moc addextension_mnu.moc
- @echo 'creating libkicker_ui_la.all_cpp.cpp ...'; \
- rm -f libkicker_ui_la.all_cpp.files libkicker_ui_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libkicker_ui_la.all_cpp.final; \
-diff -Nru kdebase-3.4.0.orig/kioslave/about/Makefile.in kdebase-3.4.0/kioslave/about/Makefile.in
---- kdebase-3.4.0.orig/kioslave/about/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/about/Makefile.in 2005-05-07 12:35:32.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kio_about_la_SOURCES)
- DIST_SOURCES = $(kio_about_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kioslave/about/Makefile.in kdebase-3.4.1/kioslave/about/Makefile.in
+--- kdebase-3.4.1.orig/kioslave/about/Makefile.in 2005-05-23 18:38:27.000000000 +0200
++++ kdebase-3.4.1/kioslave/about/Makefile.in 2005-05-24 16:27:58.331839327 +0200
@@ -283,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -34329,44 +19888,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kioslave/cgi/kcmcgi/Makefile.in kdebase-3.4.0/kioslave/cgi/kcmcgi/Makefile.in
---- kdebase-3.4.0.orig/kioslave/cgi/kcmcgi/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/cgi/kcmcgi/Makefile.in 2005-05-07 12:35:33.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_cgi_la_SOURCES)
- DIST_SOURCES = $(kcm_cgi_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kioslave/cgi/kcmcgi/Makefile.in kdebase-3.4.1/kioslave/cgi/kcmcgi/Makefile.in
+--- kdebase-3.4.1.orig/kioslave/cgi/kcmcgi/Makefile.in 2005-05-23 18:38:27.000000000 +0200
++++ kdebase-3.4.1/kioslave/cgi/kcmcgi/Makefile.in 2005-05-24 16:27:58.373835534 +0200
@@ -283,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -34398,44 +19922,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kioslave/cgi/Makefile.in kdebase-3.4.0/kioslave/cgi/Makefile.in
---- kdebase-3.4.0.orig/kioslave/cgi/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/cgi/Makefile.in 2005-05-07 12:35:33.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kio_cgi_la_SOURCES)
- DIST_SOURCES = $(kio_cgi_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kioslave/cgi/Makefile.in kdebase-3.4.1/kioslave/cgi/Makefile.in
+--- kdebase-3.4.1.orig/kioslave/cgi/Makefile.in 2005-05-23 18:38:27.000000000 +0200
++++ kdebase-3.4.1/kioslave/cgi/Makefile.in 2005-05-24 16:27:58.353837340 +0200
@@ -297,6 +297,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -34467,92 +19956,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -733,7 +736,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -745,7 +754,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -753,7 +762,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -774,7 +789,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kioslave/filter/Makefile.in kdebase-3.4.0/kioslave/filter/Makefile.in
---- kdebase-3.4.0.orig/kioslave/filter/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/filter/Makefile.in 2005-05-07 12:35:33.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kio_filter_la_SOURCES)
- DIST_SOURCES = $(kio_filter_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kioslave/filter/Makefile.in kdebase-3.4.1/kioslave/filter/Makefile.in
+--- kdebase-3.4.1.orig/kioslave/filter/Makefile.in 2005-05-23 18:38:27.000000000 +0200
++++ kdebase-3.4.1/kioslave/filter/Makefile.in 2005-05-24 16:27:58.393833728 +0200
@@ -283,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -34584,44 +19990,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kioslave/finger/Makefile.in kdebase-3.4.0/kioslave/finger/Makefile.in
---- kdebase-3.4.0.orig/kioslave/finger/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/finger/Makefile.in 2005-05-07 12:35:33.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -76,18 +76,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kio_finger_la_SOURCES)
- DIST_SOURCES = $(kio_finger_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kioslave/finger/Makefile.in kdebase-3.4.1/kioslave/finger/Makefile.in
+--- kdebase-3.4.1.orig/kioslave/finger/Makefile.in 2005-05-23 18:38:27.000000000 +0200
++++ kdebase-3.4.1/kioslave/finger/Makefile.in 2005-05-24 16:27:58.414831831 +0200
@@ -283,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -34653,44 +20024,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kioslave/fish/Makefile.in kdebase-3.4.0/kioslave/fish/Makefile.in
---- kdebase-3.4.0.orig/kioslave/fish/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/fish/Makefile.in 2005-05-07 12:35:34.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kio_fish_la_SOURCES)
- DIST_SOURCES = $(kio_fish_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kioslave/fish/Makefile.in kdebase-3.4.1/kioslave/fish/Makefile.in
+--- kdebase-3.4.1.orig/kioslave/fish/Makefile.in 2005-05-23 18:38:27.000000000 +0200
++++ kdebase-3.4.1/kioslave/fish/Makefile.in 2005-05-24 16:27:58.434830025 +0200
@@ -283,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -34722,44 +20058,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kioslave/floppy/Makefile.in kdebase-3.4.0/kioslave/floppy/Makefile.in
---- kdebase-3.4.0.orig/kioslave/floppy/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/floppy/Makefile.in 2005-05-07 12:35:34.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -79,18 +79,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kio_floppy_la_SOURCES)
- DIST_SOURCES = $(kio_floppy_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kioslave/floppy/Makefile.in kdebase-3.4.1/kioslave/floppy/Makefile.in
+--- kdebase-3.4.1.orig/kioslave/floppy/Makefile.in 2005-05-23 18:38:27.000000000 +0200
++++ kdebase-3.4.1/kioslave/floppy/Makefile.in 2005-05-24 16:27:58.453828309 +0200
@@ -284,6 +284,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -34791,44 +20092,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kioslave/info/Makefile.in kdebase-3.4.0/kioslave/info/Makefile.in
---- kdebase-3.4.0.orig/kioslave/info/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/info/Makefile.in 2005-05-07 12:35:34.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -81,18 +81,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kio_info_la_SOURCES)
- DIST_SOURCES = $(kio_info_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kioslave/info/Makefile.in kdebase-3.4.1/kioslave/info/Makefile.in
+--- kdebase-3.4.1.orig/kioslave/info/Makefile.in 2005-05-23 18:38:27.000000000 +0200
++++ kdebase-3.4.1/kioslave/info/Makefile.in 2005-05-24 16:27:58.475826322 +0200
@@ -288,6 +288,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -34860,44 +20126,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kioslave/ldap/Makefile.in kdebase-3.4.0/kioslave/ldap/Makefile.in
---- kdebase-3.4.0.orig/kioslave/ldap/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/ldap/Makefile.in 2005-05-07 12:35:34.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -78,18 +78,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kio_ldap_la_SOURCES)
- DIST_SOURCES = $(kio_ldap_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kioslave/ldap/Makefile.in kdebase-3.4.1/kioslave/ldap/Makefile.in
+--- kdebase-3.4.1.orig/kioslave/ldap/Makefile.in 2005-05-23 18:38:27.000000000 +0200
++++ kdebase-3.4.1/kioslave/ldap/Makefile.in 2005-05-24 16:27:58.493824696 +0200
@@ -284,6 +284,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -34929,44 +20160,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kioslave/mac/Makefile.in kdebase-3.4.0/kioslave/mac/Makefile.in
---- kdebase-3.4.0.orig/kioslave/mac/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/mac/Makefile.in 2005-05-07 12:35:35.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -76,18 +76,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kio_mac_la_SOURCES)
- DIST_SOURCES = $(kio_mac_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kioslave/mac/Makefile.in kdebase-3.4.1/kioslave/mac/Makefile.in
+--- kdebase-3.4.1.orig/kioslave/mac/Makefile.in 2005-05-23 18:38:27.000000000 +0200
++++ kdebase-3.4.1/kioslave/mac/Makefile.in 2005-05-24 16:27:58.509823251 +0200
@@ -282,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -34998,21 +20194,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kioslave/Makefile.in kdebase-3.4.0/kioslave/Makefile.in
---- kdebase-3.4.0.orig/kioslave/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/Makefile.in 2005-05-07 12:35:32.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kioslave/Makefile.in kdebase-3.4.1/kioslave/Makefile.in
+--- kdebase-3.4.1.orig/kioslave/Makefile.in 2005-05-23 18:38:27.000000000 +0200
++++ kdebase-3.4.1/kioslave/Makefile.in 2005-05-24 16:27:58.311841133 +0200
@@ -253,6 +253,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -35044,92 +20228,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -606,7 +609,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -618,7 +627,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -626,7 +635,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -647,7 +662,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kioslave/man/Makefile.in kdebase-3.4.0/kioslave/man/Makefile.in
---- kdebase-3.4.0.orig/kioslave/man/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/man/Makefile.in 2005-05-07 12:35:35.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -98,18 +98,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kio_man_la_SOURCES) $(libkmanpart_la_SOURCES) \
- $(kio_man_test_SOURCES) $(man2html_SOURCES)
+diff -rua kdebase-3.4.1.orig/kioslave/man/Makefile.in kdebase-3.4.1/kioslave/man/Makefile.in
+--- kdebase-3.4.1.orig/kioslave/man/Makefile.in 2005-05-23 18:38:27.000000000 +0200
++++ kdebase-3.4.1/kioslave/man/Makefile.in 2005-05-24 16:27:58.531821264 +0200
@@ -306,6 +306,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -35161,44 +20262,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kioslave/media/kdedmodule/Makefile.in kdebase-3.4.0/kioslave/media/kdedmodule/Makefile.in
---- kdebase-3.4.0.orig/kioslave/media/kdedmodule/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/media/kdedmodule/Makefile.in 2005-05-07 12:35:35.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -113,18 +113,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(halbackend_la_SOURCES) $(kded_mediamanager_la_SOURCES) \
- $(liblinuxcdpolling_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kioslave/media/kdedmodule/Makefile.in kdebase-3.4.1/kioslave/media/kdedmodule/Makefile.in
+--- kdebase-3.4.1.orig/kioslave/media/kdedmodule/Makefile.in 2005-05-23 18:38:27.000000000 +0200
++++ kdebase-3.4.1/kioslave/media/kdedmodule/Makefile.in 2005-05-24 16:27:58.594815574 +0200
@@ -321,6 +321,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -35230,44 +20296,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kioslave/media/kfile-plugin/Makefile.in kdebase-3.4.0/kioslave/media/kfile-plugin/Makefile.in
---- kdebase-3.4.0.orig/kioslave/media/kfile-plugin/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/media/kfile-plugin/Makefile.in 2005-05-07 12:35:35.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -78,18 +78,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kfile_media_la_SOURCES)
- DIST_SOURCES = $(kfile_media_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kioslave/media/kfile-plugin/Makefile.in kdebase-3.4.1/kioslave/media/kfile-plugin/Makefile.in
+--- kdebase-3.4.1.orig/kioslave/media/kfile-plugin/Makefile.in 2005-05-23 18:38:27.000000000 +0200
++++ kdebase-3.4.1/kioslave/media/kfile-plugin/Makefile.in 2005-05-24 16:27:58.615813677 +0200
@@ -284,6 +284,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -35299,44 +20330,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kioslave/media/libmediacommon/Makefile.in kdebase-3.4.0/kioslave/media/libmediacommon/Makefile.in
---- kdebase-3.4.0.orig/kioslave/media/libmediacommon/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/media/libmediacommon/Makefile.in 2005-05-07 12:35:35.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -64,18 +64,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libmediacommon_la_SOURCES)
- DIST_SOURCES = $(libmediacommon_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kioslave/media/libmediacommon/Makefile.in kdebase-3.4.1/kioslave/media/libmediacommon/Makefile.in
+--- kdebase-3.4.1.orig/kioslave/media/libmediacommon/Makefile.in 2005-05-23 18:38:27.000000000 +0200
++++ kdebase-3.4.1/kioslave/media/libmediacommon/Makefile.in 2005-05-24 16:27:58.632812142 +0200
@@ -267,6 +267,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -35368,44 +20364,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdebase-3.4.0.orig/kioslave/media/Makefile.in kdebase-3.4.0/kioslave/media/Makefile.in
---- kdebase-3.4.0.orig/kioslave/media/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/media/Makefile.in 2005-05-07 12:35:35.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -90,18 +90,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kio_media_la_SOURCES) $(libkiomedia_la_SOURCES) \
- $(testmedia_SOURCES)
+diff -rua kdebase-3.4.1.orig/kioslave/media/Makefile.in kdebase-3.4.1/kioslave/media/Makefile.in
+--- kdebase-3.4.1.orig/kioslave/media/Makefile.in 2005-05-23 18:38:27.000000000 +0200
++++ kdebase-3.4.1/kioslave/media/Makefile.in 2005-05-24 16:27:58.554819187 +0200
@@ -311,6 +311,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -35437,69 +20398,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -778,7 +781,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -790,7 +799,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -798,7 +807,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -819,7 +834,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kioslave/media/mimetypes/Makefile.in kdebase-3.4.0/kioslave/media/mimetypes/Makefile.in
---- kdebase-3.4.0.orig/kioslave/media/mimetypes/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/media/mimetypes/Makefile.in 2005-05-07 12:35:35.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kioslave/media/mimetypes/Makefile.in kdebase-3.4.1/kioslave/media/mimetypes/Makefile.in
+--- kdebase-3.4.1.orig/kioslave/media/mimetypes/Makefile.in 2005-05-23 18:38:27.000000000 +0200
++++ kdebase-3.4.1/kioslave/media/mimetypes/Makefile.in 2005-05-24 16:27:58.647810787 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -35531,44 +20432,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kioslave/media/mounthelper/Makefile.in kdebase-3.4.0/kioslave/media/mounthelper/Makefile.in
---- kdebase-3.4.0.orig/kioslave/media/mounthelper/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/media/mounthelper/Makefile.in 2005-05-07 12:35:35.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -68,18 +68,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kio_media_mounthelper_SOURCES)
- DIST_SOURCES = $(kio_media_mounthelper_SOURCES)
+diff -rua kdebase-3.4.1.orig/kioslave/media/mounthelper/Makefile.in kdebase-3.4.1/kioslave/media/mounthelper/Makefile.in
+--- kdebase-3.4.1.orig/kioslave/media/mounthelper/Makefile.in 2005-05-23 18:38:27.000000000 +0200
++++ kdebase-3.4.1/kioslave/media/mounthelper/Makefile.in 2005-05-24 16:27:58.665809161 +0200
@@ -271,6 +271,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -35600,21 +20466,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kioslave/media/services/Makefile.in kdebase-3.4.0/kioslave/media/services/Makefile.in
---- kdebase-3.4.0.orig/kioslave/media/services/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/media/services/Makefile.in 2005-05-07 12:35:35.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kioslave/media/services/Makefile.in kdebase-3.4.1/kioslave/media/services/Makefile.in
+--- kdebase-3.4.1.orig/kioslave/media/services/Makefile.in 2005-05-23 18:38:27.000000000 +0200
++++ kdebase-3.4.1/kioslave/media/services/Makefile.in 2005-05-24 16:27:58.677808078 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -35646,57 +20500,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kioslave/nfs/Makefile.in kdebase-3.4.0/kioslave/nfs/Makefile.in
---- kdebase-3.4.0.orig/kioslave/nfs/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/nfs/Makefile.in 2005-05-07 12:35:36.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,29 +77,29 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kio_nfs_la_SOURCES)
- DIST_SOURCES = $(kio_nfs_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kioslave/nfs/Makefile.in kdebase-3.4.1/kioslave/nfs/Makefile.in
+--- kdebase-3.4.1.orig/kioslave/nfs/Makefile.in 2005-05-23 18:38:27.000000000 +0200
++++ kdebase-3.4.1/kioslave/nfs/Makefile.in 2005-05-24 16:27:58.699806091 +0200
@@ -294,6 +294,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -35728,44 +20534,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kioslave/nntp/Makefile.in kdebase-3.4.0/kioslave/nntp/Makefile.in
---- kdebase-3.4.0.orig/kioslave/nntp/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/nntp/Makefile.in 2005-05-07 12:35:36.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kio_nntp_la_SOURCES)
- DIST_SOURCES = $(kio_nntp_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kioslave/nntp/Makefile.in kdebase-3.4.1/kioslave/nntp/Makefile.in
+--- kdebase-3.4.1.orig/kioslave/nntp/Makefile.in 2005-05-23 18:38:27.000000000 +0200
++++ kdebase-3.4.1/kioslave/nntp/Makefile.in 2005-05-24 16:27:58.728803472 +0200
@@ -283,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -35797,44 +20568,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kioslave/pop3/Makefile.in kdebase-3.4.0/kioslave/pop3/Makefile.in
---- kdebase-3.4.0.orig/kioslave/pop3/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/pop3/Makefile.in 2005-05-07 12:35:36.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kio_pop3_la_SOURCES)
- DIST_SOURCES = $(kio_pop3_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kioslave/pop3/Makefile.in kdebase-3.4.1/kioslave/pop3/Makefile.in
+--- kdebase-3.4.1.orig/kioslave/pop3/Makefile.in 2005-05-23 18:38:27.000000000 +0200
++++ kdebase-3.4.1/kioslave/pop3/Makefile.in 2005-05-24 16:27:58.747801756 +0200
@@ -283,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -35866,44 +20602,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kioslave/remote/kdedmodule/Makefile.in kdebase-3.4.0/kioslave/remote/kdedmodule/Makefile.in
---- kdebase-3.4.0.orig/kioslave/remote/kdedmodule/Makefile.in 2005-03-04 08:15:01.000000000 -0500
-+++ kdebase-3.4.0/kioslave/remote/kdedmodule/Makefile.in 2005-05-07 12:35:36.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -81,18 +81,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kded_remotedirnotify_la_SOURCES)
- DIST_SOURCES = $(kded_remotedirnotify_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kioslave/remote/kdedmodule/Makefile.in kdebase-3.4.1/kioslave/remote/kdedmodule/Makefile.in
+--- kdebase-3.4.1.orig/kioslave/remote/kdedmodule/Makefile.in 2005-05-23 18:38:27.000000000 +0200
++++ kdebase-3.4.1/kioslave/remote/kdedmodule/Makefile.in 2005-05-24 16:27:58.782798594 +0200
@@ -286,6 +286,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -35935,44 +20636,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kioslave/remote/Makefile.in kdebase-3.4.0/kioslave/remote/Makefile.in
---- kdebase-3.4.0.orig/kioslave/remote/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/remote/Makefile.in 2005-05-07 12:35:36.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -89,18 +89,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kio_remote_la_SOURCES) $(libkioremote_la_SOURCES) \
- $(testremote_SOURCES)
+diff -rua kdebase-3.4.1.orig/kioslave/remote/Makefile.in kdebase-3.4.1/kioslave/remote/Makefile.in
+--- kdebase-3.4.1.orig/kioslave/remote/Makefile.in 2005-05-23 18:38:27.000000000 +0200
++++ kdebase-3.4.1/kioslave/remote/Makefile.in 2005-05-24 16:27:58.768799859 +0200
@@ -310,6 +310,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -36004,92 +20670,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -776,7 +779,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -788,7 +797,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -796,7 +805,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -817,7 +832,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kioslave/settings/Makefile.in kdebase-3.4.0/kioslave/settings/Makefile.in
---- kdebase-3.4.0.orig/kioslave/settings/Makefile.in 2005-03-04 08:15:01.000000000 -0500
-+++ kdebase-3.4.0/kioslave/settings/Makefile.in 2005-05-07 12:35:36.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kio_settings_la_SOURCES)
- DIST_SOURCES = $(kio_settings_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kioslave/settings/Makefile.in kdebase-3.4.1/kioslave/settings/Makefile.in
+--- kdebase-3.4.1.orig/kioslave/settings/Makefile.in 2005-05-23 18:38:27.000000000 +0200
++++ kdebase-3.4.1/kioslave/settings/Makefile.in 2005-05-24 16:27:58.797797240 +0200
@@ -297,6 +297,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -36121,92 +20704,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -734,7 +737,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -746,7 +755,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -754,7 +763,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -775,7 +790,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kioslave/sftp/Makefile.in kdebase-3.4.0/kioslave/sftp/Makefile.in
---- kdebase-3.4.0.orig/kioslave/sftp/Makefile.in 2005-03-04 08:15:01.000000000 -0500
-+++ kdebase-3.4.0/kioslave/sftp/Makefile.in 2005-05-07 12:35:36.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -89,18 +89,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kio_sftp_la_SOURCES) $(ksshprocesstest_SOURCES)
- DIST_SOURCES = $(kio_sftp_la_SOURCES) $(ksshprocesstest_SOURCES)
+diff -rua kdebase-3.4.1.orig/kioslave/sftp/Makefile.in kdebase-3.4.1/kioslave/sftp/Makefile.in
+--- kdebase-3.4.1.orig/kioslave/sftp/Makefile.in 2005-05-23 18:38:27.000000000 +0200
++++ kdebase-3.4.1/kioslave/sftp/Makefile.in 2005-05-24 16:27:58.814795704 +0200
@@ -295,6 +295,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -36238,44 +20738,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kioslave/smb/Makefile.in kdebase-3.4.0/kioslave/smb/Makefile.in
---- kdebase-3.4.0.orig/kioslave/smb/Makefile.in 2005-03-04 08:15:01.000000000 -0500
-+++ kdebase-3.4.0/kioslave/smb/Makefile.in 2005-05-07 12:35:36.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -85,18 +85,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kio_smb_la_SOURCES)
- DIST_SOURCES = $(kio_smb_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kioslave/smb/Makefile.in kdebase-3.4.1/kioslave/smb/Makefile.in
+--- kdebase-3.4.1.orig/kioslave/smb/Makefile.in 2005-05-23 18:38:27.000000000 +0200
++++ kdebase-3.4.1/kioslave/smb/Makefile.in 2005-05-24 16:27:58.840793356 +0200
@@ -294,6 +294,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -36307,44 +20772,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kioslave/smtp/Makefile.in kdebase-3.4.0/kioslave/smtp/Makefile.in
---- kdebase-3.4.0.orig/kioslave/smtp/Makefile.in 2005-03-04 08:15:01.000000000 -0500
-+++ kdebase-3.4.0/kioslave/smtp/Makefile.in 2005-05-07 12:35:37.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -106,18 +106,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kio_smtp_la_SOURCES) $(interactivesmtpserver_SOURCES) \
- $(test_commands_SOURCES) $(test_headergeneration_SOURCES) \
+diff -rua kdebase-3.4.1.orig/kioslave/smtp/Makefile.in kdebase-3.4.1/kioslave/smtp/Makefile.in
+--- kdebase-3.4.1.orig/kioslave/smtp/Makefile.in 2005-05-23 18:38:27.000000000 +0200
++++ kdebase-3.4.1/kioslave/smtp/Makefile.in 2005-05-24 16:27:58.880789743 +0200
@@ -316,6 +316,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -36376,21 +20806,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kioslave/system/entries/Makefile.in kdebase-3.4.0/kioslave/system/entries/Makefile.in
---- kdebase-3.4.0.orig/kioslave/system/entries/Makefile.in 2005-03-04 08:15:01.000000000 -0500
-+++ kdebase-3.4.0/kioslave/system/entries/Makefile.in 2005-05-07 12:35:37.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kioslave/system/entries/Makefile.in kdebase-3.4.1/kioslave/system/entries/Makefile.in
+--- kdebase-3.4.1.orig/kioslave/system/entries/Makefile.in 2005-05-23 18:38:28.000000000 +0200
++++ kdebase-3.4.1/kioslave/system/entries/Makefile.in 2005-05-24 16:27:58.919786221 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -36422,44 +20840,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kioslave/system/kdedmodule/Makefile.in kdebase-3.4.0/kioslave/system/kdedmodule/Makefile.in
---- kdebase-3.4.0.orig/kioslave/system/kdedmodule/Makefile.in 2005-03-04 08:15:01.000000000 -0500
-+++ kdebase-3.4.0/kioslave/system/kdedmodule/Makefile.in 2005-05-07 12:35:37.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -81,18 +81,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kded_systemdirnotify_la_SOURCES)
- DIST_SOURCES = $(kded_systemdirnotify_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kioslave/system/kdedmodule/Makefile.in kdebase-3.4.1/kioslave/system/kdedmodule/Makefile.in
+--- kdebase-3.4.1.orig/kioslave/system/kdedmodule/Makefile.in 2005-05-23 18:38:28.000000000 +0200
++++ kdebase-3.4.1/kioslave/system/kdedmodule/Makefile.in 2005-05-24 16:27:58.939784415 +0200
@@ -286,6 +286,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -36491,44 +20874,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kioslave/system/Makefile.in kdebase-3.4.0/kioslave/system/Makefile.in
---- kdebase-3.4.0.orig/kioslave/system/Makefile.in 2005-03-04 08:15:01.000000000 -0500
-+++ kdebase-3.4.0/kioslave/system/Makefile.in 2005-05-07 12:35:37.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -89,18 +89,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kio_system_la_SOURCES) $(libkiosystem_la_SOURCES) \
- $(testsystem_SOURCES)
+diff -rua kdebase-3.4.1.orig/kioslave/system/Makefile.in kdebase-3.4.1/kioslave/system/Makefile.in
+--- kdebase-3.4.1.orig/kioslave/system/Makefile.in 2005-05-23 18:38:28.000000000 +0200
++++ kdebase-3.4.1/kioslave/system/Makefile.in 2005-05-24 16:27:58.906787395 +0200
@@ -310,6 +310,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -36560,69 +20908,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -775,7 +778,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -787,7 +796,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -795,7 +804,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -816,7 +831,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kioslave/system/mimetypes/Makefile.in kdebase-3.4.0/kioslave/system/mimetypes/Makefile.in
---- kdebase-3.4.0.orig/kioslave/system/mimetypes/Makefile.in 2005-03-04 08:15:01.000000000 -0500
-+++ kdebase-3.4.0/kioslave/system/mimetypes/Makefile.in 2005-05-07 12:35:37.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kioslave/system/mimetypes/Makefile.in kdebase-3.4.1/kioslave/system/mimetypes/Makefile.in
+--- kdebase-3.4.1.orig/kioslave/system/mimetypes/Makefile.in 2005-05-23 18:38:28.000000000 +0200
++++ kdebase-3.4.1/kioslave/system/mimetypes/Makefile.in 2005-05-24 16:27:58.952783241 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -36654,44 +20942,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kioslave/tar/Makefile.in kdebase-3.4.0/kioslave/tar/Makefile.in
---- kdebase-3.4.0.orig/kioslave/tar/Makefile.in 2005-03-04 08:15:01.000000000 -0500
-+++ kdebase-3.4.0/kioslave/tar/Makefile.in 2005-05-07 12:35:37.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -83,18 +83,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kio_tar_la_SOURCES) $(ktartest_SOURCES)
- DIST_SOURCES = $(kio_tar_la_SOURCES) $(ktartest_SOURCES)
+diff -rua kdebase-3.4.1.orig/kioslave/tar/Makefile.in kdebase-3.4.1/kioslave/tar/Makefile.in
+--- kdebase-3.4.1.orig/kioslave/tar/Makefile.in 2005-05-23 18:38:28.000000000 +0200
++++ kdebase-3.4.1/kioslave/tar/Makefile.in 2005-05-24 16:27:58.973781344 +0200
@@ -289,6 +289,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -36723,44 +20976,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kioslave/thumbnail/Makefile.in kdebase-3.4.0/kioslave/thumbnail/Makefile.in
---- kdebase-3.4.0.orig/kioslave/thumbnail/Makefile.in 2005-03-04 08:15:01.000000000 -0500
-+++ kdebase-3.4.0/kioslave/thumbnail/Makefile.in 2005-05-07 12:35:37.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -119,18 +119,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(cursorthumbnail_la_SOURCES) $(djvuthumbnail_la_SOURCES) \
- $(exrthumbnail_la_SOURCES) $(htmlthumbnail_la_SOURCES) \
+diff -rua kdebase-3.4.1.orig/kioslave/thumbnail/Makefile.in kdebase-3.4.1/kioslave/thumbnail/Makefile.in
+--- kdebase-3.4.1.orig/kioslave/thumbnail/Makefile.in 2005-05-23 18:38:28.000000000 +0200
++++ kdebase-3.4.1/kioslave/thumbnail/Makefile.in 2005-05-24 16:27:59.014777641 +0200
@@ -334,6 +334,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -36792,44 +21010,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kioslave/trash/kfile-plugin/Makefile.in kdebase-3.4.0/kioslave/trash/kfile-plugin/Makefile.in
---- kdebase-3.4.0.orig/kioslave/trash/kfile-plugin/Makefile.in 2005-03-04 08:15:02.000000000 -0500
-+++ kdebase-3.4.0/kioslave/trash/kfile-plugin/Makefile.in 2005-05-07 12:35:38.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -76,18 +76,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kfile_trash_la_SOURCES)
- DIST_SOURCES = $(kfile_trash_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kioslave/trash/kfile-plugin/Makefile.in kdebase-3.4.1/kioslave/trash/kfile-plugin/Makefile.in
+--- kdebase-3.4.1.orig/kioslave/trash/kfile-plugin/Makefile.in 2005-05-23 18:38:28.000000000 +0200
++++ kdebase-3.4.1/kioslave/trash/kfile-plugin/Makefile.in 2005-05-24 16:27:59.107769242 +0200
@@ -281,6 +281,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -36861,44 +21044,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kioslave/trash/Makefile.in kdebase-3.4.0/kioslave/trash/Makefile.in
---- kdebase-3.4.0.orig/kioslave/trash/Makefile.in 2005-03-04 08:15:01.000000000 -0500
-+++ kdebase-3.4.0/kioslave/trash/Makefile.in 2005-05-07 12:35:38.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -95,18 +95,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kio_trash_la_SOURCES) $(libtrashcommon_la_SOURCES) \
- $(ktrash_SOURCES) $(testtrash_SOURCES)
+diff -rua kdebase-3.4.1.orig/kioslave/trash/Makefile.in kdebase-3.4.1/kioslave/trash/Makefile.in
+--- kdebase-3.4.1.orig/kioslave/trash/Makefile.in 2005-05-23 18:38:28.000000000 +0200
++++ kdebase-3.4.1/kioslave/trash/Makefile.in 2005-05-24 16:27:59.088770958 +0200
@@ -316,6 +316,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -36930,92 +21078,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -816,7 +819,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -828,7 +837,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -836,7 +845,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -857,7 +872,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/klipper/Makefile.in kdebase-3.4.0/klipper/Makefile.in
---- kdebase-3.4.0.orig/klipper/Makefile.in 2005-03-04 08:15:02.000000000 -0500
-+++ kdebase-3.4.0/klipper/Makefile.in 2005-05-07 12:35:38.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -120,18 +120,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(klipper_la_SOURCES) $(klipper_panelapplet_la_SOURCES) \
- $(libklipper_common_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/klipper/Makefile.in kdebase-3.4.1/klipper/Makefile.in
+--- kdebase-3.4.1.orig/klipper/Makefile.in 2005-05-23 18:38:28.000000000 +0200
++++ kdebase-3.4.1/klipper/Makefile.in 2005-05-24 16:27:59.172763371 +0200
@@ -333,6 +333,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -37047,152 +21112,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1234,13 +1237,6 @@
- mocs: history.moc
-
- #>+ 3
--urlgrabber.moc: $(srcdir)/urlgrabber.h
-- $(MOC) $(srcdir)/urlgrabber.h -o urlgrabber.moc
--
--#>+ 2
--mocs: urlgrabber.moc
--
--#>+ 3
- configdialog.moc: $(srcdir)/configdialog.h
- $(MOC) $(srcdir)/configdialog.h -o configdialog.moc
-
-@@ -1248,11 +1244,11 @@
- mocs: configdialog.moc
-
- #>+ 3
--klipperpopup.moc: $(srcdir)/klipperpopup.h
-- $(MOC) $(srcdir)/klipperpopup.h -o klipperpopup.moc
-+urlgrabber.moc: $(srcdir)/urlgrabber.h
-+ $(MOC) $(srcdir)/urlgrabber.h -o urlgrabber.moc
-
- #>+ 2
--mocs: klipperpopup.moc
-+mocs: urlgrabber.moc
-
- #>+ 3
- clipboardpoll.moc: $(srcdir)/clipboardpoll.h
-@@ -1262,6 +1258,13 @@
- mocs: clipboardpoll.moc
-
- #>+ 3
-+klipperpopup.moc: $(srcdir)/klipperpopup.h
-+ $(MOC) $(srcdir)/klipperpopup.h -o klipperpopup.moc
-+
-+#>+ 2
-+mocs: klipperpopup.moc
-+
-+#>+ 3
- toplevel.moc: $(srcdir)/toplevel.h
- $(MOC) $(srcdir)/toplevel.h -o toplevel.moc
-
-@@ -1284,7 +1287,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f history.moc urlgrabber.moc configdialog.moc klipperpopup.moc clipboardpoll.moc toplevel.moc popupproxy.moc applet.moc
-+ -rm -f history.moc configdialog.moc urlgrabber.moc clipboardpoll.moc klipperpopup.moc toplevel.moc popupproxy.moc applet.moc
-
- #>+ 2
- KDE_DIST=crsc-app-klipper.svgz cr64-app-klipper.png popupproxy.h klipperbindings.cpp Makefile.in historystringitem.h cr22-app-klipper.png cr32-app-klipper.png urlgrabber.h klipperrc.upd configdialog.h klipper-1-2.pl history.h klippershortcuts.upd applet.h toplevel.h klipperrc.desktop klipperpopup.h cr48-app-klipper.png klipper.desktop clipboardpoll.h klipper-kde31.sh historyitem.h cr128-app-klipper.png cr16-app-klipper.png historyimageitem.h version.h Makefile.am
-@@ -1300,29 +1303,29 @@
-
- #>+ 25
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-- $(INSTALL_DATA) $(srcdir)/cr128-app-klipper.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/klipper.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-klipper.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/klipper.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
- $(INSTALL_DATA) $(srcdir)/cr22-app-klipper.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/klipper.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-klipper.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/klipper.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-klipper.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/klipper.svgz
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-klipper.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/klipper.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-klipper.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/klipper.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-klipper.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/klipper.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-- $(INSTALL_DATA) $(srcdir)/cr64-app-klipper.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/klipper.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-- $(INSTALL_DATA) $(srcdir)/crsc-app-klipper.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/klipper.svgz
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/klipper.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/klipper.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/klipper.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/klipper.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/klipper.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/klipper.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/klipper.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/klipper.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/klipper.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/klipper.svgz
-
- #>+ 15
- force-reedit:
-@@ -1375,7 +1378,7 @@
- rm -f klipper_panelapplet_la.all_cpp.final klipper_panelapplet_la.all_cpp.files
-
- #>+ 11
--libklipper_common_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/urlgrabber.cpp $(srcdir)/configdialog.cpp $(srcdir)/clipboardpoll.cpp $(srcdir)/history.cpp $(srcdir)/historyitem.cpp $(srcdir)/historystringitem.cpp $(srcdir)/klipperpopup.cpp $(srcdir)/popupproxy.cpp $(srcdir)/historyimageitem.cpp toplevel_skel.cpp history.moc configdialog.moc urlgrabber.moc toplevel.moc popupproxy.moc clipboardpoll.moc klipperpopup.moc
-+libklipper_common_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/urlgrabber.cpp $(srcdir)/configdialog.cpp $(srcdir)/clipboardpoll.cpp $(srcdir)/history.cpp $(srcdir)/historyitem.cpp $(srcdir)/historystringitem.cpp $(srcdir)/klipperpopup.cpp $(srcdir)/popupproxy.cpp $(srcdir)/historyimageitem.cpp toplevel_skel.cpp history.moc urlgrabber.moc configdialog.moc toplevel.moc popupproxy.moc klipperpopup.moc clipboardpoll.moc
- @echo 'creating libklipper_common_la.all_cpp.cpp ...'; \
- rm -f libklipper_common_la.all_cpp.files libklipper_common_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libklipper_common_la.all_cpp.final; \
-@@ -1443,6 +1446,6 @@
- history.lo: history.moc
- configdialog.lo: configdialog.moc
- applet.o: applet.moc
--klipperpopup.lo: klipperpopup.moc
- clipboardpoll.o: clipboardpoll.moc
-+klipperpopup.lo: klipperpopup.moc
- popupproxy.lo: popupproxy.moc
-diff -Nru kdebase-3.4.0.orig/kmenuedit/Makefile.in kdebase-3.4.0/kmenuedit/Makefile.in
---- kdebase-3.4.0.orig/kmenuedit/Makefile.in 2005-03-04 08:15:02.000000000 -0500
-+++ kdebase-3.4.0/kmenuedit/Makefile.in 2005-05-07 12:35:38.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -113,18 +113,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcontroledit_la_SOURCES) $(kmenuedit_la_SOURCES) \
- $(libkmenueditcommon_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kmenuedit/Makefile.in kdebase-3.4.1/kmenuedit/Makefile.in
+--- kdebase-3.4.1.orig/kmenuedit/Makefile.in 2005-05-23 18:38:28.000000000 +0200
++++ kdebase-3.4.1/kmenuedit/Makefile.in 2005-05-24 16:27:59.215759487 +0200
@@ -340,6 +340,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -37224,136 +21146,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -906,7 +909,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -918,7 +927,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -926,7 +935,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -947,7 +962,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1249,18 +1264,18 @@
- kcontroledit_DEPENDENCIES = libkdeinit_kcontroledit.la
-
- #>+ 3
--treeview.moc: $(srcdir)/treeview.h
-- $(MOC) $(srcdir)/treeview.h -o treeview.moc
-+basictab.moc: $(srcdir)/basictab.h
-+ $(MOC) $(srcdir)/basictab.h -o basictab.moc
-
- #>+ 2
--mocs: treeview.moc
-+mocs: basictab.moc
-
- #>+ 3
--basictab.moc: $(srcdir)/basictab.h
-- $(MOC) $(srcdir)/basictab.h -o basictab.moc
-+treeview.moc: $(srcdir)/treeview.h
-+ $(MOC) $(srcdir)/treeview.h -o treeview.moc
-
- #>+ 2
--mocs: basictab.moc
-+mocs: treeview.moc
-
- #>+ 3
- kmenuedit.moc: $(srcdir)/kmenuedit.h
-@@ -1271,7 +1286,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f treeview.moc basictab.moc kmenuedit.moc
-+ -rm -f basictab.moc treeview.moc kmenuedit.moc
-
- #>+ 2
- KDE_DIST=cr48-app-kmenuedit.png Makefile.in uninstall.desktop kmenuedit.desktop kmenueditui.rc kcontroleditui.rc cr16-app-kmenuedit.png cr32-app-kmenuedit.png Makefile.am
-@@ -1281,17 +1296,17 @@
-
- #>+ 13
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kmenuedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmenuedit.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kmenuedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmenuedit.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-kmenuedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kmenuedit.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kmenuedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmenuedit.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kmenuedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmenuedit.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmenuedit.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmenuedit.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kmenuedit.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmenuedit.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmenuedit.png
-
- #>+ 15
- force-reedit:
-@@ -1332,7 +1347,7 @@
-
-
- #>+ 11
--libkmenueditcommon_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/basictab.cpp $(srcdir)/treeview.cpp $(srcdir)/kmenuedit.cpp $(srcdir)/khotkeys.cpp $(srcdir)/menufile.cpp $(srcdir)/menuinfo.cpp basictab.moc treeview.moc kmenuedit.moc
-+libkmenueditcommon_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/basictab.cpp $(srcdir)/treeview.cpp $(srcdir)/kmenuedit.cpp $(srcdir)/khotkeys.cpp $(srcdir)/menufile.cpp $(srcdir)/menuinfo.cpp treeview.moc basictab.moc kmenuedit.moc
- @echo 'creating libkmenueditcommon_la.all_cpp.cpp ...'; \
- rm -f libkmenueditcommon_la.all_cpp.files libkmenueditcommon_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libkmenueditcommon_la.all_cpp.final; \
-diff -Nru kdebase-3.4.0.orig/kmenuedit/pixmaps/Makefile.in kdebase-3.4.0/kmenuedit/pixmaps/Makefile.in
---- kdebase-3.4.0.orig/kmenuedit/pixmaps/Makefile.in 2005-03-04 08:15:02.000000000 -0500
-+++ kdebase-3.4.0/kmenuedit/pixmaps/Makefile.in 2005-05-07 12:35:38.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kmenuedit/pixmaps/Makefile.in kdebase-3.4.1/kmenuedit/pixmaps/Makefile.in
+--- kdebase-3.4.1.orig/kmenuedit/pixmaps/Makefile.in 2005-05-23 18:38:28.000000000 +0200
++++ kdebase-3.4.1/kmenuedit/pixmaps/Makefile.in 2005-05-24 16:27:59.230758133 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -37385,95 +21180,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -716,34 +719,34 @@
-
- #>+ 30
- install-kde-icons:
-+ $(mkinstalldirs) $(DESTDIR)$(kmenuediticondir)/locolor/16x16/actions
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-menu_new.png $(DESTDIR)$(kmenuediticondir)/locolor/16x16/actions/menu_new.png
-+ $(mkinstalldirs) $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-menu_new_sep.png $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
- $(mkinstalldirs) $(DESTDIR)$(kmenuediticondir)/crystalsvg/22x22/actions
- $(INSTALL_DATA) $(srcdir)/cr22-action-menu_new.png $(DESTDIR)$(kmenuediticondir)/crystalsvg/22x22/actions/menu_new.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-menu_new_sep.png $(DESTDIR)$(kmenuediticondir)/crystalsvg/22x22/actions/menu_new_sep.png
-- $(mkinstalldirs) $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions
- $(INSTALL_DATA) $(srcdir)/cr32-action-menu_new.png $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions/menu_new.png
-- $(INSTALL_DATA) $(srcdir)/cr32-action-menu_new_sep.png $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
-- $(mkinstalldirs) $(DESTDIR)$(kmenuediticondir)/locolor/16x16/actions
-- $(INSTALL_DATA) $(srcdir)/lo16-action-menu_new.png $(DESTDIR)$(kmenuediticondir)/locolor/16x16/actions/menu_new.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-menu_new_sep.png $(DESTDIR)$(kmenuediticondir)/crystalsvg/22x22/actions/menu_new_sep.png
-+ $(mkinstalldirs) $(DESTDIR)$(kcontrolediticondir)/locolor/16x16/actions
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-menu_new.png $(DESTDIR)$(kcontrolediticondir)/locolor/16x16/actions/menu_new.png
-+ $(mkinstalldirs) $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-menu_new_sep.png $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
- $(mkinstalldirs) $(DESTDIR)$(kcontrolediticondir)/crystalsvg/22x22/actions
- $(INSTALL_DATA) $(srcdir)/cr22-action-menu_new.png $(DESTDIR)$(kcontrolediticondir)/crystalsvg/22x22/actions/menu_new.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-menu_new_sep.png $(DESTDIR)$(kcontrolediticondir)/crystalsvg/22x22/actions/menu_new_sep.png
-- $(mkinstalldirs) $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions
- $(INSTALL_DATA) $(srcdir)/cr32-action-menu_new.png $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions/menu_new.png
-- $(INSTALL_DATA) $(srcdir)/cr32-action-menu_new_sep.png $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
-- $(mkinstalldirs) $(DESTDIR)$(kcontrolediticondir)/locolor/16x16/actions
-- $(INSTALL_DATA) $(srcdir)/lo16-action-menu_new.png $(DESTDIR)$(kcontrolediticondir)/locolor/16x16/actions/menu_new.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-menu_new_sep.png $(DESTDIR)$(kcontrolediticondir)/crystalsvg/22x22/actions/menu_new_sep.png
-
- uninstall-kde-icons:
-+ -rm -f $(DESTDIR)$(kmenuediticondir)/locolor/16x16/actions/menu_new.png
-+ -rm -f $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
- -rm -f $(DESTDIR)$(kmenuediticondir)/crystalsvg/22x22/actions/menu_new.png
-- -rm -f $(DESTDIR)$(kmenuediticondir)/crystalsvg/22x22/actions/menu_new_sep.png
- -rm -f $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions/menu_new.png
-- -rm -f $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
-- -rm -f $(DESTDIR)$(kmenuediticondir)/locolor/16x16/actions/menu_new.png
-+ -rm -f $(DESTDIR)$(kmenuediticondir)/crystalsvg/22x22/actions/menu_new_sep.png
-+ -rm -f $(DESTDIR)$(kcontrolediticondir)/locolor/16x16/actions/menu_new.png
-+ -rm -f $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
- -rm -f $(DESTDIR)$(kcontrolediticondir)/crystalsvg/22x22/actions/menu_new.png
-- -rm -f $(DESTDIR)$(kcontrolediticondir)/crystalsvg/22x22/actions/menu_new_sep.png
- -rm -f $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions/menu_new.png
-- -rm -f $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
-- -rm -f $(DESTDIR)$(kcontrolediticondir)/locolor/16x16/actions/menu_new.png
-+ -rm -f $(DESTDIR)$(kcontrolediticondir)/crystalsvg/22x22/actions/menu_new_sep.png
-
- #>+ 15
- force-reedit:
-diff -Nru kdebase-3.4.0.orig/knetattach/Makefile.in kdebase-3.4.0/knetattach/Makefile.in
---- kdebase-3.4.0.orig/knetattach/Makefile.in 2005-03-04 08:15:02.000000000 -0500
-+++ kdebase-3.4.0/knetattach/Makefile.in 2005-05-07 12:35:38.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -72,18 +72,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(knetattach_SOURCES)
- DIST_SOURCES = $(knetattach_SOURCES)
+diff -rua kdebase-3.4.1.orig/knetattach/Makefile.in kdebase-3.4.1/knetattach/Makefile.in
+--- kdebase-3.4.1.orig/knetattach/Makefile.in 2005-05-23 18:38:28.000000000 +0200
++++ kdebase-3.4.1/knetattach/Makefile.in 2005-05-24 16:27:59.252756146 +0200
@@ -283,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -37505,86 +21214,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -911,29 +914,29 @@
-
- #>+ 25
- install-kde-icons:
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-knetattach.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/knetattach.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-knetattach.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/knetattach.svgz
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
- $(INSTALL_DATA) $(srcdir)/cr128-app-knetattach.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/knetattach.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-knetattach.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/knetattach.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
- $(INSTALL_DATA) $(srcdir)/cr22-app-knetattach.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/knetattach.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-knetattach.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knetattach.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-knetattach.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/knetattach.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-knetattach.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/knetattach.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- $(INSTALL_DATA) $(srcdir)/cr64-app-knetattach.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/knetattach.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-- $(INSTALL_DATA) $(srcdir)/crsc-app-knetattach.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/knetattach.svgz
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-knetattach.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knetattach.png
-
- uninstall-kde-icons:
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/knetattach.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/knetattach.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/knetattach.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/knetattach.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/knetattach.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knetattach.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/knetattach.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/knetattach.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/knetattach.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/knetattach.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knetattach.png
-
- #>+ 15
- force-reedit:
-diff -Nru kdebase-3.4.0.orig/konqueror/about/Makefile.in kdebase-3.4.0/konqueror/about/Makefile.in
---- kdebase-3.4.0.orig/konqueror/about/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/about/Makefile.in 2005-05-07 12:35:42.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(konq_aboutpage_la_SOURCES)
- DIST_SOURCES = $(konq_aboutpage_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/konqueror/about/Makefile.in kdebase-3.4.1/konqueror/about/Makefile.in
+--- kdebase-3.4.1.orig/konqueror/about/Makefile.in 2005-05-23 18:38:29.000000000 +0200
++++ kdebase-3.4.1/konqueror/about/Makefile.in 2005-05-24 16:27:59.849702227 +0200
@@ -285,6 +285,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -37616,44 +21248,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/konqueror/client/Makefile.in kdebase-3.4.0/konqueror/client/Makefile.in
---- kdebase-3.4.0.orig/konqueror/client/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/client/Makefile.in 2005-05-07 12:35:42.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -95,18 +95,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kfmclient_la_SOURCES)
- #>- DIST_SOURCES = $(kfmclient_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/konqueror/client/Makefile.in kdebase-3.4.1/konqueror/client/Makefile.in
+--- kdebase-3.4.1.orig/konqueror/client/Makefile.in 2005-05-23 18:38:29.000000000 +0200
++++ kdebase-3.4.1/konqueror/client/Makefile.in 2005-05-24 16:27:59.877699698 +0200
@@ -303,6 +303,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -37685,44 +21282,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/konqueror/iconview/Makefile.in kdebase-3.4.0/konqueror/iconview/Makefile.in
---- kdebase-3.4.0.orig/konqueror/iconview/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/iconview/Makefile.in 2005-05-07 12:35:42.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -76,18 +76,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(konq_iconview_la_SOURCES)
- DIST_SOURCES = $(konq_iconview_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/konqueror/iconview/Makefile.in kdebase-3.4.1/konqueror/iconview/Makefile.in
+--- kdebase-3.4.1.orig/konqueror/iconview/Makefile.in 2005-05-23 18:38:29.000000000 +0200
++++ kdebase-3.4.1/konqueror/iconview/Makefile.in 2005-05-24 16:27:59.927695182 +0200
@@ -283,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -37754,44 +21316,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/konqueror/keditbookmarks/Makefile.in kdebase-3.4.0/konqueror/keditbookmarks/Makefile.in
---- kdebase-3.4.0.orig/konqueror/keditbookmarks/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/keditbookmarks/Makefile.in 2005-05-07 12:35:43.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -97,18 +97,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(keditbookmarks_la_SOURCES) $(kbookmarkmerger_SOURCES)
- #>- DIST_SOURCES = $(keditbookmarks_la_SOURCES) $(kbookmarkmerger_SOURCES)
+diff -rua kdebase-3.4.1.orig/konqueror/keditbookmarks/Makefile.in kdebase-3.4.1/konqueror/keditbookmarks/Makefile.in
+--- kdebase-3.4.1.orig/konqueror/keditbookmarks/Makefile.in 2005-05-23 18:38:29.000000000 +0200
++++ kdebase-3.4.1/konqueror/keditbookmarks/Makefile.in 2005-05-24 16:27:59.985689944 +0200
@@ -304,6 +304,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -37823,140 +21350,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1061,18 +1064,18 @@
- mocs: favicons.moc
-
- #>+ 3
--bookmarkiterator.moc: $(srcdir)/bookmarkiterator.h
-- $(MOC) $(srcdir)/bookmarkiterator.h -o bookmarkiterator.moc
-+actionsimpl.moc: $(srcdir)/actionsimpl.h
-+ $(MOC) $(srcdir)/actionsimpl.h -o actionsimpl.moc
-
- #>+ 2
--mocs: bookmarkiterator.moc
-+mocs: actionsimpl.moc
-
- #>+ 3
--actionsimpl.moc: $(srcdir)/actionsimpl.h
-- $(MOC) $(srcdir)/actionsimpl.h -o actionsimpl.moc
-+bookmarkiterator.moc: $(srcdir)/bookmarkiterator.h
-+ $(MOC) $(srcdir)/bookmarkiterator.h -o bookmarkiterator.moc
-
- #>+ 2
--mocs: actionsimpl.moc
-+mocs: bookmarkiterator.moc
-
- #>+ 3
- updater.moc: $(srcdir)/updater.h
-@@ -1103,6 +1106,13 @@
- mocs: bookmarkinfo.moc
-
- #>+ 3
-+testlink.moc: $(srcdir)/testlink.h
-+ $(MOC) $(srcdir)/testlink.h -o testlink.moc
-+
-+#>+ 2
-+mocs: testlink.moc
-+
-+#>+ 3
- dcop.moc: $(srcdir)/dcop.h
- $(MOC) $(srcdir)/dcop.h -o dcop.moc
-
-@@ -1117,18 +1127,11 @@
- mocs: listview.moc
-
- #>+ 3
--testlink.moc: $(srcdir)/testlink.h
-- $(MOC) $(srcdir)/testlink.h -o testlink.moc
--
--#>+ 2
--mocs: testlink.moc
--
--#>+ 3
- clean-metasources:
-- -rm -f favicons.moc bookmarkiterator.moc actionsimpl.moc updater.moc toplevel.moc importers.moc bookmarkinfo.moc dcop.moc listview.moc testlink.moc
-+ -rm -f favicons.moc actionsimpl.moc bookmarkiterator.moc updater.moc toplevel.moc importers.moc bookmarkinfo.moc testlink.moc dcop.moc listview.moc
-
- #>+ 2
--KDE_DIST=exporters.h importers.h DESIGN updater.h bookmarkiterator.h Makefile.in uninstall.desktop listview.h keditbookmarksui.rc favicons.h bookmarkinfo.h keditbookmarks-genui.rc toplevel.h cr48-app-keditbookmarks.png testlink.h dcop.h cr64-app-keditbookmarks.png cr32-app-keditbookmarks.png actionsimpl.h commands.h cr16-app-keditbookmarks.png kinsertionsort.h Makefile.am
-+KDE_DIST=exporters.h importers.h DESIGN updater.h bookmarkiterator.h Makefile.in uninstall.desktop listview.h keditbookmarksui.rc favicons.h bookmarkinfo.h keditbookmarks-genui.rc toplevel.h cr48-app-keditbookmarks.png testlink.h dcop.h cr32-app-keditbookmarks.png cr64-app-keditbookmarks.png actionsimpl.h commands.h cr16-app-keditbookmarks.png kinsertionsort.h Makefile.am
-
- #>+ 5
- clean-idl:
-@@ -1141,20 +1144,20 @@
-
- #>+ 16
- install-kde-icons:
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-keditbookmarks.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/keditbookmarks.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-keditbookmarks.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keditbookmarks.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-keditbookmarks.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keditbookmarks.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-keditbookmarks.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keditbookmarks.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-- $(INSTALL_DATA) $(srcdir)/cr64-app-keditbookmarks.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/keditbookmarks.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-keditbookmarks.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keditbookmarks.png
-
- uninstall-kde-icons:
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/keditbookmarks.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keditbookmarks.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keditbookmarks.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keditbookmarks.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/keditbookmarks.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keditbookmarks.png
-
- #>+ 15
- force-reedit:
-@@ -1195,7 +1198,7 @@
-
-
- #>+ 11
--libkdeinit_keditbookmarks_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/listview.cpp $(srcdir)/toplevel.cpp $(srcdir)/actionsimpl.cpp $(srcdir)/commands.cpp $(srcdir)/importers.cpp $(srcdir)/dcop.cpp $(srcdir)/bookmarkiterator.cpp $(srcdir)/testlink.cpp $(srcdir)/favicons.cpp $(srcdir)/updater.cpp $(srcdir)/exporters.cpp $(srcdir)/bookmarkinfo.cpp dcop_skel.cpp kbookmarknotifier_stub.cpp favicons.moc actionsimpl.moc bookmarkiterator.moc updater.moc toplevel.moc importers.moc testlink.moc listview.moc bookmarkinfo.moc dcop.moc
-+libkdeinit_keditbookmarks_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/listview.cpp $(srcdir)/toplevel.cpp $(srcdir)/actionsimpl.cpp $(srcdir)/commands.cpp $(srcdir)/importers.cpp $(srcdir)/dcop.cpp $(srcdir)/bookmarkiterator.cpp $(srcdir)/testlink.cpp $(srcdir)/favicons.cpp $(srcdir)/updater.cpp $(srcdir)/exporters.cpp $(srcdir)/bookmarkinfo.cpp dcop_skel.cpp kbookmarknotifier_stub.cpp favicons.moc bookmarkiterator.moc actionsimpl.moc updater.moc toplevel.moc importers.moc listview.moc dcop.moc bookmarkinfo.moc testlink.moc
- @echo 'creating libkdeinit_keditbookmarks_la.all_cpp.cpp ...'; \
- rm -f libkdeinit_keditbookmarks_la.all_cpp.files libkdeinit_keditbookmarks_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libkdeinit_keditbookmarks_la.all_cpp.final; \
-diff -Nru kdebase-3.4.0.orig/konqueror/kttsplugin/Makefile.in kdebase-3.4.0/konqueror/kttsplugin/Makefile.in
---- kdebase-3.4.0.orig/konqueror/kttsplugin/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/kttsplugin/Makefile.in 2005-05-07 12:35:43.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -75,18 +75,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkhtmlkttsdplugin_la_SOURCES)
- DIST_SOURCES = $(libkhtmlkttsdplugin_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/konqueror/kttsplugin/Makefile.in kdebase-3.4.1/konqueror/kttsplugin/Makefile.in
+--- kdebase-3.4.1.orig/konqueror/kttsplugin/Makefile.in 2005-05-23 18:38:29.000000000 +0200
++++ kdebase-3.4.1/konqueror/kttsplugin/Makefile.in 2005-05-24 16:28:00.004688228 +0200
@@ -280,6 +280,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -37988,44 +21384,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/konqueror/listview/Makefile.in kdebase-3.4.0/konqueror/listview/Makefile.in
---- kdebase-3.4.0.orig/konqueror/listview/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/listview/Makefile.in 2005-05-07 12:35:43.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -85,18 +85,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(konq_listview_la_SOURCES)
- DIST_SOURCES = $(konq_listview_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/konqueror/listview/Makefile.in kdebase-3.4.1/konqueror/listview/Makefile.in
+--- kdebase-3.4.1.orig/konqueror/listview/Makefile.in 2005-05-23 18:38:29.000000000 +0200
++++ kdebase-3.4.1/konqueror/listview/Makefile.in 2005-05-24 16:28:00.056683531 +0200
@@ -291,6 +291,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -38057,53 +21418,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -990,7 +993,7 @@
- -rm -f konq_infolistviewwidget.moc konq_treeviewwidget.moc konq_textviewwidget.moc konq_listviewwidget.moc konq_listview.moc
-
- #>+ 2
--KDE_DIST=konq_infolistview.rc konq_detailedlistview.desktop konq_treeviewwidget.h konq_listviewitems.h konq_textview.rc Makefile.in konq_infolistviewitem.h konq_treeview.rc konq_listview.h konq_treeview.desktop konq_infolistview.desktop konq_treeviewitem.h konq_textviewitem.h konq_textviewwidget.h konq_textview.desktop konq_infolistviewwidget.h konq_listviewwidget.h konq_detailedlistview.rc Makefile.am
-+KDE_DIST=konq_infolistview.rc konq_detailedlistview.desktop konq_treeviewwidget.h konq_listviewitems.h konq_textview.rc Makefile.in konq_infolistviewitem.h konq_treeview.rc konq_listview.h konq_treeview.desktop konq_infolistview.desktop konq_treeviewitem.h konq_textviewitem.h konq_textviewwidget.h konq_textview.desktop konq_infolistviewwidget.h konq_listviewwidget.h Makefile.am konq_detailedlistview.rc
-
- #>+ 3
- clean-closures:
-diff -Nru kdebase-3.4.0.orig/konqueror/Makefile.in kdebase-3.4.0/konqueror/Makefile.in
---- kdebase-3.4.0.orig/konqueror/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/Makefile.in 2005-05-07 12:35:42.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -102,18 +102,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(konqueror_la_SOURCES)
- #>- DIST_SOURCES = $(konqueror_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/konqueror/Makefile.in kdebase-3.4.1/konqueror/Makefile.in
+--- kdebase-3.4.1.orig/konqueror/Makefile.in 2005-05-23 18:38:29.000000000 +0200
++++ kdebase-3.4.1/konqueror/Makefile.in 2005-05-24 16:27:59.829704033 +0200
@@ -330,6 +330,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -38135,116 +21452,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -986,7 +989,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -998,7 +1007,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -1006,7 +1015,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -1027,7 +1042,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1368,18 +1383,18 @@
- mocs: konq_mainwindow.moc
-
- #>+ 3
--konq_mainwindow_p.moc: $(srcdir)/konq_mainwindow_p.h
-- $(MOC) $(srcdir)/konq_mainwindow_p.h -o konq_mainwindow_p.moc
-+konq_actions.moc: $(srcdir)/konq_actions.h
-+ $(MOC) $(srcdir)/konq_actions.h -o konq_actions.moc
-
- #>+ 2
--mocs: konq_mainwindow_p.moc
-+mocs: konq_actions.moc
-
- #>+ 3
--konq_actions.moc: $(srcdir)/konq_actions.h
-- $(MOC) $(srcdir)/konq_actions.h -o konq_actions.moc
-+konq_mainwindow_p.moc: $(srcdir)/konq_mainwindow_p.h
-+ $(MOC) $(srcdir)/konq_mainwindow_p.h -o konq_mainwindow_p.moc
-
- #>+ 2
--mocs: konq_actions.moc
-+mocs: konq_mainwindow_p.moc
-
- #>+ 3
- konq_frame.moc: $(srcdir)/konq_frame.h
-@@ -1462,10 +1477,10 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f konq_profiledlg.moc delayedinitializer.moc konq_mainwindow.moc konq_mainwindow_p.moc konq_actions.moc konq_frame.moc konq_tabs.moc konq_misc.moc konq_browseriface.moc konq_view.moc konq_run.moc konq_viewmgr.moc konq_guiclients.moc konq_combo.moc konq_extensionmanager.moc
-+ -rm -f konq_profiledlg.moc delayedinitializer.moc konq_mainwindow.moc konq_actions.moc konq_mainwindow_p.moc konq_frame.moc konq_tabs.moc konq_misc.moc konq_browseriface.moc konq_view.moc konq_run.moc konq_viewmgr.moc konq_guiclients.moc konq_combo.moc konq_extensionmanager.moc
-
- #>+ 2
--KDE_DIST=profile_midnightcommander.desktop konqueror.kcfg profile_tabbedbrowsing.desktop DESIGN Makefile.in uninstall.desktop konq-simplebrowser.rc IDEAS konqueror.rc konq_mainwindow_p.h DESIGN_config profile_simplebrowser.desktop Home.desktop kfmclient.desktop profile_webbrowsing.desktop kfmclient_war.desktop konqfilemgr.desktop kfmclient_dir.desktop profile_filepreview.desktop kfmclient_html.desktop konqueror.desktop konqbrowser.desktop convert_kdelnk.sh profile_filemanagement.desktop profile_kde_devel.desktop konquerorsu.desktop Makefile.am
-+KDE_DIST=profile_midnightcommander.desktop konqueror.kcfg profile_tabbedbrowsing.desktop DESIGN Makefile.in uninstall.desktop IDEAS konq-simplebrowser.rc konqueror.rc konq_mainwindow_p.h DESIGN_config profile_simplebrowser.desktop Home.desktop kfmclient.desktop profile_webbrowsing.desktop kfmclient_war.desktop konqfilemgr.desktop kfmclient_dir.desktop profile_filepreview.desktop kfmclient_html.desktop konqueror.desktop konqbrowser.desktop convert_kdelnk.sh profile_filemanagement.desktop profile_kde_devel.desktop konquerorsu.desktop Makefile.am
-
- #>+ 6
- clean-idl:
-@@ -1520,7 +1535,7 @@
-
-
- #>+ 11
--libkdeinit_konqueror_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_main.cc $(srcdir)/KonquerorIface.cc $(srcdir)/KonqMainWindowIface.cc $(srcdir)/KonqViewIface.cc $(srcdir)/konq_guiclients.cc $(srcdir)/konq_run.cc $(srcdir)/konq_view.cc $(srcdir)/konq_viewmgr.cc $(srcdir)/konq_misc.cc $(srcdir)/konq_frame.cc $(srcdir)/konq_tabs.cc $(srcdir)/konq_actions.cc $(srcdir)/konq_profiledlg.cc $(srcdir)/konq_factory.cc $(srcdir)/konq_combo.cc $(srcdir)/konq_browseriface.cc $(srcdir)/delayedinitializer.cc $(srcdir)/konq_mainwindow.cc $(srcdir)/konq_extensionmanager.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc konq_profiledlg.moc delayedinitializer.moc konq_mainwindow.moc konq_actions.moc konq_mainwindow_p.moc konq_frame.moc konq_browseriface.moc konq_tabs.moc konq_misc.moc konq_run.moc konq_view.moc konq_viewmgr.moc konq_guiclients.moc konq_extensionmanager.moc konq_combo.moc
-+libkdeinit_konqueror_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_main.cc $(srcdir)/KonquerorIface.cc $(srcdir)/KonqMainWindowIface.cc $(srcdir)/KonqViewIface.cc $(srcdir)/konq_guiclients.cc $(srcdir)/konq_run.cc $(srcdir)/konq_view.cc $(srcdir)/konq_viewmgr.cc $(srcdir)/konq_misc.cc $(srcdir)/konq_frame.cc $(srcdir)/konq_tabs.cc $(srcdir)/konq_actions.cc $(srcdir)/konq_profiledlg.cc $(srcdir)/konq_factory.cc $(srcdir)/konq_combo.cc $(srcdir)/konq_browseriface.cc $(srcdir)/delayedinitializer.cc $(srcdir)/konq_mainwindow.cc $(srcdir)/konq_extensionmanager.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc konq_profiledlg.moc delayedinitializer.moc konq_mainwindow.moc konq_mainwindow_p.moc konq_actions.moc konq_frame.moc konq_browseriface.moc konq_tabs.moc konq_misc.moc konq_run.moc konq_view.moc konq_viewmgr.moc konq_guiclients.moc konq_extensionmanager.moc konq_combo.moc
- @echo 'creating libkdeinit_konqueror_la.all_cc.cc ...'; \
- rm -f libkdeinit_konqueror_la.all_cc.files libkdeinit_konqueror_la.all_cc.final; \
- echo "#define KDE_USE_FINAL 1" >> libkdeinit_konqueror_la.all_cc.final; \
-diff -Nru kdebase-3.4.0.orig/konqueror/pics/actions/Makefile.in kdebase-3.4.0/konqueror/pics/actions/Makefile.in
---- kdebase-3.4.0.orig/konqueror/pics/actions/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/pics/actions/Makefile.in 2005-05-07 12:35:44.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/konqueror/pics/actions/Makefile.in kdebase-3.4.1/konqueror/pics/actions/Makefile.in
+--- kdebase-3.4.1.orig/konqueror/pics/actions/Makefile.in 2005-05-23 18:38:29.000000000 +0200
++++ kdebase-3.4.1/konqueror/pics/actions/Makefile.in 2005-05-24 16:28:00.083681093 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -38276,21 +21486,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/konqueror/pics/indicators/Makefile.in kdebase-3.4.0/konqueror/pics/indicators/Makefile.in
---- kdebase-3.4.0.orig/konqueror/pics/indicators/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/pics/indicators/Makefile.in 2005-05-07 12:35:44.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/konqueror/pics/indicators/Makefile.in kdebase-3.4.1/konqueror/pics/indicators/Makefile.in
+--- kdebase-3.4.1.orig/konqueror/pics/indicators/Makefile.in 2005-05-23 18:38:29.000000000 +0200
++++ kdebase-3.4.1/konqueror/pics/indicators/Makefile.in 2005-05-24 16:28:00.095680009 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -38322,21 +21520,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/konqueror/pics/Makefile.in kdebase-3.4.0/konqueror/pics/Makefile.in
---- kdebase-3.4.0.orig/konqueror/pics/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/pics/Makefile.in 2005-05-07 12:35:43.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/konqueror/pics/Makefile.in kdebase-3.4.1/konqueror/pics/Makefile.in
+--- kdebase-3.4.1.orig/konqueror/pics/Makefile.in 2005-05-23 18:38:29.000000000 +0200
++++ kdebase-3.4.1/konqueror/pics/Makefile.in 2005-05-24 16:28:00.070682267 +0200
@@ -251,6 +251,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -38368,129 +21554,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -600,7 +603,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -612,7 +621,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -620,7 +629,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -641,7 +656,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -866,39 +881,39 @@
-
- #>+ 35
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-- $(INSTALL_DATA) $(srcdir)/cr128-app-konqueror.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/konqueror.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kfm.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfm.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-konqueror.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/konqueror.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
-- $(INSTALL_DATA) $(srcdir)/cr22-app-konqueror.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/konqueror.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kfm.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfm.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-konqueror.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/konqueror.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kfm.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfm.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-konqueror.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/konqueror.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-konqueror.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/konqueror.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- $(INSTALL_DATA) $(srcdir)/cr64-app-kfm.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kfm.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kfm.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfm.png
- $(INSTALL_DATA) $(srcdir)/cr64-app-konqueror.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/konqueror.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-konqueror.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/konqueror.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kfm.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfm.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-kfm.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kfm.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-konqueror.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/konqueror.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kfm.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfm.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
- $(INSTALL_DATA) $(srcdir)/crsc-app-konqueror.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/konqueror.svgz
-- $(INSTALL_DATA) $(srcdir)/cr22-app-kfm.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kfm.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-konqueror.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/konqueror.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/konqueror.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfm.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/konqueror.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/konqueror.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfm.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/konqueror.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfm.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/konqueror.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/konqueror.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kfm.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfm.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/konqueror.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/konqueror.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/konqueror.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfm.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kfm.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/konqueror.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfm.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/konqueror.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/konqueror.png
-
- #>+ 15
- force-reedit:
-diff -Nru kdebase-3.4.0.orig/konqueror/pics/tiles/Makefile.in kdebase-3.4.0/konqueror/pics/tiles/Makefile.in
---- kdebase-3.4.0.orig/konqueror/pics/tiles/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/pics/tiles/Makefile.in 2005-05-07 12:35:44.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/konqueror/pics/tiles/Makefile.in kdebase-3.4.1/konqueror/pics/tiles/Makefile.in
+--- kdebase-3.4.1.orig/konqueror/pics/tiles/Makefile.in 2005-05-23 18:38:29.000000000 +0200
++++ kdebase-3.4.1/konqueror/pics/tiles/Makefile.in 2005-05-24 16:28:00.109678745 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -38522,44 +21588,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/konqueror/preloader/Makefile.in kdebase-3.4.0/konqueror/preloader/Makefile.in
---- kdebase-3.4.0.orig/konqueror/preloader/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/preloader/Makefile.in 2005-05-07 12:35:44.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -79,18 +79,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kded_konqy_preloader_la_SOURCES)
- DIST_SOURCES = $(kded_konqy_preloader_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/konqueror/preloader/Makefile.in kdebase-3.4.1/konqueror/preloader/Makefile.in
+--- kdebase-3.4.1.orig/konqueror/preloader/Makefile.in 2005-05-23 18:38:29.000000000 +0200
++++ kdebase-3.4.1/konqueror/preloader/Makefile.in 2005-05-24 16:28:00.130676848 +0200
@@ -285,6 +285,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -38591,21 +21622,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/konqueror/quickprint/Makefile.in kdebase-3.4.0/konqueror/quickprint/Makefile.in
---- kdebase-3.4.0.orig/konqueror/quickprint/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/quickprint/Makefile.in 2005-05-07 12:35:44.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/konqueror/quickprint/Makefile.in kdebase-3.4.1/konqueror/quickprint/Makefile.in
+--- kdebase-3.4.1.orig/konqueror/quickprint/Makefile.in 2005-05-23 18:38:29.000000000 +0200
++++ kdebase-3.4.1/konqueror/quickprint/Makefile.in 2005-05-24 16:28:00.144675583 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -38637,53 +21656,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -740,7 +743,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=text-perl-print.desktop text-diff-print.desktop text-c-print.desktop text-python-print.desktop text-pas-print.desktop text-c++-print.desktop text-makefile-print.desktop Makefile.in text-ch-print.desktop text-print.desktop text-html-print.desktop text-tcl-print.desktop text-c++h-print.desktop text-css-print.desktop text-ada-print.desktop text-tex-print.desktop text-log-print.desktop text-java-print.desktop text-xml-print.desktop text-xslt-print.desktop Makefile.am
-+KDE_DIST=text-perl-print.desktop text-c-print.desktop text-diff-print.desktop text-python-print.desktop text-c++-print.desktop text-pas-print.desktop text-makefile-print.desktop Makefile.in text-ch-print.desktop text-print.desktop text-html-print.desktop text-tcl-print.desktop text-c++h-print.desktop text-ada-print.desktop text-css-print.desktop text-tex-print.desktop text-log-print.desktop text-java-print.desktop text-xml-print.desktop text-xslt-print.desktop Makefile.am
-
- #>+ 2
- docs-am:
-diff -Nru kdebase-3.4.0.orig/konqueror/remoteencodingplugin/Makefile.in kdebase-3.4.0/konqueror/remoteencodingplugin/Makefile.in
---- kdebase-3.4.0.orig/konqueror/remoteencodingplugin/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/remoteencodingplugin/Makefile.in 2005-05-07 12:35:44.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -75,18 +75,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(konq_remoteencoding_la_SOURCES)
- DIST_SOURCES = $(konq_remoteencoding_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/konqueror/remoteencodingplugin/Makefile.in kdebase-3.4.1/konqueror/remoteencodingplugin/Makefile.in
+--- kdebase-3.4.1.orig/konqueror/remoteencodingplugin/Makefile.in 2005-05-23 18:38:29.000000000 +0200
++++ kdebase-3.4.1/konqueror/remoteencodingplugin/Makefile.in 2005-05-24 16:28:00.163673867 +0200
@@ -281,6 +281,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -38715,44 +21690,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/konqueror/shellcmdplugin/Makefile.in kdebase-3.4.0/konqueror/shellcmdplugin/Makefile.in
---- kdebase-3.4.0.orig/konqueror/shellcmdplugin/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/shellcmdplugin/Makefile.in 2005-05-07 12:35:44.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -80,18 +80,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(konq_shellcmdplugin_la_SOURCES)
- DIST_SOURCES = $(konq_shellcmdplugin_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/konqueror/shellcmdplugin/Makefile.in kdebase-3.4.1/konqueror/shellcmdplugin/Makefile.in
+--- kdebase-3.4.1.orig/konqueror/shellcmdplugin/Makefile.in 2005-05-23 18:38:29.000000000 +0200
++++ kdebase-3.4.1/konqueror/shellcmdplugin/Makefile.in 2005-05-24 16:28:00.186671790 +0200
@@ -286,6 +286,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -38784,44 +21724,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/konqueror/sidebar/Makefile.in kdebase-3.4.0/konqueror/sidebar/Makefile.in
---- kdebase-3.4.0.orig/konqueror/sidebar/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konqueror/sidebar/Makefile.in 2005-05-07 12:35:44.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -98,18 +98,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(konq_sidebar_la_SOURCES) \
- $(libkonqsidebarplugin_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/konqueror/sidebar/Makefile.in kdebase-3.4.1/konqueror/sidebar/Makefile.in
+--- kdebase-3.4.1.orig/konqueror/sidebar/Makefile.in 2005-05-23 18:38:29.000000000 +0200
++++ kdebase-3.4.1/konqueror/sidebar/Makefile.in 2005-05-24 16:28:00.217668990 +0200
@@ -325,6 +325,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -38853,92 +21758,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -910,7 +913,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -922,7 +931,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -930,7 +939,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -951,7 +966,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/konqueror/sidebar/test/Makefile.in kdebase-3.4.0/konqueror/sidebar/test/Makefile.in
---- kdebase-3.4.0.orig/konqueror/sidebar/test/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konqueror/sidebar/test/Makefile.in 2005-05-07 12:35:44.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -78,18 +78,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(konq_sidebartest_la_SOURCES)
- DIST_SOURCES = $(konq_sidebartest_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/konqueror/sidebar/test/Makefile.in kdebase-3.4.1/konqueror/sidebar/test/Makefile.in
+--- kdebase-3.4.1.orig/konqueror/sidebar/test/Makefile.in 2005-05-23 18:38:29.000000000 +0200
++++ kdebase-3.4.1/konqueror/sidebar/test/Makefile.in 2005-05-24 16:28:00.239667003 +0200
@@ -298,6 +298,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -38970,92 +21792,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -747,7 +750,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -759,7 +768,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -767,7 +776,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -788,7 +803,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/konqueror/sidebar/trees/bookmark_module/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/bookmark_module/Makefile.in
---- kdebase-3.4.0.orig/konqueror/sidebar/trees/bookmark_module/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konqueror/sidebar/trees/bookmark_module/Makefile.in 2005-05-07 12:35:44.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -79,18 +79,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(konq_sidebartree_bookmarks_la_SOURCES)
- DIST_SOURCES = $(konq_sidebartree_bookmarks_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/konqueror/sidebar/trees/bookmark_module/Makefile.in kdebase-3.4.1/konqueror/sidebar/trees/bookmark_module/Makefile.in
+--- kdebase-3.4.1.orig/konqueror/sidebar/trees/bookmark_module/Makefile.in 2005-05-23 18:38:29.000000000 +0200
++++ kdebase-3.4.1/konqueror/sidebar/trees/bookmark_module/Makefile.in 2005-05-24 16:28:00.309660681 +0200
@@ -282,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -39087,44 +21826,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/konqueror/sidebar/trees/dirtree_module/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/dirtree_module/Makefile.in
---- kdebase-3.4.0.orig/konqueror/sidebar/trees/dirtree_module/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konqueror/sidebar/trees/dirtree_module/Makefile.in 2005-05-07 12:35:45.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -79,18 +79,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(konq_sidebartree_dirtree_la_SOURCES)
- DIST_SOURCES = $(konq_sidebartree_dirtree_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/konqueror/sidebar/trees/dirtree_module/Makefile.in kdebase-3.4.1/konqueror/sidebar/trees/dirtree_module/Makefile.in
+--- kdebase-3.4.1.orig/konqueror/sidebar/trees/dirtree_module/Makefile.in 2005-05-23 18:38:29.000000000 +0200
++++ kdebase-3.4.1/konqueror/sidebar/trees/dirtree_module/Makefile.in 2005-05-24 16:28:00.335658333 +0200
@@ -282,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -39156,44 +21860,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/konqueror/sidebar/trees/history_module/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/history_module/Makefile.in
---- kdebase-3.4.0.orig/konqueror/sidebar/trees/history_module/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konqueror/sidebar/trees/history_module/Makefile.in 2005-05-07 12:35:45.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -89,18 +89,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_history_la_SOURCES) \
- $(konq_sidebartree_history_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/konqueror/sidebar/trees/history_module/Makefile.in kdebase-3.4.1/konqueror/sidebar/trees/history_module/Makefile.in
+--- kdebase-3.4.1.orig/konqueror/sidebar/trees/history_module/Makefile.in 2005-05-23 18:38:29.000000000 +0200
++++ kdebase-3.4.1/konqueror/sidebar/trees/history_module/Makefile.in 2005-05-24 16:28:00.364655714 +0200
@@ -296,6 +296,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -39225,21 +21894,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/konqueror/sidebar/trees/init/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/init/Makefile.in
---- kdebase-3.4.0.orig/konqueror/sidebar/trees/init/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konqueror/sidebar/trees/init/Makefile.in 2005-05-07 12:35:45.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/konqueror/sidebar/trees/init/Makefile.in kdebase-3.4.1/konqueror/sidebar/trees/init/Makefile.in
+--- kdebase-3.4.1.orig/konqueror/sidebar/trees/init/Makefile.in 2005-05-23 18:38:29.000000000 +0200
++++ kdebase-3.4.1/konqueror/sidebar/trees/init/Makefile.in 2005-05-24 16:28:00.379654359 +0200
@@ -268,6 +268,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -39271,69 +21928,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -696,7 +699,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -708,7 +717,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -716,7 +725,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -737,7 +752,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/konqueror/sidebar/trees/init/remote/ftp/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/init/remote/ftp/Makefile.in
---- kdebase-3.4.0.orig/konqueror/sidebar/trees/init/remote/ftp/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konqueror/sidebar/trees/init/remote/ftp/Makefile.in 2005-05-07 12:35:45.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/konqueror/sidebar/trees/init/remote/ftp/Makefile.in kdebase-3.4.1/konqueror/sidebar/trees/init/remote/ftp/Makefile.in
+--- kdebase-3.4.1.orig/konqueror/sidebar/trees/init/remote/ftp/Makefile.in 2005-05-23 18:38:30.000000000 +0200
++++ kdebase-3.4.1/konqueror/sidebar/trees/init/remote/ftp/Makefile.in 2005-05-24 16:28:00.406651921 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -39365,21 +21962,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/konqueror/sidebar/trees/init/remote/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/init/remote/Makefile.in
---- kdebase-3.4.0.orig/konqueror/sidebar/trees/init/remote/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konqueror/sidebar/trees/init/remote/Makefile.in 2005-05-07 12:35:45.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/konqueror/sidebar/trees/init/remote/Makefile.in kdebase-3.4.1/konqueror/sidebar/trees/init/remote/Makefile.in
+--- kdebase-3.4.1.orig/konqueror/sidebar/trees/init/remote/Makefile.in 2005-05-23 18:38:29.000000000 +0200
++++ kdebase-3.4.1/konqueror/sidebar/trees/init/remote/Makefile.in 2005-05-24 16:28:00.393653095 +0200
@@ -261,6 +261,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -39411,69 +21996,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -628,7 +631,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -640,7 +649,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -648,7 +657,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -669,7 +684,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/konqueror/sidebar/trees/init/remote/web/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/init/remote/web/Makefile.in
---- kdebase-3.4.0.orig/konqueror/sidebar/trees/init/remote/web/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konqueror/sidebar/trees/init/remote/web/Makefile.in 2005-05-07 12:35:45.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/konqueror/sidebar/trees/init/remote/web/Makefile.in kdebase-3.4.1/konqueror/sidebar/trees/init/remote/web/Makefile.in
+--- kdebase-3.4.1.orig/konqueror/sidebar/trees/init/remote/web/Makefile.in 2005-05-23 18:38:30.000000000 +0200
++++ kdebase-3.4.1/konqueror/sidebar/trees/init/remote/web/Makefile.in 2005-05-24 16:28:00.419650746 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -39505,21 +22030,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/konqueror/sidebar/trees/init/services/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/init/services/Makefile.in
---- kdebase-3.4.0.orig/konqueror/sidebar/trees/init/services/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konqueror/sidebar/trees/init/services/Makefile.in 2005-05-07 12:35:45.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/konqueror/sidebar/trees/init/services/Makefile.in kdebase-3.4.1/konqueror/sidebar/trees/init/services/Makefile.in
+--- kdebase-3.4.1.orig/konqueror/sidebar/trees/init/services/Makefile.in 2005-05-23 18:38:30.000000000 +0200
++++ kdebase-3.4.1/konqueror/sidebar/trees/init/services/Makefile.in 2005-05-24 16:28:00.433649482 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -39551,44 +22064,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/konqueror/sidebar/trees/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/Makefile.in
---- kdebase-3.4.0.orig/konqueror/sidebar/trees/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konqueror/sidebar/trees/Makefile.in 2005-05-07 12:35:44.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -85,18 +85,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(konqsidebar_tree_la_SOURCES) \
- $(libkonq_sidebar_tree_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/konqueror/sidebar/trees/Makefile.in kdebase-3.4.1/konqueror/sidebar/trees/Makefile.in
+--- kdebase-3.4.1.orig/konqueror/sidebar/trees/Makefile.in 2005-05-23 18:38:29.000000000 +0200
++++ kdebase-3.4.1/konqueror/sidebar/trees/Makefile.in 2005-05-24 16:28:00.283663030 +0200
@@ -304,6 +304,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -39620,92 +22098,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -742,7 +745,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -754,7 +763,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -762,7 +771,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -783,7 +798,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/konqueror/sidebar/web_module/Makefile.in kdebase-3.4.0/konqueror/sidebar/web_module/Makefile.in
---- kdebase-3.4.0.orig/konqueror/sidebar/web_module/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konqueror/sidebar/web_module/Makefile.in 2005-05-07 12:35:46.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(konqsidebar_web_la_SOURCES)
- DIST_SOURCES = $(konqsidebar_web_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/konqueror/sidebar/web_module/Makefile.in kdebase-3.4.1/konqueror/sidebar/web_module/Makefile.in
+--- kdebase-3.4.1.orig/konqueror/sidebar/web_module/Makefile.in 2005-05-23 18:38:30.000000000 +0200
++++ kdebase-3.4.1/konqueror/sidebar/web_module/Makefile.in 2005-05-24 16:28:00.452647766 +0200
@@ -283,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -39737,21 +22132,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/konsole/doc/Makefile.in kdebase-3.4.0/konsole/doc/Makefile.in
---- kdebase-3.4.0.orig/konsole/doc/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konsole/doc/Makefile.in 2005-05-07 12:35:46.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/konsole/doc/Makefile.in kdebase-3.4.1/konsole/doc/Makefile.in
+--- kdebase-3.4.1.orig/konsole/doc/Makefile.in 2005-05-23 18:38:30.000000000 +0200
++++ kdebase-3.4.1/konsole/doc/Makefile.in 2005-05-24 16:28:00.474645779 +0200
@@ -251,6 +251,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -39783,69 +22166,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -600,7 +603,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -612,7 +621,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -620,7 +629,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -641,7 +656,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/konsole/doc/VT100/Makefile.in kdebase-3.4.0/konsole/doc/VT100/Makefile.in
---- kdebase-3.4.0.orig/konsole/doc/VT100/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konsole/doc/VT100/Makefile.in 2005-05-07 12:35:46.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/konsole/doc/VT100/Makefile.in kdebase-3.4.1/konsole/doc/VT100/Makefile.in
+--- kdebase-3.4.1.orig/konsole/doc/VT100/Makefile.in 2005-05-23 18:38:30.000000000 +0200
++++ kdebase-3.4.1/konsole/doc/VT100/Makefile.in 2005-05-24 16:28:00.484644876 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -39877,21 +22200,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/konsole/fonts/Makefile.in kdebase-3.4.0/konsole/fonts/Makefile.in
---- kdebase-3.4.0.orig/konsole/fonts/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konsole/fonts/Makefile.in 2005-05-07 12:35:47.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/konsole/fonts/Makefile.in kdebase-3.4.1/konsole/fonts/Makefile.in
+--- kdebase-3.4.1.orig/konsole/fonts/Makefile.in 2005-05-23 18:38:30.000000000 +0200
++++ kdebase-3.4.1/konsole/fonts/Makefile.in 2005-05-24 16:28:00.492644153 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -39923,44 +22234,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/konsole/konsole/Makefile.in kdebase-3.4.0/konsole/konsole/Makefile.in
---- kdebase-3.4.0.orig/konsole/konsole/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/konsole/konsole/Makefile.in 2005-05-07 12:35:48.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -131,18 +131,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kded_kwrited_la_SOURCES) $(konsole_la_SOURCES) \
- $(libkonsolepart_la_SOURCES) $(fontembedder_SOURCES)
+diff -rua kdebase-3.4.1.orig/konsole/konsole/Makefile.in kdebase-3.4.1/konsole/konsole/Makefile.in
+--- kdebase-3.4.1.orig/konsole/konsole/Makefile.in 2005-05-23 18:38:30.000000000 +0200
++++ kdebase-3.4.1/konsole/konsole/Makefile.in 2005-05-24 16:28:00.798616517 +0200
@@ -342,6 +342,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -39992,108 +22268,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1224,18 +1227,18 @@
- mocs: TEWidget.moc
-
- #>+ 3
--konsolebookmarkhandler.moc: $(srcdir)/konsolebookmarkhandler.h
-- $(MOC) $(srcdir)/konsolebookmarkhandler.h -o konsolebookmarkhandler.moc
-+TEmulation.moc: $(srcdir)/TEmulation.h
-+ $(MOC) $(srcdir)/TEmulation.h -o TEmulation.moc
-
- #>+ 2
--mocs: konsolebookmarkhandler.moc
-+mocs: TEmulation.moc
-
- #>+ 3
--TEmulation.moc: $(srcdir)/TEmulation.h
-- $(MOC) $(srcdir)/TEmulation.h -o TEmulation.moc
-+konsolebookmarkhandler.moc: $(srcdir)/konsolebookmarkhandler.h
-+ $(MOC) $(srcdir)/konsolebookmarkhandler.h -o konsolebookmarkhandler.moc
-
- #>+ 2
--mocs: TEmulation.moc
-+mocs: konsolebookmarkhandler.moc
-
- #>+ 3
- konsole.moc: $(srcdir)/konsole.h
-@@ -1259,18 +1262,18 @@
- mocs: zmodem_dialog.moc
-
- #>+ 3
--session.moc: $(srcdir)/session.h
-- $(MOC) $(srcdir)/session.h -o session.moc
-+TEmuVt102.moc: $(srcdir)/TEmuVt102.h
-+ $(MOC) $(srcdir)/TEmuVt102.h -o TEmuVt102.moc
-
- #>+ 2
--mocs: session.moc
-+mocs: TEmuVt102.moc
-
- #>+ 3
--TEmuVt102.moc: $(srcdir)/TEmuVt102.h
-- $(MOC) $(srcdir)/TEmuVt102.h -o TEmuVt102.moc
-+session.moc: $(srcdir)/session.h
-+ $(MOC) $(srcdir)/session.h -o session.moc
-
- #>+ 2
--mocs: TEmuVt102.moc
-+mocs: session.moc
-
- #>+ 3
- konsole_part.moc: $(srcdir)/konsole_part.h
-@@ -1310,7 +1313,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f kwrited.moc TEWidget.moc konsolebookmarkhandler.moc TEmulation.moc konsole.moc konsolebookmarkmenu.moc zmodem_dialog.moc session.moc TEmuVt102.moc konsole_part.moc printsettings.moc TEPty.moc
-+ -rm -f kwrited.moc TEWidget.moc TEmulation.moc konsolebookmarkhandler.moc konsole.moc konsolebookmarkmenu.moc zmodem_dialog.moc TEmuVt102.moc session.moc konsole_part.moc printsettings.moc TEPty.moc
-
- #>+ 2
- KDE_DIST=x-konsole.desktop sessioniface.h MakeDefaults Makefile.in konsole_part.h konsoleiface.h linefont.src Makefile.am
-@@ -1370,7 +1373,7 @@
-
-
- #>+ 11
--libkdeinit_konsole_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/main.cpp $(srcdir)/konsole.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp $(srcdir)/konsole_wcwidth.cpp $(srcdir)/konsolebookmarkhandler.cpp $(srcdir)/konsolebookmarkmenu.cpp $(srcdir)/zmodem_dialog.cpp $(srcdir)/printsettings.cpp konsoleiface_skel.cpp sessioniface_skel.cpp TEWidget.moc TEmulation.moc konsolebookmarkhandler.moc konsole.moc konsolebookmarkmenu.moc zmodem_dialog.moc session.moc TEmuVt102.moc TEPty.moc printsettings.moc
-+libkdeinit_konsole_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/main.cpp $(srcdir)/konsole.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp $(srcdir)/konsole_wcwidth.cpp $(srcdir)/konsolebookmarkhandler.cpp $(srcdir)/konsolebookmarkmenu.cpp $(srcdir)/zmodem_dialog.cpp $(srcdir)/printsettings.cpp konsoleiface_skel.cpp sessioniface_skel.cpp TEWidget.moc konsolebookmarkhandler.moc TEmulation.moc konsole.moc konsolebookmarkmenu.moc zmodem_dialog.moc TEmuVt102.moc session.moc TEPty.moc printsettings.moc
- @echo 'creating libkdeinit_konsole_la.all_cpp.cpp ...'; \
- rm -f libkdeinit_konsole_la.all_cpp.files libkdeinit_konsole_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libkdeinit_konsole_la.all_cpp.final; \
-@@ -1394,7 +1397,7 @@
- rm -f kded_kwrited_la.all_cpp.final kded_kwrited_la.all_cpp.files
-
- #>+ 11
--libkonsolepart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/konsole_part.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/zmodem_dialog.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/konsole_wcwidth.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp konsoleiface_skel.cpp sessioniface_skel.cpp TEWidget.moc TEmulation.moc zmodem_dialog.moc session.moc TEmuVt102.moc konsole_part.moc TEPty.moc
-+libkonsolepart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/konsole_part.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/zmodem_dialog.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/konsole_wcwidth.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp konsoleiface_skel.cpp sessioniface_skel.cpp TEWidget.moc TEmulation.moc zmodem_dialog.moc TEmuVt102.moc session.moc konsole_part.moc TEPty.moc
- @echo 'creating libkonsolepart_la.all_cpp.cpp ...'; \
- rm -f libkonsolepart_la.all_cpp.files libkonsolepart_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libkonsolepart_la.all_cpp.final; \
-@@ -1452,8 +1455,8 @@
- @rm -f konsole$(EXEEXT)
- $(CXXLINK) $(konsole_LDFLAGS) $(konsole_OBJECTS) $(konsole_LDADD) $(LIBS)
-
--TEmulation.lo: TEmulation.moc
- konsolebookmarkhandler.lo: konsolebookmarkhandler.moc
-+TEmulation.lo: TEmulation.moc
- konsole_part.o: konsole_part.moc
- konsolebookmarkhandler.o: konsolebookmarkhandler.moc
- nmcheck-am: nmcheck
-diff -Nru kdebase-3.4.0.orig/konsole/Makefile.in kdebase-3.4.0/konsole/Makefile.in
---- kdebase-3.4.0.orig/konsole/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konsole/Makefile.in 2005-05-07 12:35:46.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/konsole/Makefile.in kdebase-3.4.1/konsole/Makefile.in
+--- kdebase-3.4.1.orig/konsole/Makefile.in 2005-05-23 18:38:30.000000000 +0200
++++ kdebase-3.4.1/konsole/Makefile.in 2005-05-24 16:28:00.464646682 +0200
@@ -278,6 +278,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -40125,69 +22302,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-updateSCRIPTS: $(update_SCRIPTS)
@$(NORMAL_INSTALL)
-@@ -779,7 +782,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -791,7 +800,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -799,7 +808,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -820,7 +835,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/konsole/other/icons/Makefile.in kdebase-3.4.0/konsole/other/icons/Makefile.in
---- kdebase-3.4.0.orig/konsole/other/icons/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/konsole/other/icons/Makefile.in 2005-05-07 12:35:48.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/konsole/other/icons/Makefile.in kdebase-3.4.1/konsole/other/icons/Makefile.in
+--- kdebase-3.4.1.orig/konsole/other/icons/Makefile.in 2005-05-23 18:38:30.000000000 +0200
++++ kdebase-3.4.1/konsole/other/icons/Makefile.in 2005-05-24 16:28:00.835613175 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -40219,62 +22336,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -707,30 +710,30 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=cr32-action-opentermred.png cr22-action-opentermblue.png Makefile.in cr16-action-opentermblue.png cr22-action-opentermred.png cr32-action-opentermblue.png cr16-action-opentermred.png Makefile.am
-+KDE_DIST=cr22-action-opentermblue.png cr32-action-opentermred.png Makefile.in cr16-action-opentermblue.png cr22-action-opentermred.png cr32-action-opentermblue.png cr16-action-opentermred.png Makefile.am
-
- #>+ 2
- docs-am:
-
- #>+ 19
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions
-- $(INSTALL_DATA) $(srcdir)/cr16-action-opentermblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermblue.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-opentermred.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermred.png
- $(mkinstalldirs) $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions
-- $(INSTALL_DATA) $(srcdir)/cr22-action-opentermblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermblue.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-opentermred.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermred.png
- $(mkinstalldirs) $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions
-- $(INSTALL_DATA) $(srcdir)/cr32-action-opentermblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermblue.png
- $(INSTALL_DATA) $(srcdir)/cr32-action-opentermred.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermred.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-opentermblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermblue.png
-+ $(mkinstalldirs) $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-opentermred.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermred.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-opentermblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermblue.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-opentermblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermblue.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermblue.png
-- -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermred.png
-- -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermblue.png
- -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermred.png
-- -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermblue.png
- -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermred.png
-+ -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermblue.png
-+ -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermred.png
-+ -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermblue.png
-+ -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermblue.png
-
- #>+ 15
- force-reedit:
-diff -Nru kdebase-3.4.0.orig/konsole/other/Makefile.in kdebase-3.4.0/konsole/other/Makefile.in
---- kdebase-3.4.0.orig/konsole/other/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/konsole/other/Makefile.in 2005-05-07 12:35:48.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/konsole/other/Makefile.in kdebase-3.4.1/konsole/other/Makefile.in
+--- kdebase-3.4.1.orig/konsole/other/Makefile.in 2005-05-23 18:38:30.000000000 +0200
++++ kdebase-3.4.1/konsole/other/Makefile.in 2005-05-24 16:28:00.819614620 +0200
@@ -263,6 +263,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -40306,134 +22370,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -661,7 +664,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -673,7 +682,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -681,7 +690,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -702,7 +717,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -934,29 +949,29 @@
-
- #>+ 25
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-- $(INSTALL_DATA) $(srcdir)/cr128-app-konsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/konsole.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-konsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/konsole.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-konsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/konsole.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-konsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/konsole.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-- $(INSTALL_DATA) $(srcdir)/cr64-app-konsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/konsole.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-- $(INSTALL_DATA) $(srcdir)/crsc-app-konsole.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/konsole.svgz
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-konsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/konsole.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
- $(INSTALL_DATA) $(srcdir)/cr22-app-konsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/konsole.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-konsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/konsole.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-konsole.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/konsole.svgz
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-konsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/konsole.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/konsole.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/konsole.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/konsole.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/konsole.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/konsole.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/konsole.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/konsole.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/konsole.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/konsole.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/konsole.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/konsole.png
-
- #>+ 15
- force-reedit:
-diff -Nru kdebase-3.4.0.orig/kpager/Makefile.in kdebase-3.4.0/kpager/Makefile.in
---- kdebase-3.4.0.orig/kpager/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/kpager/Makefile.in 2005-05-07 12:35:48.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -74,18 +74,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kpager_SOURCES)
- DIST_SOURCES = $(kpager_SOURCES)
+diff -rua kdebase-3.4.1.orig/kpager/Makefile.in kdebase-3.4.1/kpager/Makefile.in
+--- kdebase-3.4.1.orig/kpager/Makefile.in 2005-05-23 18:38:30.000000000 +0200
++++ kdebase-3.4.1/kpager/Makefile.in 2005-05-24 16:28:00.868610194 +0200
@@ -285,6 +285,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -40465,64 +22404,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -953,16 +956,16 @@
-
- #>+ 13
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kpager.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpager.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-kpager.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpager.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kpager.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpager.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-kpager.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpager.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpager.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpager.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpager.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpager.png
-
- #>+ 15
-diff -Nru kdebase-3.4.0.orig/kpersonalizer/Makefile.in kdebase-3.4.0/kpersonalizer/Makefile.in
---- kdebase-3.4.0.orig/kpersonalizer/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/kpersonalizer/Makefile.in 2005-05-07 12:35:48.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -78,18 +78,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kpersonalizer_SOURCES)
- DIST_SOURCES = $(kpersonalizer_SOURCES)
+diff -rua kdebase-3.4.1.orig/kpersonalizer/Makefile.in kdebase-3.4.1/kpersonalizer/Makefile.in
+--- kdebase-3.4.1.orig/kpersonalizer/Makefile.in 2005-05-23 18:38:30.000000000 +0200
++++ kdebase-3.4.1/kpersonalizer/Makefile.in 2005-05-24 16:28:00.922605317 +0200
@@ -303,6 +303,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -40554,69 +22438,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -774,7 +777,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -786,7 +795,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -794,7 +803,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -815,7 +830,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kpersonalizer/pics/Makefile.in kdebase-3.4.0/kpersonalizer/pics/Makefile.in
---- kdebase-3.4.0.orig/kpersonalizer/pics/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/kpersonalizer/pics/Makefile.in 2005-05-07 12:35:48.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kpersonalizer/pics/Makefile.in kdebase-3.4.1/kpersonalizer/pics/Makefile.in
+--- kdebase-3.4.1.orig/kpersonalizer/pics/Makefile.in 2005-05-23 18:38:30.000000000 +0200
++++ kdebase-3.4.1/kpersonalizer/pics/Makefile.in 2005-05-24 16:28:00.935604143 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -40648,44 +22472,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kreadconfig/Makefile.in kdebase-3.4.0/kreadconfig/Makefile.in
---- kdebase-3.4.0.orig/kreadconfig/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/kreadconfig/Makefile.in 2005-05-07 12:35:48.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -75,18 +75,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kreadconfig_SOURCES) $(kwriteconfig_SOURCES)
- DIST_SOURCES = $(kreadconfig_SOURCES) $(kwriteconfig_SOURCES)
+diff -rua kdebase-3.4.1.orig/kreadconfig/Makefile.in kdebase-3.4.1/kreadconfig/Makefile.in
+--- kdebase-3.4.1.orig/kreadconfig/Makefile.in 2005-05-23 18:38:30.000000000 +0200
++++ kdebase-3.4.1/kreadconfig/Makefile.in 2005-05-24 16:28:00.954602427 +0200
@@ -278,6 +278,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -40717,44 +22506,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kscreensaver/Makefile.in kdebase-3.4.0/kscreensaver/Makefile.in
---- kdebase-3.4.0.orig/kscreensaver/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/kscreensaver/Makefile.in 2005-05-07 12:35:48.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -78,18 +78,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kblankscrn_kss_SOURCES) $(krandom_kss_SOURCES)
- DIST_SOURCES = $(kblankscrn_kss_SOURCES) $(krandom_kss_SOURCES)
+diff -rua kdebase-3.4.1.orig/kscreensaver/Makefile.in kdebase-3.4.1/kscreensaver/Makefile.in
+--- kdebase-3.4.1.orig/kscreensaver/Makefile.in 2005-05-23 18:38:30.000000000 +0200
++++ kdebase-3.4.1/kscreensaver/Makefile.in 2005-05-24 16:28:00.973600711 +0200
@@ -289,6 +289,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -40786,44 +22540,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/ksmserver/Makefile.in kdebase-3.4.0/ksmserver/Makefile.in
---- kdebase-3.4.0.orig/ksmserver/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksmserver/Makefile.in 2005-05-07 12:35:49.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -120,18 +120,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(ksmserver_la_SOURCES) $(testsh_SOURCES)
- #>- DIST_SOURCES = $(ksmserver_la_SOURCES) $(testsh_SOURCES)
+diff -rua kdebase-3.4.1.orig/ksmserver/Makefile.in kdebase-3.4.1/ksmserver/Makefile.in
+--- kdebase-3.4.1.orig/ksmserver/Makefile.in 2005-05-23 18:38:30.000000000 +0200
++++ kdebase-3.4.1/ksmserver/Makefile.in 2005-05-24 16:28:00.997598544 +0200
@@ -343,6 +343,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -40855,92 +22574,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -890,7 +893,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -902,7 +911,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -910,7 +919,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -931,7 +946,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/ksplashml/kcmksplash/Makefile.in kdebase-3.4.0/ksplashml/kcmksplash/Makefile.in
---- kdebase-3.4.0.orig/ksplashml/kcmksplash/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/kcmksplash/Makefile.in 2005-05-07 12:35:49.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -80,18 +80,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_ksplashthemes_la_SOURCES)
- DIST_SOURCES = $(kcm_ksplashthemes_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/ksplashml/kcmksplash/Makefile.in kdebase-3.4.1/ksplashml/kcmksplash/Makefile.in
+--- kdebase-3.4.1.orig/ksplashml/kcmksplash/Makefile.in 2005-05-23 18:38:30.000000000 +0200
++++ kdebase-3.4.1/ksplashml/kcmksplash/Makefile.in 2005-05-24 16:28:01.032595383 +0200
@@ -300,6 +300,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -40972,69 +22608,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -738,7 +741,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -750,7 +759,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -758,7 +767,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -779,7 +794,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/ksplashml/kcmksplash/pics/Makefile.in kdebase-3.4.0/ksplashml/kcmksplash/pics/Makefile.in
---- kdebase-3.4.0.orig/ksplashml/kcmksplash/pics/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/kcmksplash/pics/Makefile.in 2005-05-07 12:35:49.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/ksplashml/kcmksplash/pics/Makefile.in kdebase-3.4.1/ksplashml/kcmksplash/pics/Makefile.in
+--- kdebase-3.4.1.orig/ksplashml/kcmksplash/pics/Makefile.in 2005-05-23 18:38:30.000000000 +0200
++++ kdebase-3.4.1/ksplashml/kcmksplash/pics/Makefile.in 2005-05-24 16:28:01.076591409 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -41066,79 +22642,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -713,25 +716,25 @@
-
- #>+ 22
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-- $(INSTALL_DATA) $(srcdir)/cr128-app-ksplash.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/ksplash.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-ksplash.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksplash.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
-- $(INSTALL_DATA) $(srcdir)/cr22-app-ksplash.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/ksplash.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-ksplash.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksplash.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-ksplash.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ksplash.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-ksplash.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksplash.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-ksplash.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/ksplash.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-ksplash.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/ksplash.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- $(INSTALL_DATA) $(srcdir)/cr64-app-ksplash.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ksplash.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/ksplash.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksplash.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/ksplash.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksplash.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ksplash.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksplash.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/ksplash.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/ksplash.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ksplash.png
-
- #>+ 15
-diff -Nru kdebase-3.4.0.orig/ksplashml/Makefile.in kdebase-3.4.0/ksplashml/Makefile.in
---- kdebase-3.4.0.orig/ksplashml/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/Makefile.in 2005-05-07 12:35:49.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -76,18 +76,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(ksplash_SOURCES)
- DIST_SOURCES = $(ksplash_SOURCES)
+diff -rua kdebase-3.4.1.orig/ksplashml/Makefile.in kdebase-3.4.1/ksplashml/Makefile.in
+--- kdebase-3.4.1.orig/ksplashml/Makefile.in 2005-05-23 18:38:30.000000000 +0200
++++ kdebase-3.4.1/ksplashml/Makefile.in 2005-05-24 16:28:01.013597099 +0200
@@ -302,6 +302,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -41170,69 +22676,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -739,7 +742,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -751,7 +760,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -759,7 +768,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -780,7 +795,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/ksplashml/pics/Makefile.in kdebase-3.4.0/ksplashml/pics/Makefile.in
---- kdebase-3.4.0.orig/ksplashml/pics/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/pics/Makefile.in 2005-05-07 12:35:49.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/ksplashml/pics/Makefile.in kdebase-3.4.1/ksplashml/pics/Makefile.in
+--- kdebase-3.4.1.orig/ksplashml/pics/Makefile.in 2005-05-23 18:38:30.000000000 +0200
++++ kdebase-3.4.1/ksplashml/pics/Makefile.in 2005-05-24 16:28:01.091590054 +0200
@@ -261,6 +261,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -41264,69 +22710,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -629,7 +632,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -641,7 +650,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -649,7 +658,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -670,7 +685,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/ksplashml/pics/themes/blue-bend/Makefile.in kdebase-3.4.0/ksplashml/pics/themes/blue-bend/Makefile.in
---- kdebase-3.4.0.orig/ksplashml/pics/themes/blue-bend/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/pics/themes/blue-bend/Makefile.in 2005-05-07 12:35:49.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/ksplashml/pics/themes/blue-bend/Makefile.in kdebase-3.4.1/ksplashml/pics/themes/blue-bend/Makefile.in
+--- kdebase-3.4.1.orig/ksplashml/pics/themes/blue-bend/Makefile.in 2005-05-23 18:38:30.000000000 +0200
++++ kdebase-3.4.1/ksplashml/pics/themes/blue-bend/Makefile.in 2005-05-24 16:28:01.118587615 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -41358,21 +22744,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/ksplashml/pics/themes/default/locolor/Makefile.in kdebase-3.4.0/ksplashml/pics/themes/default/locolor/Makefile.in
---- kdebase-3.4.0.orig/ksplashml/pics/themes/default/locolor/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/pics/themes/default/locolor/Makefile.in 2005-05-07 12:35:49.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/ksplashml/pics/themes/default/locolor/Makefile.in kdebase-3.4.1/ksplashml/pics/themes/default/locolor/Makefile.in
+--- kdebase-3.4.1.orig/ksplashml/pics/themes/default/locolor/Makefile.in 2005-05-23 18:38:30.000000000 +0200
++++ kdebase-3.4.1/ksplashml/pics/themes/default/locolor/Makefile.in 2005-05-24 16:28:01.146585086 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -41404,21 +22778,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/ksplashml/pics/themes/default/Makefile.in kdebase-3.4.0/ksplashml/pics/themes/default/Makefile.in
---- kdebase-3.4.0.orig/ksplashml/pics/themes/default/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/pics/themes/default/Makefile.in 2005-05-07 12:35:49.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/ksplashml/pics/themes/default/Makefile.in kdebase-3.4.1/ksplashml/pics/themes/default/Makefile.in
+--- kdebase-3.4.1.orig/ksplashml/pics/themes/default/Makefile.in 2005-05-23 18:38:30.000000000 +0200
++++ kdebase-3.4.1/ksplashml/pics/themes/default/Makefile.in 2005-05-24 16:28:01.132586351 +0200
@@ -261,6 +261,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -41450,69 +22812,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -629,7 +632,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -641,7 +650,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -649,7 +658,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -670,7 +685,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/ksplashml/pics/themes/Makefile.in kdebase-3.4.0/ksplashml/pics/themes/Makefile.in
---- kdebase-3.4.0.orig/ksplashml/pics/themes/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/pics/themes/Makefile.in 2005-05-07 12:35:49.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/ksplashml/pics/themes/Makefile.in kdebase-3.4.1/ksplashml/pics/themes/Makefile.in
+--- kdebase-3.4.1.orig/ksplashml/pics/themes/Makefile.in 2005-05-23 18:38:30.000000000 +0200
++++ kdebase-3.4.1/ksplashml/pics/themes/Makefile.in 2005-05-24 16:28:01.105588789 +0200
@@ -251,6 +251,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -41523,14 +22825,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,13 +538,13 @@
- xdg_menudir = @xdg_menudir@
- #>- SUBDIRS = $(AUTODIRS)
- #>+ 1
--SUBDIRS =. blue-bend default none simple
-+SUBDIRS =. none default simple blue-bend
- #>- all: all-recursive
- #>+ 1
+@@ -541,7 +544,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -41551,69 +22846,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -601,7 +604,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -613,7 +622,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -621,7 +630,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -642,7 +657,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/ksplashml/pics/themes/none/Makefile.in kdebase-3.4.0/ksplashml/pics/themes/none/Makefile.in
---- kdebase-3.4.0.orig/ksplashml/pics/themes/none/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/pics/themes/none/Makefile.in 2005-05-07 12:35:49.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/ksplashml/pics/themes/none/Makefile.in kdebase-3.4.1/ksplashml/pics/themes/none/Makefile.in
+--- kdebase-3.4.1.orig/ksplashml/pics/themes/none/Makefile.in 2005-05-23 18:38:30.000000000 +0200
++++ kdebase-3.4.1/ksplashml/pics/themes/none/Makefile.in 2005-05-24 16:28:01.159583912 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -41645,21 +22880,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/ksplashml/pics/themes/simple/Makefile.in kdebase-3.4.0/ksplashml/pics/themes/simple/Makefile.in
---- kdebase-3.4.0.orig/ksplashml/pics/themes/simple/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/pics/themes/simple/Makefile.in 2005-05-07 12:35:49.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/ksplashml/pics/themes/simple/Makefile.in kdebase-3.4.1/ksplashml/pics/themes/simple/Makefile.in
+--- kdebase-3.4.1.orig/ksplashml/pics/themes/simple/Makefile.in 2005-05-23 18:38:30.000000000 +0200
++++ kdebase-3.4.1/ksplashml/pics/themes/simple/Makefile.in 2005-05-24 16:28:01.171582829 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -41691,44 +22914,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/ksplashml/themeengine/default/Makefile.in kdebase-3.4.0/ksplashml/themeengine/default/Makefile.in
---- kdebase-3.4.0.orig/ksplashml/themeengine/default/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/themeengine/default/Makefile.in 2005-05-07 12:35:49.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -82,18 +82,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(ksplashdefault_la_SOURCES) $(libthemedefault_la_SOURCES)
- DIST_SOURCES = $(ksplashdefault_la_SOURCES) \
+diff -rua kdebase-3.4.1.orig/ksplashml/themeengine/default/Makefile.in kdebase-3.4.1/ksplashml/themeengine/default/Makefile.in
+--- kdebase-3.4.1.orig/ksplashml/themeengine/default/Makefile.in 2005-05-23 18:38:30.000000000 +0200
++++ kdebase-3.4.1/ksplashml/themeengine/default/Makefile.in 2005-05-24 16:28:01.214578945 +0200
@@ -288,6 +288,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -41760,44 +22948,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/ksplashml/themeengine/Makefile.in kdebase-3.4.0/ksplashml/themeengine/Makefile.in
---- kdebase-3.4.0.orig/ksplashml/themeengine/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/themeengine/Makefile.in 2005-05-07 12:35:49.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -80,18 +80,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libksplashthemes_la_SOURCES)
- DIST_SOURCES = $(libksplashthemes_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/ksplashml/themeengine/Makefile.in kdebase-3.4.1/ksplashml/themeengine/Makefile.in
+--- kdebase-3.4.1.orig/ksplashml/themeengine/Makefile.in 2005-05-23 18:38:30.000000000 +0200
++++ kdebase-3.4.1/ksplashml/themeengine/Makefile.in 2005-05-24 16:28:01.193580842 +0200
@@ -304,6 +304,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -41829,92 +22982,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -755,7 +758,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -767,7 +776,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -775,7 +784,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -796,7 +811,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/ksplashml/themeengine/redmond/Makefile.in kdebase-3.4.0/ksplashml/themeengine/redmond/Makefile.in
---- kdebase-3.4.0.orig/ksplashml/themeengine/redmond/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/themeengine/redmond/Makefile.in 2005-05-07 12:35:49.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -81,18 +81,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(ksplashredmond_la_SOURCES)
- DIST_SOURCES = $(ksplashredmond_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/ksplashml/themeengine/redmond/Makefile.in kdebase-3.4.1/ksplashml/themeengine/redmond/Makefile.in
+--- kdebase-3.4.1.orig/ksplashml/themeengine/redmond/Makefile.in 2005-05-23 18:38:31.000000000 +0200
++++ kdebase-3.4.1/ksplashml/themeengine/redmond/Makefile.in 2005-05-24 16:28:01.236576958 +0200
@@ -302,6 +302,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -41946,69 +23016,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -758,7 +761,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -770,7 +779,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -778,7 +787,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -799,7 +814,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/ksplashml/themeengine/redmond/pics/Makefile.in kdebase-3.4.0/ksplashml/themeengine/redmond/pics/Makefile.in
---- kdebase-3.4.0.orig/ksplashml/themeengine/redmond/pics/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/themeengine/redmond/pics/Makefile.in 2005-05-07 12:35:49.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/ksplashml/themeengine/redmond/pics/Makefile.in kdebase-3.4.1/ksplashml/themeengine/redmond/pics/Makefile.in
+--- kdebase-3.4.1.orig/ksplashml/themeengine/redmond/pics/Makefile.in 2005-05-23 18:38:31.000000000 +0200
++++ kdebase-3.4.1/ksplashml/themeengine/redmond/pics/Makefile.in 2005-05-24 16:28:01.249575784 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -42040,44 +23050,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/ksplashml/themeengine/simple/Makefile.in kdebase-3.4.0/ksplashml/themeengine/simple/Makefile.in
---- kdebase-3.4.0.orig/ksplashml/themeengine/simple/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/themeengine/simple/Makefile.in 2005-05-07 12:35:49.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -69,18 +69,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(ksplashsimple_SOURCES)
- DIST_SOURCES = $(ksplashsimple_SOURCES)
+diff -rua kdebase-3.4.1.orig/ksplashml/themeengine/simple/Makefile.in kdebase-3.4.1/ksplashml/themeengine/simple/Makefile.in
+--- kdebase-3.4.1.orig/ksplashml/themeengine/simple/Makefile.in 2005-05-23 18:38:31.000000000 +0200
++++ kdebase-3.4.1/ksplashml/themeengine/simple/Makefile.in 2005-05-24 16:28:01.265574339 +0200
@@ -272,6 +272,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -42109,44 +23084,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/ksplashml/themeengine/standard/Makefile.in kdebase-3.4.0/ksplashml/themeengine/standard/Makefile.in
---- kdebase-3.4.0.orig/ksplashml/themeengine/standard/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/themeengine/standard/Makefile.in 2005-05-07 12:35:49.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -89,18 +89,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(ksplashstandard_la_SOURCES) $(libthemestandard_la_SOURCES)
- DIST_SOURCES = $(ksplashstandard_la_SOURCES) \
+diff -rua kdebase-3.4.1.orig/ksplashml/themeengine/standard/Makefile.in kdebase-3.4.1/ksplashml/themeengine/standard/Makefile.in
+--- kdebase-3.4.1.orig/ksplashml/themeengine/standard/Makefile.in 2005-05-23 18:38:31.000000000 +0200
++++ kdebase-3.4.1/ksplashml/themeengine/standard/Makefile.in 2005-05-24 16:28:01.291571991 +0200
@@ -311,6 +311,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -42178,69 +23118,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -784,7 +787,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -796,7 +805,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -804,7 +813,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -825,7 +840,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/ksplashml/themeengine/standard/pics/Makefile.in kdebase-3.4.0/ksplashml/themeengine/standard/pics/Makefile.in
---- kdebase-3.4.0.orig/ksplashml/themeengine/standard/pics/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/themeengine/standard/pics/Makefile.in 2005-05-07 12:35:49.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/ksplashml/themeengine/standard/pics/Makefile.in kdebase-3.4.1/ksplashml/themeengine/standard/pics/Makefile.in
+--- kdebase-3.4.1.orig/ksplashml/themeengine/standard/pics/Makefile.in 2005-05-23 18:38:31.000000000 +0200
++++ kdebase-3.4.1/ksplashml/themeengine/standard/pics/Makefile.in 2005-05-24 16:28:01.300571178 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -42272,44 +23152,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kstart/Makefile.in kdebase-3.4.0/kstart/Makefile.in
---- kdebase-3.4.0.orig/kstart/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/kstart/Makefile.in 2005-05-07 12:35:49.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -72,18 +72,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kstart_SOURCES)
- DIST_SOURCES = $(kstart_SOURCES)
+diff -rua kdebase-3.4.1.orig/kstart/Makefile.in kdebase-3.4.1/kstart/Makefile.in
+--- kdebase-3.4.1.orig/kstart/Makefile.in 2005-05-23 18:38:31.000000000 +0200
++++ kdebase-3.4.1/kstart/Makefile.in 2005-05-24 16:28:01.313570004 +0200
@@ -276,6 +276,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -42341,35 +23186,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/ksysguard/CContLib/Makefile.in kdebase-3.4.0/ksysguard/CContLib/Makefile.in
---- kdebase-3.4.0.orig/ksysguard/CContLib/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/CContLib/Makefile.in 2005-05-07 12:35:49.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -65,11 +65,11 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libccont_a_SOURCES)
- DIST_SOURCES = $(libccont_a_SOURCES)
+diff -rua kdebase-3.4.1.orig/ksysguard/CContLib/Makefile.in kdebase-3.4.1/ksysguard/CContLib/Makefile.in
+--- kdebase-3.4.1.orig/ksysguard/CContLib/Makefile.in 2005-05-23 18:38:31.000000000 +0200
++++ kdebase-3.4.1/ksysguard/CContLib/Makefile.in 2005-05-24 16:28:01.325568920 +0200
@@ -262,6 +262,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -42401,21 +23220,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLIBRARIES:
-diff -Nru kdebase-3.4.0.orig/ksysguard/example/Makefile.in kdebase-3.4.0/ksysguard/example/Makefile.in
---- kdebase-3.4.0.orig/ksysguard/example/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/example/Makefile.in 2005-05-07 12:35:49.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/ksysguard/example/Makefile.in kdebase-3.4.1/ksysguard/example/Makefile.in
+--- kdebase-3.4.1.orig/ksysguard/example/Makefile.in 2005-05-23 18:38:31.000000000 +0200
++++ kdebase-3.4.1/ksysguard/example/Makefile.in 2005-05-24 16:28:01.346567023 +0200
@@ -247,6 +247,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -42447,44 +23254,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/ksysguard/gui/ksgrd/Makefile.in kdebase-3.4.0/ksysguard/gui/ksgrd/Makefile.in
---- kdebase-3.4.0.orig/ksysguard/gui/ksgrd/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/gui/ksgrd/Makefile.in 2005-05-07 12:35:50.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -82,18 +82,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libksgrd_la_SOURCES)
- DIST_SOURCES = $(libksgrd_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/ksysguard/gui/ksgrd/Makefile.in kdebase-3.4.1/ksysguard/gui/ksgrd/Makefile.in
+--- kdebase-3.4.1.orig/ksysguard/gui/ksgrd/Makefile.in 2005-05-23 18:38:31.000000000 +0200
++++ kdebase-3.4.1/ksysguard/gui/ksgrd/Makefile.in 2005-05-24 16:28:01.486554379 +0200
@@ -287,6 +287,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -42516,118 +23288,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -953,13 +956,6 @@
- mocs: SensorSocketAgent.moc
-
- #>+ 3
--StyleSettings.moc: $(srcdir)/StyleSettings.h
-- $(MOC) $(srcdir)/StyleSettings.h -o StyleSettings.moc
--
--#>+ 2
--mocs: StyleSettings.moc
--
--#>+ 3
- SensorManager.moc: $(srcdir)/SensorManager.h
- $(MOC) $(srcdir)/SensorManager.h -o SensorManager.moc
-
-@@ -967,11 +963,11 @@
- mocs: SensorManager.moc
-
- #>+ 3
--StyleEngine.moc: $(srcdir)/StyleEngine.h
-- $(MOC) $(srcdir)/StyleEngine.h -o StyleEngine.moc
-+StyleSettings.moc: $(srcdir)/StyleSettings.h
-+ $(MOC) $(srcdir)/StyleSettings.h -o StyleSettings.moc
-
- #>+ 2
--mocs: StyleEngine.moc
-+mocs: StyleSettings.moc
-
- #>+ 3
- SensorShellAgent.moc: $(srcdir)/SensorShellAgent.h
-@@ -981,6 +977,13 @@
- mocs: SensorShellAgent.moc
-
- #>+ 3
-+StyleEngine.moc: $(srcdir)/StyleEngine.h
-+ $(MOC) $(srcdir)/StyleEngine.h -o StyleEngine.moc
-+
-+#>+ 2
-+mocs: StyleEngine.moc
-+
-+#>+ 3
- HostConnector.moc: $(srcdir)/HostConnector.h
- $(MOC) $(srcdir)/HostConnector.h -o HostConnector.moc
-
-@@ -996,7 +999,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f TimerSettings.moc SensorSocketAgent.moc StyleSettings.moc SensorManager.moc StyleEngine.moc SensorShellAgent.moc HostConnector.moc SensorAgent.moc
-+ -rm -f TimerSettings.moc SensorSocketAgent.moc SensorManager.moc StyleSettings.moc SensorShellAgent.moc StyleEngine.moc HostConnector.moc SensorAgent.moc
-
- #>+ 2
- KDE_DIST=Makefile.in Makefile.am
-@@ -1047,7 +1050,7 @@
-
-
- #>+ 11
--libksgrd_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/HostConnector.cc $(srcdir)/SensorAgent.cc $(srcdir)/SensorManager.cc $(srcdir)/SensorShellAgent.cc $(srcdir)/SensorSocketAgent.cc $(srcdir)/StyleEngine.cc $(srcdir)/StyleSettings.cc $(srcdir)/TimerSettings.cc TimerSettings.moc SensorSocketAgent.moc SensorManager.moc StyleSettings.moc SensorShellAgent.moc StyleEngine.moc HostConnector.moc SensorAgent.moc
-+libksgrd_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/HostConnector.cc $(srcdir)/SensorAgent.cc $(srcdir)/SensorManager.cc $(srcdir)/SensorShellAgent.cc $(srcdir)/SensorSocketAgent.cc $(srcdir)/StyleEngine.cc $(srcdir)/StyleSettings.cc $(srcdir)/TimerSettings.cc TimerSettings.moc SensorSocketAgent.moc StyleSettings.moc SensorManager.moc StyleEngine.moc SensorShellAgent.moc HostConnector.moc SensorAgent.moc
- @echo 'creating libksgrd_la.all_cc.cc ...'; \
- rm -f libksgrd_la.all_cc.files libksgrd_la.all_cc.final; \
- echo "#define KDE_USE_FINAL 1" >> libksgrd_la.all_cc.final; \
-diff -Nru kdebase-3.4.0.orig/ksysguard/gui/Makefile.in kdebase-3.4.0/ksysguard/gui/Makefile.in
---- kdebase-3.4.0.orig/ksysguard/gui/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/gui/Makefile.in 2005-05-07 12:35:50.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -105,29 +105,29 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(sysguard_panelapplet_la_SOURCES) $(kpm_SOURCES) \
- $(ksysguard_SOURCES)
+diff -rua kdebase-3.4.1.orig/ksysguard/gui/Makefile.in kdebase-3.4.1/ksysguard/gui/Makefile.in
+--- kdebase-3.4.1.orig/ksysguard/gui/Makefile.in 2005-05-23 18:38:31.000000000 +0200
++++ kdebase-3.4.1/ksysguard/gui/Makefile.in 2005-05-24 16:28:01.397562417 +0200
@@ -342,6 +342,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -42659,92 +23322,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -953,7 +956,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -965,7 +974,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -973,7 +982,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -994,7 +1009,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/ksysguard/gui/SensorDisplayLib/Makefile.in kdebase-3.4.0/ksysguard/gui/SensorDisplayLib/Makefile.in
---- kdebase-3.4.0.orig/ksysguard/gui/SensorDisplayLib/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/gui/SensorDisplayLib/Makefile.in 2005-05-07 12:35:50.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -79,18 +79,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libsensordisplays_la_SOURCES)
- DIST_SOURCES = $(libsensordisplays_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/ksysguard/gui/SensorDisplayLib/Makefile.in kdebase-3.4.1/ksysguard/gui/SensorDisplayLib/Makefile.in
+--- kdebase-3.4.1.orig/ksysguard/gui/SensorDisplayLib/Makefile.in 2005-05-23 18:38:31.000000000 +0200
++++ kdebase-3.4.1/ksysguard/gui/SensorDisplayLib/Makefile.in 2005-05-24 16:28:01.457556998 +0200
@@ -282,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -42776,103 +23356,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -955,18 +958,18 @@
- mocs: DummyDisplay.moc
-
- #>+ 3
--SensorLoggerDlg.moc: $(srcdir)/SensorLoggerDlg.h
-- $(MOC) $(srcdir)/SensorLoggerDlg.h -o SensorLoggerDlg.moc
-+FancyPlotterSettings.moc: $(srcdir)/FancyPlotterSettings.h
-+ $(MOC) $(srcdir)/FancyPlotterSettings.h -o FancyPlotterSettings.moc
-
- #>+ 2
--mocs: SensorLoggerDlg.moc
-+mocs: FancyPlotterSettings.moc
-
- #>+ 3
--FancyPlotterSettings.moc: $(srcdir)/FancyPlotterSettings.h
-- $(MOC) $(srcdir)/FancyPlotterSettings.h -o FancyPlotterSettings.moc
-+SensorLoggerDlg.moc: $(srcdir)/SensorLoggerDlg.h
-+ $(MOC) $(srcdir)/SensorLoggerDlg.h -o SensorLoggerDlg.moc
-
- #>+ 2
--mocs: FancyPlotterSettings.moc
-+mocs: SensorLoggerDlg.moc
-
- #>+ 3
- LogFile.moc: $(srcdir)/LogFile.h
-@@ -997,18 +1000,18 @@
- mocs: ListView.moc
-
- #>+ 3
--ReniceDlg.moc: $(srcdir)/ReniceDlg.h
-- $(MOC) $(srcdir)/ReniceDlg.h -o ReniceDlg.moc
-+SensorLogger.moc: $(srcdir)/SensorLogger.h
-+ $(MOC) $(srcdir)/SensorLogger.h -o SensorLogger.moc
-
- #>+ 2
--mocs: ReniceDlg.moc
-+mocs: SensorLogger.moc
-
- #>+ 3
--SensorLogger.moc: $(srcdir)/SensorLogger.h
-- $(MOC) $(srcdir)/SensorLogger.h -o SensorLogger.moc
-+ReniceDlg.moc: $(srcdir)/ReniceDlg.h
-+ $(MOC) $(srcdir)/ReniceDlg.h -o ReniceDlg.moc
-
- #>+ 2
--mocs: SensorLogger.moc
-+mocs: ReniceDlg.moc
-
- #>+ 3
- DancingBarsSettings.moc: $(srcdir)/DancingBarsSettings.h
-@@ -1068,7 +1071,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f SensorDisplay.moc ListViewSettings.moc DummyDisplay.moc SensorLoggerDlg.moc FancyPlotterSettings.moc LogFile.moc ProcessController.moc SignalPlotter.moc ListView.moc ReniceDlg.moc SensorLogger.moc DancingBarsSettings.moc SensorLoggerSettings.moc FancyPlotter.moc MultiMeterSettings.moc BarGraph.moc DancingBars.moc MultiMeter.moc ProcessList.moc
-+ -rm -f SensorDisplay.moc ListViewSettings.moc DummyDisplay.moc FancyPlotterSettings.moc SensorLoggerDlg.moc LogFile.moc ProcessController.moc SignalPlotter.moc ListView.moc SensorLogger.moc ReniceDlg.moc DancingBarsSettings.moc SensorLoggerSettings.moc FancyPlotter.moc MultiMeterSettings.moc BarGraph.moc DancingBars.moc MultiMeter.moc ProcessList.moc
-
- #>+ 2
- KDE_DIST=SignalPlotter.h LogFile.h SensorLoggerSettings.h SensorLoggerSettingsWidget.ui FancyPlotter.h SensorLoggerDlgWidget.ui.h Makefile.in DancingBarsSettings.h BarGraph.h MultiMeterSettingsWidget.ui MultiMeter.h ListViewSettingsWidget.ui.h ProcessList.h SensorDisplay.h SensorLoggerSettingsWidget.ui.h DummyDisplay.h ReniceDlg.h DancingBars.h MultiMeterSettings.h SensorLoggerDlgWidget.ui ListView.h ListViewSettingsWidget.ui SensorLoggerDlg.h FancyPlotterSettings.h SensorLogger.h MultiMeterSettingsWidget.ui.h ProcessController.h ListViewSettings.h Makefile.am LogFileSettings.ui
-@@ -1128,7 +1131,7 @@
-
-
- #>+ 11
--libsensordisplays_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/SensorDisplay.cc $(srcdir)/BarGraph.cc $(srcdir)/DancingBars.cc $(srcdir)/DancingBarsSettings.cc $(srcdir)/DummyDisplay.cc $(srcdir)/FancyPlotter.cc $(srcdir)/FancyPlotterSettings.cc $(srcdir)/ListView.cc $(srcdir)/LogFile.cc $(srcdir)/MultiMeter.cc $(srcdir)/MultiMeterSettings.cc $(srcdir)/ProcessController.cc $(srcdir)/ProcessList.cc $(srcdir)/ReniceDlg.cc $(srcdir)/SensorLogger.cc $(srcdir)/SensorLoggerDlg.cc $(srcdir)/SensorLoggerSettings.cc $(srcdir)/ListViewSettings.cc $(srcdir)/SignalPlotter.cc ListViewSettingsWidget.cc LogFileSettings.cc MultiMeterSettingsWidget.cc SensorLoggerDlgWidget.cc SensorLoggerSettingsWidget.cc ListViewSettings.moc SensorDisplay.moc DummyDisplay.moc FancyPlotterSettings.moc SensorLoggerDlg.moc LogFile.moc ProcessController.moc SignalPlotter.moc ListView.moc ReniceDlg.moc SensorLogger.moc DancingBarsSettings.moc SensorLoggerSettings.moc FancyPlotter.moc MultiMeterSettings.moc BarGraph.moc DancingBars.moc MultiMeter.moc ProcessList.moc
-+libsensordisplays_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/SensorDisplay.cc $(srcdir)/BarGraph.cc $(srcdir)/DancingBars.cc $(srcdir)/DancingBarsSettings.cc $(srcdir)/DummyDisplay.cc $(srcdir)/FancyPlotter.cc $(srcdir)/FancyPlotterSettings.cc $(srcdir)/ListView.cc $(srcdir)/LogFile.cc $(srcdir)/MultiMeter.cc $(srcdir)/MultiMeterSettings.cc $(srcdir)/ProcessController.cc $(srcdir)/ProcessList.cc $(srcdir)/ReniceDlg.cc $(srcdir)/SensorLogger.cc $(srcdir)/SensorLoggerDlg.cc $(srcdir)/SensorLoggerSettings.cc $(srcdir)/ListViewSettings.cc $(srcdir)/SignalPlotter.cc ListViewSettingsWidget.cc LogFileSettings.cc MultiMeterSettingsWidget.cc SensorLoggerDlgWidget.cc SensorLoggerSettingsWidget.cc ListViewSettings.moc SensorDisplay.moc DummyDisplay.moc SensorLoggerDlg.moc FancyPlotterSettings.moc LogFile.moc ProcessController.moc SignalPlotter.moc ListView.moc SensorLogger.moc ReniceDlg.moc DancingBarsSettings.moc SensorLoggerSettings.moc FancyPlotter.moc MultiMeterSettings.moc BarGraph.moc DancingBars.moc MultiMeter.moc ProcessList.moc
- @echo 'creating libsensordisplays_la.all_cc.cc ...'; \
- rm -f libsensordisplays_la.all_cc.files libsensordisplays_la.all_cc.final; \
- echo "#define KDE_USE_FINAL 1" >> libsensordisplays_la.all_cc.final; \
-diff -Nru kdebase-3.4.0.orig/ksysguard/ksysguardd/FreeBSD/Makefile.in kdebase-3.4.0/ksysguard/ksysguardd/FreeBSD/Makefile.in
---- kdebase-3.4.0.orig/ksysguard/ksysguardd/FreeBSD/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/ksysguardd/FreeBSD/Makefile.in 2005-05-07 12:35:50.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -73,11 +73,11 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libksysguardd_a_SOURCES)
- DIST_SOURCES = $(libksysguardd_a_SOURCES)
+diff -rua kdebase-3.4.1.orig/ksysguard/ksysguardd/FreeBSD/Makefile.in kdebase-3.4.1/ksysguard/ksysguardd/FreeBSD/Makefile.in
+--- kdebase-3.4.1.orig/ksysguard/ksysguardd/FreeBSD/Makefile.in 2005-05-23 18:38:31.000000000 +0200
++++ kdebase-3.4.1/ksysguard/ksysguardd/FreeBSD/Makefile.in 2005-05-24 16:28:01.503552843 +0200
@@ -269,6 +269,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -42904,35 +23390,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLIBRARIES:
-diff -Nru kdebase-3.4.0.orig/ksysguard/ksysguardd/Irix/Makefile.in kdebase-3.4.0/ksysguard/ksysguardd/Irix/Makefile.in
---- kdebase-3.4.0.orig/ksysguard/ksysguardd/Irix/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/ksysguardd/Irix/Makefile.in 2005-05-07 12:35:50.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -68,11 +68,11 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libksysguardd_a_SOURCES)
- DIST_SOURCES = $(libksysguardd_a_SOURCES)
+diff -rua kdebase-3.4.1.orig/ksysguard/ksysguardd/Irix/Makefile.in kdebase-3.4.1/ksysguard/ksysguardd/Irix/Makefile.in
+--- kdebase-3.4.1.orig/ksysguard/ksysguardd/Irix/Makefile.in 2005-05-23 18:38:31.000000000 +0200
++++ kdebase-3.4.1/ksysguard/ksysguardd/Irix/Makefile.in 2005-05-24 16:28:01.520551308 +0200
@@ -264,6 +264,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -42964,35 +23424,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLIBRARIES:
-diff -Nru kdebase-3.4.0.orig/ksysguard/ksysguardd/Linux/Makefile.in kdebase-3.4.0/ksysguard/ksysguardd/Linux/Makefile.in
---- kdebase-3.4.0.orig/ksysguard/ksysguardd/Linux/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/ksysguardd/Linux/Makefile.in 2005-05-07 12:35:50.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -74,11 +74,11 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libksysguardd_a_SOURCES)
- DIST_SOURCES = $(libksysguardd_a_SOURCES)
+diff -rua kdebase-3.4.1.orig/ksysguard/ksysguardd/Linux/Makefile.in kdebase-3.4.1/ksysguard/ksysguardd/Linux/Makefile.in
+--- kdebase-3.4.1.orig/ksysguard/ksysguardd/Linux/Makefile.in 2005-05-23 18:38:31.000000000 +0200
++++ kdebase-3.4.1/ksysguard/ksysguardd/Linux/Makefile.in 2005-05-24 16:28:01.538549682 +0200
@@ -270,6 +270,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -43024,35 +23458,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLIBRARIES:
-diff -Nru kdebase-3.4.0.orig/ksysguard/ksysguardd/Makefile.in kdebase-3.4.0/ksysguard/ksysguardd/Makefile.in
---- kdebase-3.4.0.orig/ksysguard/ksysguardd/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/ksysguardd/Makefile.in 2005-05-07 12:35:50.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -72,11 +72,11 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(ksysguardd_SOURCES)
- DIST_SOURCES = $(ksysguardd_SOURCES)
+diff -rua kdebase-3.4.1.orig/ksysguard/ksysguardd/Makefile.in kdebase-3.4.1/ksysguard/ksysguardd/Makefile.in
+--- kdebase-3.4.1.orig/ksysguard/ksysguardd/Makefile.in 2005-05-23 18:38:31.000000000 +0200
++++ kdebase-3.4.1/ksysguard/ksysguardd/Makefile.in 2005-05-24 16:28:01.554548237 +0200
@@ -282,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -43084,83 +23492,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -709,7 +712,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -721,7 +730,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -729,7 +738,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -750,7 +765,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/ksysguard/ksysguardd/NetBSD/Makefile.in kdebase-3.4.0/ksysguard/ksysguardd/NetBSD/Makefile.in
---- kdebase-3.4.0.orig/ksysguard/ksysguardd/NetBSD/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/ksysguardd/NetBSD/Makefile.in 2005-05-07 12:35:50.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -73,11 +73,11 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libksysguardd_a_SOURCES)
- DIST_SOURCES = $(libksysguardd_a_SOURCES)
+diff -rua kdebase-3.4.1.orig/ksysguard/ksysguardd/NetBSD/Makefile.in kdebase-3.4.1/ksysguard/ksysguardd/NetBSD/Makefile.in
+--- kdebase-3.4.1.orig/ksysguard/ksysguardd/NetBSD/Makefile.in 2005-05-23 18:38:31.000000000 +0200
++++ kdebase-3.4.1/ksysguard/ksysguardd/NetBSD/Makefile.in 2005-05-24 16:28:01.566547154 +0200
@@ -269,6 +269,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -43192,35 +23526,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLIBRARIES:
-diff -Nru kdebase-3.4.0.orig/ksysguard/ksysguardd/OpenBSD/Makefile.in kdebase-3.4.0/ksysguard/ksysguardd/OpenBSD/Makefile.in
---- kdebase-3.4.0.orig/ksysguard/ksysguardd/OpenBSD/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/ksysguardd/OpenBSD/Makefile.in 2005-05-07 12:35:50.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -66,11 +66,11 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libksysguardd_a_SOURCES)
- DIST_SOURCES = $(libksysguardd_a_SOURCES)
+diff -rua kdebase-3.4.1.orig/ksysguard/ksysguardd/OpenBSD/Makefile.in kdebase-3.4.1/ksysguard/ksysguardd/OpenBSD/Makefile.in
+--- kdebase-3.4.1.orig/ksysguard/ksysguardd/OpenBSD/Makefile.in 2005-05-23 18:38:31.000000000 +0200
++++ kdebase-3.4.1/ksysguard/ksysguardd/OpenBSD/Makefile.in 2005-05-24 16:28:01.577546160 +0200
@@ -262,6 +262,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -43252,35 +23560,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLIBRARIES:
-diff -Nru kdebase-3.4.0.orig/ksysguard/ksysguardd/Solaris/Makefile.in kdebase-3.4.0/ksysguard/ksysguardd/Solaris/Makefile.in
---- kdebase-3.4.0.orig/ksysguard/ksysguardd/Solaris/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/ksysguardd/Solaris/Makefile.in 2005-05-07 12:35:50.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -74,11 +74,11 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libksysguardd_a_SOURCES)
- DIST_SOURCES = $(libksysguardd_a_SOURCES)
+diff -rua kdebase-3.4.1.orig/ksysguard/ksysguardd/Solaris/Makefile.in kdebase-3.4.1/ksysguard/ksysguardd/Solaris/Makefile.in
+--- kdebase-3.4.1.orig/ksysguard/ksysguardd/Solaris/Makefile.in 2005-05-23 18:38:31.000000000 +0200
++++ kdebase-3.4.1/ksysguard/ksysguardd/Solaris/Makefile.in 2005-05-24 16:28:01.588545167 +0200
@@ -270,6 +270,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -43312,35 +23594,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLIBRARIES:
-diff -Nru kdebase-3.4.0.orig/ksysguard/ksysguardd/Tru64/Makefile.in kdebase-3.4.0/ksysguard/ksysguardd/Tru64/Makefile.in
---- kdebase-3.4.0.orig/ksysguard/ksysguardd/Tru64/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/ksysguardd/Tru64/Makefile.in 2005-05-07 12:35:50.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -76,11 +76,11 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libksysguardd_a_SOURCES)
- DIST_SOURCES = $(libksysguardd_a_SOURCES)
+diff -rua kdebase-3.4.1.orig/ksysguard/ksysguardd/Tru64/Makefile.in kdebase-3.4.1/ksysguard/ksysguardd/Tru64/Makefile.in
+--- kdebase-3.4.1.orig/ksysguard/ksysguardd/Tru64/Makefile.in 2005-05-23 18:38:31.000000000 +0200
++++ kdebase-3.4.1/ksysguard/ksysguardd/Tru64/Makefile.in 2005-05-24 16:28:01.599544173 +0200
@@ -272,6 +272,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -43372,21 +23628,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLIBRARIES: $(lib_LIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/ksysguard/Makefile.in kdebase-3.4.0/ksysguard/Makefile.in
---- kdebase-3.4.0.orig/ksysguard/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/Makefile.in 2005-05-07 12:35:49.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/ksysguard/Makefile.in kdebase-3.4.1/ksysguard/Makefile.in
+--- kdebase-3.4.1.orig/ksysguard/Makefile.in 2005-05-23 18:38:31.000000000 +0200
++++ kdebase-3.4.1/ksysguard/Makefile.in 2005-05-24 16:28:01.337567836 +0200
@@ -251,6 +251,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -43418,91 +23662,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -603,7 +606,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -615,7 +624,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -623,7 +632,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -644,7 +659,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -873,18 +888,18 @@
- $(INSTALL_DATA) $(srcdir)/cr128-app-ksysguard.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/ksysguard.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-ksysguard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksysguard.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-ksysguard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksysguard.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-ksysguard.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ksysguard.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-ksysguard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksysguard.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- $(INSTALL_DATA) $(srcdir)/cr64-app-ksysguard.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ksysguard.png
-
- uninstall-kde-icons:
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/ksysguard.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksysguard.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksysguard.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ksysguard.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksysguard.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ksysguard.png
-
- #>+ 15
-diff -Nru kdebase-3.4.0.orig/ksysguard/pics/Makefile.in kdebase-3.4.0/ksysguard/pics/Makefile.in
---- kdebase-3.4.0.orig/ksysguard/pics/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/pics/Makefile.in 2005-05-07 12:35:50.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/ksysguard/pics/Makefile.in kdebase-3.4.1/ksysguard/pics/Makefile.in
+--- kdebase-3.4.1.orig/ksysguard/pics/Makefile.in 2005-05-23 18:38:31.000000000 +0200
++++ kdebase-3.4.1/ksysguard/pics/Makefile.in 2005-05-24 16:28:01.608543360 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -43534,44 +23696,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/ksystraycmd/Makefile.in kdebase-3.4.0/ksystraycmd/Makefile.in
---- kdebase-3.4.0.orig/ksystraycmd/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/ksystraycmd/Makefile.in 2005-05-07 12:35:50.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -76,18 +76,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(ksystraycmd_SOURCES)
- DIST_SOURCES = $(ksystraycmd_SOURCES)
+diff -rua kdebase-3.4.1.orig/ksystraycmd/Makefile.in kdebase-3.4.1/ksystraycmd/Makefile.in
+--- kdebase-3.4.1.orig/ksystraycmd/Makefile.in 2005-05-23 18:38:31.000000000 +0200
++++ kdebase-3.4.1/ksystraycmd/Makefile.in 2005-05-24 16:28:01.630541373 +0200
@@ -280,6 +280,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -43603,44 +23730,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/ktip/Makefile.in kdebase-3.4.0/ktip/Makefile.in
---- kdebase-3.4.0.orig/ktip/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/ktip/Makefile.in 2005-05-07 12:35:50.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -70,18 +70,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(ktip_SOURCES)
- DIST_SOURCES = $(ktip_SOURCES)
+diff -rua kdebase-3.4.1.orig/ktip/Makefile.in kdebase-3.4.1/ktip/Makefile.in
+--- kdebase-3.4.1.orig/ktip/Makefile.in 2005-05-23 18:38:31.000000000 +0200
++++ kdebase-3.4.1/ktip/Makefile.in 2005-05-24 16:28:01.653539296 +0200
@@ -297,6 +297,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -43672,103 +23764,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -768,7 +771,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -780,7 +789,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -788,7 +797,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -809,7 +824,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1060,24 +1075,24 @@
- install-kde-icons:
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
- $(INSTALL_DATA) $(srcdir)/cr128-app-ktip.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/ktip.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-ktip.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ktip.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-ktip.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ktip.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-ktip.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ktip.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- $(INSTALL_DATA) $(srcdir)/cr64-app-ktip.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ktip.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-ktip.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ktip.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
- $(INSTALL_DATA) $(srcdir)/crsc-app-ktip.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/ktip.svgz
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-ktip.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ktip.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-ktip.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ktip.png
-
- uninstall-kde-icons:
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/ktip.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ktip.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ktip.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ktip.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ktip.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ktip.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/ktip.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ktip.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ktip.png
-
- #>+ 15
- force-reedit:
-diff -Nru kdebase-3.4.0.orig/ktip/pics/Makefile.in kdebase-3.4.0/ktip/pics/Makefile.in
---- kdebase-3.4.0.orig/ktip/pics/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/ktip/pics/Makefile.in 2005-05-07 12:35:50.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/ktip/pics/Makefile.in kdebase-3.4.1/ktip/pics/Makefile.in
+--- kdebase-3.4.1.orig/ktip/pics/Makefile.in 2005-05-23 18:38:31.000000000 +0200
++++ kdebase-3.4.1/ktip/pics/Makefile.in 2005-05-24 16:28:01.666538122 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -43800,44 +23798,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kwin/clients/b2/config/Makefile.in kdebase-3.4.0/kwin/clients/b2/config/Makefile.in
---- kdebase-3.4.0.orig/kwin/clients/b2/config/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/b2/config/Makefile.in 2005-05-07 12:35:54.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -75,18 +75,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kwin_b2_config_la_SOURCES)
- DIST_SOURCES = $(kwin_b2_config_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kwin/clients/b2/config/Makefile.in kdebase-3.4.1/kwin/clients/b2/config/Makefile.in
+--- kdebase-3.4.1.orig/kwin/clients/b2/config/Makefile.in 2005-05-23 18:38:31.000000000 +0200
++++ kdebase-3.4.1/kwin/clients/b2/config/Makefile.in 2005-05-24 16:28:01.967510937 +0200
@@ -279,6 +279,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -43869,44 +23832,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kwin/clients/b2/Makefile.in kdebase-3.4.0/kwin/clients/b2/Makefile.in
---- kdebase-3.4.0.orig/kwin/clients/b2/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/b2/Makefile.in 2005-05-07 12:35:54.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -75,18 +75,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kwin3_b2_la_SOURCES)
- DIST_SOURCES = $(kwin3_b2_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kwin/clients/b2/Makefile.in kdebase-3.4.1/kwin/clients/b2/Makefile.in
+--- kdebase-3.4.1.orig/kwin/clients/b2/Makefile.in 2005-05-23 18:38:31.000000000 +0200
++++ kdebase-3.4.1/kwin/clients/b2/Makefile.in 2005-05-24 16:28:01.947512743 +0200
@@ -295,6 +295,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -43938,92 +23866,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -733,7 +736,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -745,7 +754,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -753,7 +762,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -774,7 +789,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kwin/clients/default/config/Makefile.in kdebase-3.4.0/kwin/clients/default/config/Makefile.in
---- kdebase-3.4.0.orig/kwin/clients/default/config/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/default/config/Makefile.in 2005-05-07 12:35:54.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -75,18 +75,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kwin_default_config_la_SOURCES)
- DIST_SOURCES = $(kwin_default_config_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kwin/clients/default/config/Makefile.in kdebase-3.4.1/kwin/clients/default/config/Makefile.in
+--- kdebase-3.4.1.orig/kwin/clients/default/config/Makefile.in 2005-05-23 18:38:31.000000000 +0200
++++ kdebase-3.4.1/kwin/clients/default/config/Makefile.in 2005-05-24 16:28:02.029505337 +0200
@@ -279,6 +279,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -44055,44 +23900,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kwin/clients/default/Makefile.in kdebase-3.4.0/kwin/clients/default/Makefile.in
---- kdebase-3.4.0.orig/kwin/clients/default/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/default/Makefile.in 2005-05-07 12:35:54.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -76,18 +76,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kwin3_default_la_SOURCES)
- DIST_SOURCES = $(kwin3_default_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kwin/clients/default/Makefile.in kdebase-3.4.1/kwin/clients/default/Makefile.in
+--- kdebase-3.4.1.orig/kwin/clients/default/Makefile.in 2005-05-23 18:38:31.000000000 +0200
++++ kdebase-3.4.1/kwin/clients/default/Makefile.in 2005-05-24 16:28:02.010507053 +0200
@@ -294,6 +294,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -44124,92 +23934,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -711,7 +714,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -723,7 +732,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -731,7 +740,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -752,7 +767,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kwin/clients/keramik/config/Makefile.in kdebase-3.4.0/kwin/clients/keramik/config/Makefile.in
---- kdebase-3.4.0.orig/kwin/clients/keramik/config/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/keramik/config/Makefile.in 2005-05-07 12:35:54.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -78,18 +78,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kwin_keramik_config_la_SOURCES)
- DIST_SOURCES = $(kwin_keramik_config_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kwin/clients/keramik/config/Makefile.in kdebase-3.4.1/kwin/clients/keramik/config/Makefile.in
+--- kdebase-3.4.1.orig/kwin/clients/keramik/config/Makefile.in 2005-05-23 18:38:31.000000000 +0200
++++ kdebase-3.4.1/kwin/clients/keramik/config/Makefile.in 2005-05-24 16:28:02.072501453 +0200
@@ -282,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -44241,44 +23968,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kwin/clients/keramik/Makefile.in kdebase-3.4.0/kwin/clients/keramik/Makefile.in
---- kdebase-3.4.0.orig/kwin/clients/keramik/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/keramik/Makefile.in 2005-05-07 12:35:54.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -85,18 +85,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kwin3_keramik_la_SOURCES) $(embedtool_SOURCES)
- DIST_SOURCES = $(kwin3_keramik_la_SOURCES) $(embedtool_SOURCES)
+diff -rua kdebase-3.4.1.orig/kwin/clients/keramik/Makefile.in kdebase-3.4.1/kwin/clients/keramik/Makefile.in
+--- kdebase-3.4.1.orig/kwin/clients/keramik/Makefile.in 2005-05-23 18:38:31.000000000 +0200
++++ kdebase-3.4.1/kwin/clients/keramik/Makefile.in 2005-05-24 16:28:02.054503079 +0200
@@ -305,6 +305,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -44310,92 +24002,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -759,7 +762,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -771,7 +780,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -779,7 +788,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -800,7 +815,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kwin/clients/kwmtheme/cli_installer/Makefile.in kdebase-3.4.0/kwin/clients/kwmtheme/cli_installer/Makefile.in
---- kdebase-3.4.0.orig/kwin/clients/kwmtheme/cli_installer/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/kwmtheme/cli_installer/Makefile.in 2005-05-07 12:35:55.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -68,18 +68,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kwmtheme_SOURCES)
- DIST_SOURCES = $(kwmtheme_SOURCES)
+diff -rua kdebase-3.4.1.orig/kwin/clients/kwmtheme/cli_installer/Makefile.in kdebase-3.4.1/kwin/clients/kwmtheme/cli_installer/Makefile.in
+--- kdebase-3.4.1.orig/kwin/clients/kwmtheme/cli_installer/Makefile.in 2005-05-23 18:38:31.000000000 +0200
++++ kdebase-3.4.1/kwin/clients/kwmtheme/cli_installer/Makefile.in 2005-05-24 16:28:02.115497570 +0200
@@ -271,6 +271,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -44427,44 +24036,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kwin/clients/kwmtheme/Makefile.in kdebase-3.4.0/kwin/clients/kwmtheme/Makefile.in
---- kdebase-3.4.0.orig/kwin/clients/kwmtheme/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/kwmtheme/Makefile.in 2005-05-07 12:35:55.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -75,18 +75,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kwin3_kwmtheme_la_SOURCES)
- DIST_SOURCES = $(kwin3_kwmtheme_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kwin/clients/kwmtheme/Makefile.in kdebase-3.4.1/kwin/clients/kwmtheme/Makefile.in
+--- kdebase-3.4.1.orig/kwin/clients/kwmtheme/Makefile.in 2005-05-23 18:38:31.000000000 +0200
++++ kdebase-3.4.1/kwin/clients/kwmtheme/Makefile.in 2005-05-24 16:28:02.099499015 +0200
@@ -295,6 +295,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -44496,92 +24070,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -731,7 +734,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -743,7 +752,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -751,7 +760,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -772,7 +787,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kwin/clients/laptop/Makefile.in kdebase-3.4.0/kwin/clients/laptop/Makefile.in
---- kdebase-3.4.0.orig/kwin/clients/laptop/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/laptop/Makefile.in 2005-05-07 12:35:55.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -75,18 +75,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kwin3_laptop_la_SOURCES)
- DIST_SOURCES = $(kwin3_laptop_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kwin/clients/laptop/Makefile.in kdebase-3.4.1/kwin/clients/laptop/Makefile.in
+--- kdebase-3.4.1.orig/kwin/clients/laptop/Makefile.in 2005-05-23 18:38:31.000000000 +0200
++++ kdebase-3.4.1/kwin/clients/laptop/Makefile.in 2005-05-24 16:28:02.148494589 +0200
@@ -281,6 +281,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -44613,21 +24104,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kwin/clients/Makefile.in kdebase-3.4.0/kwin/clients/Makefile.in
---- kdebase-3.4.0.orig/kwin/clients/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/Makefile.in 2005-05-07 12:35:54.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kwin/clients/Makefile.in kdebase-3.4.1/kwin/clients/Makefile.in
+--- kdebase-3.4.1.orig/kwin/clients/Makefile.in 2005-05-23 18:38:31.000000000 +0200
++++ kdebase-3.4.1/kwin/clients/Makefile.in 2005-05-24 16:28:01.906516446 +0200
@@ -251,6 +251,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -44659,92 +24138,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -599,7 +602,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -611,7 +620,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -619,7 +628,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -640,7 +655,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kwin/clients/modernsystem/config/Makefile.in kdebase-3.4.0/kwin/clients/modernsystem/config/Makefile.in
---- kdebase-3.4.0.orig/kwin/clients/modernsystem/config/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/modernsystem/config/Makefile.in 2005-05-07 12:35:55.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -76,18 +76,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kwin_modernsys_config_la_SOURCES)
- DIST_SOURCES = $(kwin_modernsys_config_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kwin/clients/modernsystem/config/Makefile.in kdebase-3.4.1/kwin/clients/modernsystem/config/Makefile.in
+--- kdebase-3.4.1.orig/kwin/clients/modernsystem/config/Makefile.in 2005-05-23 18:38:31.000000000 +0200
++++ kdebase-3.4.1/kwin/clients/modernsystem/config/Makefile.in 2005-05-24 16:28:02.201489803 +0200
@@ -280,6 +280,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -44776,44 +24172,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kwin/clients/modernsystem/Makefile.in kdebase-3.4.0/kwin/clients/modernsystem/Makefile.in
---- kdebase-3.4.0.orig/kwin/clients/modernsystem/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/modernsystem/Makefile.in 2005-05-07 12:35:55.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -75,18 +75,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kwin3_modernsys_la_SOURCES)
- DIST_SOURCES = $(kwin3_modernsys_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kwin/clients/modernsystem/Makefile.in kdebase-3.4.1/kwin/clients/modernsystem/Makefile.in
+--- kdebase-3.4.1.orig/kwin/clients/modernsystem/Makefile.in 2005-05-23 18:38:31.000000000 +0200
++++ kdebase-3.4.1/kwin/clients/modernsystem/Makefile.in 2005-05-24 16:28:02.181491609 +0200
@@ -295,6 +295,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -44845,92 +24206,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -732,7 +735,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -744,7 +753,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -752,7 +761,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -773,7 +788,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kwin/clients/plastik/config/Makefile.in kdebase-3.4.0/kwin/clients/plastik/config/Makefile.in
---- kdebase-3.4.0.orig/kwin/clients/plastik/config/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/plastik/config/Makefile.in 2005-05-07 12:35:56.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -78,18 +78,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kwin_plastik_config_la_SOURCES)
- DIST_SOURCES = $(kwin_plastik_config_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kwin/clients/plastik/config/Makefile.in kdebase-3.4.1/kwin/clients/plastik/config/Makefile.in
+--- kdebase-3.4.1.orig/kwin/clients/plastik/config/Makefile.in 2005-05-23 18:38:31.000000000 +0200
++++ kdebase-3.4.1/kwin/clients/plastik/config/Makefile.in 2005-05-24 16:28:02.259484564 +0200
@@ -282,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -44962,44 +24240,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kwin/clients/plastik/Makefile.in kdebase-3.4.0/kwin/clients/plastik/Makefile.in
---- kdebase-3.4.0.orig/kwin/clients/plastik/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/plastik/Makefile.in 2005-05-07 12:35:55.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -80,18 +80,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kwin3_plastik_la_SOURCES)
- DIST_SOURCES = $(kwin3_plastik_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kwin/clients/plastik/Makefile.in kdebase-3.4.1/kwin/clients/plastik/Makefile.in
+--- kdebase-3.4.1.orig/kwin/clients/plastik/Makefile.in 2005-05-23 18:38:31.000000000 +0200
++++ kdebase-3.4.1/kwin/clients/plastik/Makefile.in 2005-05-24 16:28:02.231487093 +0200
@@ -299,6 +299,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -45031,92 +24274,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -741,7 +744,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -753,7 +762,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -761,7 +770,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -782,7 +797,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kwin/clients/quartz/config/Makefile.in kdebase-3.4.0/kwin/clients/quartz/config/Makefile.in
---- kdebase-3.4.0.orig/kwin/clients/quartz/config/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/quartz/config/Makefile.in 2005-05-07 12:35:56.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -75,18 +75,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kwin_quartz_config_la_SOURCES)
- DIST_SOURCES = $(kwin_quartz_config_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kwin/clients/quartz/config/Makefile.in kdebase-3.4.1/kwin/clients/quartz/config/Makefile.in
+--- kdebase-3.4.1.orig/kwin/clients/quartz/config/Makefile.in 2005-05-23 18:38:32.000000000 +0200
++++ kdebase-3.4.1/kwin/clients/quartz/config/Makefile.in 2005-05-24 16:28:02.313479687 +0200
@@ -279,6 +279,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -45148,44 +24308,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kwin/clients/quartz/Makefile.in kdebase-3.4.0/kwin/clients/quartz/Makefile.in
---- kdebase-3.4.0.orig/kwin/clients/quartz/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/quartz/Makefile.in 2005-05-07 12:35:56.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kwin3_quartz_la_SOURCES)
- DIST_SOURCES = $(kwin3_quartz_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kwin/clients/quartz/Makefile.in kdebase-3.4.1/kwin/clients/quartz/Makefile.in
+--- kdebase-3.4.1.orig/kwin/clients/quartz/Makefile.in 2005-05-23 18:38:32.000000000 +0200
++++ kdebase-3.4.1/kwin/clients/quartz/Makefile.in 2005-05-24 16:28:02.293481494 +0200
@@ -297,6 +297,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -45217,92 +24342,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -734,7 +737,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -746,7 +755,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -754,7 +763,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -775,7 +790,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kwin/clients/redmond/Makefile.in kdebase-3.4.0/kwin/clients/redmond/Makefile.in
---- kdebase-3.4.0.orig/kwin/clients/redmond/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/redmond/Makefile.in 2005-05-07 12:35:56.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kwin3_redmond_la_SOURCES)
- DIST_SOURCES = $(kwin3_redmond_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kwin/clients/redmond/Makefile.in kdebase-3.4.1/kwin/clients/redmond/Makefile.in
+--- kdebase-3.4.1.orig/kwin/clients/redmond/Makefile.in 2005-05-23 18:38:32.000000000 +0200
++++ kdebase-3.4.1/kwin/clients/redmond/Makefile.in 2005-05-24 16:28:02.340477249 +0200
@@ -283,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -45334,44 +24376,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kwin/clients/test/Makefile.in kdebase-3.4.0/kwin/clients/test/Makefile.in
---- kdebase-3.4.0.orig/kwin/clients/test/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/test/Makefile.in 2005-05-07 12:35:56.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -76,18 +76,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kwin3_test_la_SOURCES)
- DIST_SOURCES = $(kwin3_test_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kwin/clients/test/Makefile.in kdebase-3.4.1/kwin/clients/test/Makefile.in
+--- kdebase-3.4.1.orig/kwin/clients/test/Makefile.in 2005-05-23 18:38:32.000000000 +0200
++++ kdebase-3.4.1/kwin/clients/test/Makefile.in 2005-05-24 16:28:02.361475352 +0200
@@ -281,6 +281,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -45403,44 +24410,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kwin/clients/web/Makefile.in kdebase-3.4.0/kwin/clients/web/Makefile.in
---- kdebase-3.4.0.orig/kwin/clients/web/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/web/Makefile.in 2005-05-07 12:35:56.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -84,18 +84,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kwin3_web_la_SOURCES)
- DIST_SOURCES = $(kwin3_web_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kwin/clients/web/Makefile.in kdebase-3.4.1/kwin/clients/web/Makefile.in
+--- kdebase-3.4.1.orig/kwin/clients/web/Makefile.in 2005-05-23 18:38:32.000000000 +0200
++++ kdebase-3.4.1/kwin/clients/web/Makefile.in 2005-05-24 16:28:02.390472733 +0200
@@ -290,6 +290,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -45472,122 +24444,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -946,27 +949,6 @@
- mocs: WebButtonLower.moc
-
- #>+ 3
--WebButtonMaximize.moc: $(srcdir)/WebButtonMaximize.h
-- $(MOC) $(srcdir)/WebButtonMaximize.h -o WebButtonMaximize.moc
--
--#>+ 2
--mocs: WebButtonMaximize.moc
--
--#>+ 3
--WebButtonIconify.moc: $(srcdir)/WebButtonIconify.h
-- $(MOC) $(srcdir)/WebButtonIconify.h -o WebButtonIconify.moc
--
--#>+ 2
--mocs: WebButtonIconify.moc
--
--#>+ 3
--WebButton.moc: $(srcdir)/WebButton.h
-- $(MOC) $(srcdir)/WebButton.h -o WebButton.moc
--
--#>+ 2
--mocs: WebButton.moc
--
--#>+ 3
- Web.moc: $(srcdir)/Web.h
- $(MOC) $(srcdir)/Web.h -o Web.moc
-
-@@ -995,8 +977,29 @@
- mocs: WebButtonHelp.moc
-
- #>+ 3
-+WebButtonIconify.moc: $(srcdir)/WebButtonIconify.h
-+ $(MOC) $(srcdir)/WebButtonIconify.h -o WebButtonIconify.moc
-+
-+#>+ 2
-+mocs: WebButtonIconify.moc
-+
-+#>+ 3
-+WebButtonMaximize.moc: $(srcdir)/WebButtonMaximize.h
-+ $(MOC) $(srcdir)/WebButtonMaximize.h -o WebButtonMaximize.moc
-+
-+#>+ 2
-+mocs: WebButtonMaximize.moc
-+
-+#>+ 3
-+WebButton.moc: $(srcdir)/WebButton.h
-+ $(MOC) $(srcdir)/WebButton.h -o WebButton.moc
-+
-+#>+ 2
-+mocs: WebButton.moc
-+
-+#>+ 3
- clean-metasources:
-- -rm -f WebButtonLower.moc WebButtonMaximize.moc WebButtonIconify.moc WebButton.moc Web.moc WebButtonClose.moc WebButtonSticky.moc WebButtonHelp.moc
-+ -rm -f WebButtonLower.moc Web.moc WebButtonClose.moc WebButtonSticky.moc WebButtonHelp.moc WebButtonIconify.moc WebButtonMaximize.moc WebButton.moc
-
- #>+ 2
- KDE_DIST=Makefile.in web.desktop Makefile.am
-@@ -1047,7 +1050,7 @@
-
-
- #>+ 11
--kwin3_web_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/Web.cpp $(srcdir)/WebButton.cpp $(srcdir)/WebButtonClose.cpp $(srcdir)/WebButtonHelp.cpp $(srcdir)/WebButtonIconify.cpp $(srcdir)/WebButtonLower.cpp $(srcdir)/WebButtonMaximize.cpp $(srcdir)/WebButtonSticky.cpp WebButtonLower.moc WebButtonIconify.moc WebButtonMaximize.moc Web.moc WebButton.moc WebButtonClose.moc WebButtonSticky.moc WebButtonHelp.moc
-+kwin3_web_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/Web.cpp $(srcdir)/WebButton.cpp $(srcdir)/WebButtonClose.cpp $(srcdir)/WebButtonHelp.cpp $(srcdir)/WebButtonIconify.cpp $(srcdir)/WebButtonLower.cpp $(srcdir)/WebButtonMaximize.cpp $(srcdir)/WebButtonSticky.cpp WebButtonLower.moc Web.moc WebButtonClose.moc WebButtonSticky.moc WebButtonHelp.moc WebButtonIconify.moc WebButtonMaximize.moc WebButton.moc
- @echo 'creating kwin3_web_la.all_cpp.cpp ...'; \
- rm -f kwin3_web_la.all_cpp.files kwin3_web_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> kwin3_web_la.all_cpp.final; \
-@@ -1091,8 +1094,8 @@
- WebButtonLower.lo: WebButtonLower.moc
- WebButtonMaximize.lo: WebButtonMaximize.moc
- WebButtonLower.o: WebButtonLower.moc
--WebButtonIconify.o: WebButtonIconify.moc
- WebButton.lo: WebButton.moc
-+WebButtonIconify.o: WebButtonIconify.moc
- WebButtonSticky.lo: WebButtonSticky.moc
- WebButtonHelp.lo: WebButtonHelp.moc
- nmcheck:
-diff -Nru kdebase-3.4.0.orig/kwin/data/Makefile.in kdebase-3.4.0/kwin/data/Makefile.in
---- kdebase-3.4.0.orig/kwin/data/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/data/Makefile.in 2005-05-07 12:35:56.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -76,18 +76,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kwin_update_window_settings_SOURCES)
- DIST_SOURCES = $(kwin_update_window_settings_SOURCES)
+diff -rua kdebase-3.4.1.orig/kwin/data/Makefile.in kdebase-3.4.1/kwin/data/Makefile.in
+--- kdebase-3.4.1.orig/kwin/data/Makefile.in 2005-05-23 18:38:32.000000000 +0200
++++ kdebase-3.4.1/kwin/data/Makefile.in 2005-05-24 16:28:02.406471288 +0200
@@ -288,6 +288,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -45619,44 +24478,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kconfPROGRAMS: $(kconf_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kwin/kcmkwin/kwindecoration/Makefile.in kdebase-3.4.0/kwin/kcmkwin/kwindecoration/Makefile.in
---- kdebase-3.4.0.orig/kwin/kcmkwin/kwindecoration/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/kcmkwin/kwindecoration/Makefile.in 2005-05-07 12:35:56.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -83,18 +83,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_kwindecoration_la_SOURCES)
- DIST_SOURCES = $(kcm_kwindecoration_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kwin/kcmkwin/kwindecoration/Makefile.in kdebase-3.4.1/kwin/kcmkwin/kwindecoration/Makefile.in
+--- kdebase-3.4.1.orig/kwin/kcmkwin/kwindecoration/Makefile.in 2005-05-23 18:38:32.000000000 +0200
++++ kdebase-3.4.1/kwin/kcmkwin/kwindecoration/Makefile.in 2005-05-24 16:28:02.449467404 +0200
@@ -289,6 +289,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -45688,44 +24512,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kwin/kcmkwin/kwinoptions/Makefile.in kdebase-3.4.0/kwin/kcmkwin/kwinoptions/Makefile.in
---- kdebase-3.4.0.orig/kwin/kcmkwin/kwinoptions/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/kcmkwin/kwinoptions/Makefile.in 2005-05-07 12:35:57.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -81,18 +81,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_kwinoptions_la_SOURCES)
- DIST_SOURCES = $(kcm_kwinoptions_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kwin/kcmkwin/kwinoptions/Makefile.in kdebase-3.4.1/kwin/kcmkwin/kwinoptions/Makefile.in
+--- kdebase-3.4.1.orig/kwin/kcmkwin/kwinoptions/Makefile.in 2005-05-23 18:38:32.000000000 +0200
++++ kdebase-3.4.1/kwin/kcmkwin/kwinoptions/Makefile.in 2005-05-24 16:28:02.503462527 +0200
@@ -288,6 +288,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -45757,44 +24546,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kwin/kcmkwin/kwinrules/Makefile.in kdebase-3.4.0/kwin/kcmkwin/kwinrules/Makefile.in
---- kdebase-3.4.0.orig/kwin/kcmkwin/kwinrules/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/kwin/kcmkwin/kwinrules/Makefile.in 2005-05-07 12:35:57.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -107,18 +107,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_kwinrules_la_SOURCES) $(kwin_rules_dialog_la_SOURCES) \
- $(libkwinrules_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kwin/kcmkwin/kwinrules/Makefile.in kdebase-3.4.1/kwin/kcmkwin/kwinrules/Makefile.in
+--- kdebase-3.4.1.orig/kwin/kcmkwin/kwinrules/Makefile.in 2005-05-23 18:38:32.000000000 +0200
++++ kdebase-3.4.1/kwin/kcmkwin/kwinrules/Makefile.in 2005-05-24 16:28:02.538459366 +0200
@@ -317,6 +317,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -45826,21 +24580,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kwin/kcmkwin/Makefile.in kdebase-3.4.0/kwin/kcmkwin/Makefile.in
---- kdebase-3.4.0.orig/kwin/kcmkwin/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/kcmkwin/Makefile.in 2005-05-07 12:35:56.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kwin/kcmkwin/Makefile.in kdebase-3.4.1/kwin/kcmkwin/Makefile.in
+--- kdebase-3.4.1.orig/kwin/kcmkwin/Makefile.in 2005-05-23 18:38:32.000000000 +0200
++++ kdebase-3.4.1/kwin/kcmkwin/Makefile.in 2005-05-24 16:28:02.415470475 +0200
@@ -251,6 +251,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -45872,92 +24614,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -599,7 +602,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -611,7 +620,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -619,7 +628,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -640,7 +655,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/kwin/killer/Makefile.in kdebase-3.4.0/kwin/killer/Makefile.in
---- kdebase-3.4.0.orig/kwin/killer/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/kwin/killer/Makefile.in 2005-05-07 12:35:57.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -68,18 +68,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kwin_killer_helper_SOURCES)
- DIST_SOURCES = $(kwin_killer_helper_SOURCES)
+diff -rua kdebase-3.4.1.orig/kwin/killer/Makefile.in kdebase-3.4.1/kwin/killer/Makefile.in
+--- kdebase-3.4.1.orig/kwin/killer/Makefile.in 2005-05-23 18:38:32.000000000 +0200
++++ kdebase-3.4.1/kwin/killer/Makefile.in 2005-05-24 16:28:02.549458373 +0200
@@ -271,6 +271,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -45989,35 +24648,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kwin/kompmgr/Makefile.in kdebase-3.4.0/kwin/kompmgr/Makefile.in
---- kdebase-3.4.0.orig/kwin/kompmgr/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/kwin/kompmgr/Makefile.in 2005-05-07 12:35:57.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -66,11 +66,11 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kompmgr_SOURCES)
- DIST_SOURCES = $(kompmgr_SOURCES)
+diff -rua kdebase-3.4.1.orig/kwin/kompmgr/Makefile.in kdebase-3.4.1/kwin/kompmgr/Makefile.in
+--- kdebase-3.4.1.orig/kwin/kompmgr/Makefile.in 2005-05-23 18:38:32.000000000 +0200
++++ kdebase-3.4.1/kwin/kompmgr/Makefile.in 2005-05-24 16:28:02.559457469 +0200
@@ -262,6 +262,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -46049,44 +24682,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kwin/lib/Makefile.in kdebase-3.4.0/kwin/lib/Makefile.in
---- kdebase-3.4.0.orig/kwin/lib/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/kwin/lib/Makefile.in 2005-05-07 12:35:58.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -80,18 +80,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkdecorations_la_SOURCES)
- DIST_SOURCES = $(libkdecorations_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kwin/lib/Makefile.in kdebase-3.4.1/kwin/lib/Makefile.in
+--- kdebase-3.4.1.orig/kwin/lib/Makefile.in 2005-05-23 18:38:32.000000000 +0200
++++ kdebase-3.4.1/kwin/lib/Makefile.in 2005-05-24 16:28:02.578455753 +0200
@@ -285,6 +285,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -46118,44 +24716,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/kwin/Makefile.in kdebase-3.4.0/kwin/Makefile.in
---- kdebase-3.4.0.orig/kwin/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/kwin/Makefile.in 2005-05-07 12:35:54.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -96,18 +96,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kwin_la_SOURCES)
- #>- DIST_SOURCES = $(kwin_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kwin/Makefile.in kdebase-3.4.1/kwin/Makefile.in
+--- kdebase-3.4.1.orig/kwin/Makefile.in 2005-05-23 18:38:31.000000000 +0200
++++ kdebase-3.4.1/kwin/Makefile.in 2005-05-24 16:28:01.891517801 +0200
@@ -321,6 +321,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -46187,137 +24750,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -887,7 +890,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -899,7 +908,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -907,7 +916,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -928,7 +943,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1430,22 +1445,22 @@
- mocs: geometrytip.moc
-
- #>+ 3
--sm.moc: $(srcdir)/sm.h
-- $(MOC) $(srcdir)/sm.h -o sm.moc
-+main.moc: $(srcdir)/main.h
-+ $(MOC) $(srcdir)/main.h -o main.moc
-
- #>+ 2
--mocs: sm.moc
-+mocs: main.moc
-
- #>+ 3
--main.moc: $(srcdir)/main.h
-- $(MOC) $(srcdir)/main.h -o main.moc
-+sm.moc: $(srcdir)/sm.h
-+ $(MOC) $(srcdir)/sm.h -o sm.moc
-
- #>+ 2
--mocs: main.moc
-+mocs: sm.moc
-
- #>+ 3
- clean-metasources:
-- -rm -f client.moc workspace.moc tabbox.moc utils.moc popupinfo.moc geometrytip.moc sm.moc main.moc
-+ -rm -f client.moc workspace.moc tabbox.moc utils.moc popupinfo.moc geometrytip.moc main.moc sm.moc
-
- #>+ 2
- KDE_DIST=NEWCOLORSCHEME.README eventsrc atoms.h main.h workspace.h geometrytip.h Makefile.in options.h placement.h bridge.h plugins.h kwinbindings.cpp LICENSE popupinfo.h utils.h cr48-app-kwin.png killwindow.h cr32-app-kwin.png rules.h kwin.kcfg client.h cr16-app-kwin.png COMPLIANCE sm.h group.h notifications.h Makefile.am tabbox.h
-@@ -1460,17 +1475,17 @@
-
- #>+ 13
- install-kde-icons:
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kwin.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kwin.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-kwin.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwin.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-kwin.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwin.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kwin.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kwin.png
-
- uninstall-kde-icons:
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kwin.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwin.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwin.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kwin.png
-
- #>+ 15
- force-reedit:
-@@ -1511,7 +1526,7 @@
-
-
- #>+ 11
--libkdeinit_kwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/workspace.cpp $(srcdir)/client.cpp $(srcdir)/placement.cpp $(srcdir)/atoms.cpp $(srcdir)/utils.cpp $(srcdir)/layers.cpp $(srcdir)/main.cpp $(srcdir)/popupinfo.cpp $(srcdir)/tabbox.cpp $(srcdir)/options.cpp $(srcdir)/plugins.cpp $(srcdir)/events.cpp $(srcdir)/killwindow.cpp $(srcdir)/geometrytip.cpp $(srcdir)/sm.cpp $(srcdir)/group.cpp $(srcdir)/bridge.cpp $(srcdir)/manage.cpp $(srcdir)/notifications.cpp $(srcdir)/activation.cpp $(srcdir)/useractions.cpp $(srcdir)/geometry.cpp $(srcdir)/rules.cpp KWinInterface_skel.cpp workspace.moc utils.moc main.moc sm.moc client.moc tabbox.moc popupinfo.moc geometrytip.moc
-+libkdeinit_kwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/workspace.cpp $(srcdir)/client.cpp $(srcdir)/placement.cpp $(srcdir)/atoms.cpp $(srcdir)/utils.cpp $(srcdir)/layers.cpp $(srcdir)/main.cpp $(srcdir)/popupinfo.cpp $(srcdir)/tabbox.cpp $(srcdir)/options.cpp $(srcdir)/plugins.cpp $(srcdir)/events.cpp $(srcdir)/killwindow.cpp $(srcdir)/geometrytip.cpp $(srcdir)/sm.cpp $(srcdir)/group.cpp $(srcdir)/bridge.cpp $(srcdir)/manage.cpp $(srcdir)/notifications.cpp $(srcdir)/activation.cpp $(srcdir)/useractions.cpp $(srcdir)/geometry.cpp $(srcdir)/rules.cpp KWinInterface_skel.cpp workspace.moc utils.moc sm.moc main.moc client.moc tabbox.moc popupinfo.moc geometrytip.moc
- @echo 'creating libkdeinit_kwin_la.all_cpp.cpp ...'; \
- rm -f libkdeinit_kwin_la.all_cpp.files libkdeinit_kwin_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libkdeinit_kwin_la.all_cpp.final; \
-@@ -1586,6 +1601,6 @@
- nmcheck-am: nmcheck
- popupinfo.o: popupinfo.moc
- workspace.o: workspace.moc
--workspace.lo: workspace.moc
- sm.o: sm.moc
-+workspace.lo: workspace.moc
- popupinfo.lo: popupinfo.moc
-diff -Nru kdebase-3.4.0.orig/kwin/oldheaders/Makefile.in kdebase-3.4.0/kwin/oldheaders/Makefile.in
---- kdebase-3.4.0.orig/kwin/oldheaders/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/kwin/oldheaders/Makefile.in 2005-05-07 12:35:58.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kwin/oldheaders/Makefile.in kdebase-3.4.1/kwin/oldheaders/Makefile.in
+--- kdebase-3.4.1.orig/kwin/oldheaders/Makefile.in 2005-05-23 18:38:32.000000000 +0200
++++ kdebase-3.4.1/kwin/oldheaders/Makefile.in 2005-05-24 16:28:02.587454941 +0200
@@ -248,6 +248,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -46349,21 +24784,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kwin/pics/Makefile.in kdebase-3.4.0/kwin/pics/Makefile.in
---- kdebase-3.4.0.orig/kwin/pics/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/kwin/pics/Makefile.in 2005-05-07 12:35:58.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kwin/pics/Makefile.in kdebase-3.4.1/kwin/pics/Makefile.in
+--- kdebase-3.4.1.orig/kwin/pics/Makefile.in 2005-05-23 18:38:32.000000000 +0200
++++ kdebase-3.4.1/kwin/pics/Makefile.in 2005-05-24 16:28:02.596454128 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -46395,44 +24818,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/kwin/tools/Makefile.in kdebase-3.4.0/kwin/tools/Makefile.in
---- kdebase-3.4.0.orig/kwin/tools/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/kwin/tools/Makefile.in 2005-05-07 12:35:58.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -66,18 +66,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(test_gravity_SOURCES)
- DIST_SOURCES = $(test_gravity_SOURCES)
+diff -rua kdebase-3.4.1.orig/kwin/tools/Makefile.in kdebase-3.4.1/kwin/tools/Makefile.in
+--- kdebase-3.4.1.orig/kwin/tools/Makefile.in 2005-05-23 18:38:32.000000000 +0200
++++ kdebase-3.4.1/kwin/tools/Makefile.in 2005-05-24 16:28:02.614452502 +0200
@@ -269,6 +269,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -46464,44 +24852,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstPROGRAMS:
-diff -Nru kdebase-3.4.0.orig/kxkb/Makefile.in kdebase-3.4.0/kxkb/Makefile.in
---- kdebase-3.4.0.orig/kxkb/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/kxkb/Makefile.in 2005-05-07 12:35:58.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -101,18 +101,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_keyboard_la_SOURCES) $(kxkb_la_SOURCES)
- #>- DIST_SOURCES = $(kcm_keyboard_la_SOURCES) $(kxkb_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/kxkb/Makefile.in kdebase-3.4.1/kxkb/Makefile.in
+--- kdebase-3.4.1.orig/kxkb/Makefile.in 2005-05-23 18:38:32.000000000 +0200
++++ kdebase-3.4.1/kxkb/Makefile.in 2005-05-24 16:28:02.650449251 +0200
@@ -323,6 +323,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -46551,55 +24904,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -887,7 +890,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -899,7 +908,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -907,7 +916,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -928,7 +943,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1185,7 +1200,7 @@
+@@ -1197,7 +1200,7 @@
.NOEXPORT:
#>+ 2
@@ -46608,21 +24913,9 @@
#>+ 2
libkdeinit_kxkb_la_LDFLAGS = -no-undefined -avoid-version $(all_libraries)
-diff -Nru kdebase-3.4.0.orig/kxkb/pics/Makefile.in kdebase-3.4.0/kxkb/pics/Makefile.in
---- kdebase-3.4.0.orig/kxkb/pics/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/kxkb/pics/Makefile.in 2005-05-07 12:35:58.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/kxkb/pics/Makefile.in kdebase-3.4.1/kxkb/pics/Makefile.in
+--- kdebase-3.4.1.orig/kxkb/pics/Makefile.in 2005-05-23 18:38:32.000000000 +0200
++++ kdebase-3.4.1/kxkb/pics/Makefile.in 2005-05-24 16:28:02.664447986 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -46654,42 +24947,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -713,17 +716,17 @@
-
- #>+ 13
- install-kde-icons:
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kxkb.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kxkb.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-kxkb.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kxkb.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-kxkb.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kxkb.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kxkb.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kxkb.png
-
- uninstall-kde-icons:
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kxkb.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kxkb.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kxkb.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kxkb.png
-
- #>+ 15
- force-reedit:
-diff -Nru kdebase-3.4.0.orig/l10n/Makefile.in kdebase-3.4.0/l10n/Makefile.in
---- kdebase-3.4.0.orig/l10n/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/l10n/Makefile.in 2005-05-07 12:35:58.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/l10n/Makefile.in kdebase-3.4.1/l10n/Makefile.in
+--- kdebase-3.4.1.orig/l10n/Makefile.in 2005-05-23 18:38:32.000000000 +0200
++++ kdebase-3.4.1/l10n/Makefile.in 2005-05-24 16:28:02.684446180 +0200
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -46721,44 +24981,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/libkonq/favicons/Makefile.in kdebase-3.4.0/libkonq/favicons/Makefile.in
---- kdebase-3.4.0.orig/libkonq/favicons/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/libkonq/favicons/Makefile.in 2005-05-07 12:35:59.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -82,18 +82,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kded_favicons_la_SOURCES)
- DIST_SOURCES = $(kded_favicons_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/libkonq/favicons/Makefile.in kdebase-3.4.1/libkonq/favicons/Makefile.in
+--- kdebase-3.4.1.orig/libkonq/favicons/Makefile.in 2005-05-23 18:38:32.000000000 +0200
++++ kdebase-3.4.1/libkonq/favicons/Makefile.in 2005-05-24 16:28:02.822433716 +0200
@@ -288,6 +288,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -46790,44 +25015,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/libkonq/Makefile.in kdebase-3.4.0/libkonq/Makefile.in
---- kdebase-3.4.0.orig/libkonq/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/libkonq/Makefile.in 2005-05-07 12:35:59.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -119,18 +119,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(konq_sound_la_SOURCES) $(libkonq_la_SOURCES)
- DIST_SOURCES = $(konq_sound_la_SOURCES) $(libkonq_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/libkonq/Makefile.in kdebase-3.4.1/libkonq/Makefile.in
+--- kdebase-3.4.1.orig/libkonq/Makefile.in 2005-05-23 18:38:32.000000000 +0200
++++ kdebase-3.4.1/libkonq/Makefile.in 2005-05-24 16:28:02.807435071 +0200
@@ -341,6 +341,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -46859,147 +25049,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -902,7 +905,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -914,7 +923,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -922,7 +931,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -943,7 +958,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1372,18 +1387,18 @@
-
-
- #>+ 3
--konq_historymgr.moc: $(srcdir)/konq_historymgr.h
-- $(MOC) $(srcdir)/konq_historymgr.h -o konq_historymgr.moc
-+konq_filetip.moc: $(srcdir)/konq_filetip.h
-+ $(MOC) $(srcdir)/konq_filetip.h -o konq_filetip.moc
-
- #>+ 2
--mocs: konq_historymgr.moc
-+mocs: konq_filetip.moc
-
- #>+ 3
--konq_filetip.moc: $(srcdir)/konq_filetip.h
-- $(MOC) $(srcdir)/konq_filetip.h -o konq_filetip.moc
-+konq_historymgr.moc: $(srcdir)/konq_historymgr.h
-+ $(MOC) $(srcdir)/konq_historymgr.h -o konq_historymgr.moc
-
- #>+ 2
--mocs: konq_filetip.moc
-+mocs: konq_historymgr.moc
-
- #>+ 3
- konq_iconviewwidget.moc: $(srcdir)/konq_iconviewwidget.h
-@@ -1414,18 +1429,18 @@
- mocs: knewmenu.moc
-
- #>+ 3
--konq_operations.moc: $(srcdir)/konq_operations.h
-- $(MOC) $(srcdir)/konq_operations.h -o konq_operations.moc
-+kivdirectoryoverlay.moc: $(srcdir)/kivdirectoryoverlay.h
-+ $(MOC) $(srcdir)/kivdirectoryoverlay.h -o kivdirectoryoverlay.moc
-
- #>+ 2
--mocs: konq_operations.moc
-+mocs: kivdirectoryoverlay.moc
-
- #>+ 3
--kivdirectoryoverlay.moc: $(srcdir)/kivdirectoryoverlay.h
-- $(MOC) $(srcdir)/kivdirectoryoverlay.h -o kivdirectoryoverlay.moc
-+konq_operations.moc: $(srcdir)/konq_operations.h
-+ $(MOC) $(srcdir)/konq_operations.h -o konq_operations.moc
-
- #>+ 2
--mocs: kivdirectoryoverlay.moc
-+mocs: konq_operations.moc
-
- #>+ 3
- konq_faviconmgr.moc: $(srcdir)/konq_faviconmgr.h
-@@ -1480,7 +1495,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f konq_historymgr.moc konq_filetip.moc konq_iconviewwidget.moc konq_dirpart.moc konq_drag.moc knewmenu.moc konq_operations.moc kivdirectoryoverlay.moc konq_faviconmgr.moc konq_undo.moc konq_popupmenu.moc konq_bgnddlg.moc
-+ -rm -f konq_filetip.moc konq_historymgr.moc konq_iconviewwidget.moc konq_dirpart.moc konq_drag.moc knewmenu.moc kivdirectoryoverlay.moc konq_operations.moc konq_faviconmgr.moc konq_undo.moc konq_popupmenu.moc konq_bgnddlg.moc
-
- #>+ 2
- KDE_DIST=SERVICEMENUS DESIGN Makefile.in konq_bgnddlg.h directory_bookmarkbar.desktop konqpopupmenuplugin.desktop PLUGINS Makefile.am
-@@ -1538,7 +1553,7 @@
-
-
- #>+ 11
--libkonq_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_popupmenu.cc $(srcdir)/knewmenu.cc $(srcdir)/konq_xmlguiclient.cc $(srcdir)/kfileivi.cc $(srcdir)/konq_iconviewwidget.cc $(srcdir)/konq_settings.cc $(srcdir)/konq_drag.cc $(srcdir)/konq_operations.cc $(srcdir)/konq_dirpart.cc $(srcdir)/konq_propsview.cc $(srcdir)/konq_events.cc $(srcdir)/konq_bgnddlg.cc $(srcdir)/konq_undo.cc $(srcdir)/konq_historymgr.cc $(srcdir)/konq_historycomm.cc $(srcdir)/konq_pixmapprovider.cc $(srcdir)/kivdirectoryoverlay.cc $(srcdir)/konq_faviconmgr.cc $(srcdir)/konq_filetip.cc konq_undo_skel.cc konq_historycomm_skel.cc konq_faviconmgr_skel.cc konq_filetip.moc konq_historymgr.moc konq_iconviewwidget.moc konq_dirpart.moc konq_drag.moc knewmenu.moc konq_operations.moc kivdirectoryoverlay.moc konq_faviconmgr.moc konq_undo.moc konq_bgnddlg.moc konq_popupmenu.moc
-+libkonq_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_popupmenu.cc $(srcdir)/knewmenu.cc $(srcdir)/konq_xmlguiclient.cc $(srcdir)/kfileivi.cc $(srcdir)/konq_iconviewwidget.cc $(srcdir)/konq_settings.cc $(srcdir)/konq_drag.cc $(srcdir)/konq_operations.cc $(srcdir)/konq_dirpart.cc $(srcdir)/konq_propsview.cc $(srcdir)/konq_events.cc $(srcdir)/konq_bgnddlg.cc $(srcdir)/konq_undo.cc $(srcdir)/konq_historymgr.cc $(srcdir)/konq_historycomm.cc $(srcdir)/konq_pixmapprovider.cc $(srcdir)/kivdirectoryoverlay.cc $(srcdir)/konq_faviconmgr.cc $(srcdir)/konq_filetip.cc konq_undo_skel.cc konq_historycomm_skel.cc konq_faviconmgr_skel.cc konq_historymgr.moc konq_filetip.moc konq_iconviewwidget.moc konq_dirpart.moc konq_drag.moc knewmenu.moc kivdirectoryoverlay.moc konq_operations.moc konq_faviconmgr.moc konq_undo.moc konq_bgnddlg.moc konq_popupmenu.moc
- @echo 'creating libkonq_la.all_cc.cc ...'; \
- rm -f libkonq_la.all_cc.files libkonq_la.all_cc.final; \
- echo "#define KDE_USE_FINAL 1" >> libkonq_la.all_cc.final; \
-@@ -1583,8 +1598,8 @@
- konq_bgnddlg.o: konq_bgnddlg.moc
- konq_bgnddlg.lo: konq_bgnddlg.moc
- konq_faviconmgr.lo: konq_faviconmgr.moc
--kivdirectoryoverlay.o: kivdirectoryoverlay.moc
- konq_operations.o: konq_operations.moc
-+kivdirectoryoverlay.o: kivdirectoryoverlay.moc
- konq_filetip.lo: konq_filetip.moc
- konq_drag.lo: konq_drag.moc
- konq_popupmenu.o: konq_popupmenu.moc
-diff -Nru kdebase-3.4.0.orig/libkonq/pics/Makefile.in kdebase-3.4.0/libkonq/pics/Makefile.in
---- kdebase-3.4.0.orig/libkonq/pics/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/libkonq/pics/Makefile.in 2005-05-07 12:35:59.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/libkonq/pics/Makefile.in kdebase-3.4.1/libkonq/pics/Makefile.in
+--- kdebase-3.4.1.orig/libkonq/pics/Makefile.in 2005-05-23 18:38:32.000000000 +0200
++++ kdebase-3.4.1/libkonq/pics/Makefile.in 2005-05-24 16:28:02.831432903 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -47031,21 +25083,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/Makefile.in kdebase-3.4.0/Makefile.in
---- kdebase-3.4.0.orig/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/Makefile.in 2005-05-07 12:35:01.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/Makefile.in kdebase-3.4.1/Makefile.in
+--- kdebase-3.4.1.orig/Makefile.in 2005-05-23 18:38:18.000000000 +0200
++++ kdebase-3.4.1/Makefile.in 2005-05-24 16:27:52.269386917 +0200
@@ -273,6 +273,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -47089,101 +25129,18 @@
cd $(top_srcdir) && $(AUTOHEADER)
rm -f stamp-h1
touch $@
-@@ -675,7 +678,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -687,7 +696,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -695,7 +704,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -716,7 +731,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1239,7 +1254,7 @@
+@@ -1251,7 +1254,7 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=startkde subdirs Makefile.in configure.in.bot configure.files config.h.in configure.in aclocal.m4 configure.in.in acinclude.m4 Makefile.am Makefile.am.in kdebase.lsm
-+KDE_DIST=startkde stamp-h.in subdirs Makefile.in configure.in.bot configure.files config.h.in configure.in aclocal.m4 configure.in.in configure Makefile.am acinclude.m4 Makefile.am.in kdebase.lsm
+-KDE_DIST=startkde subdirs Makefile.in configure.in.bot configure.files config.h.in configure.in aclocal.m4 configure.in.in acinclude.m4 Makefile.am kdebase.lsm Makefile.am.in
++KDE_DIST=stamp-h.in startkde subdirs Makefile.in configure.in.bot configure.files config.h.in configure.in aclocal.m4 configure.in.in configure acinclude.m4 Makefile.am kdebase.lsm Makefile.am.in
#>+ 2
docs-am:
-diff -Nru kdebase-3.4.0.orig/nsplugins/Makefile.in kdebase-3.4.0/nsplugins/Makefile.in
---- kdebase-3.4.0.orig/nsplugins/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/nsplugins/Makefile.in 2005-05-07 12:35:59.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -95,18 +95,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_nsplugins_la_SOURCES) $(libnsplugin_la_SOURCES) \
- $(nspluginscan_SOURCES)
+diff -rua kdebase-3.4.1.orig/nsplugins/Makefile.in kdebase-3.4.1/nsplugins/Makefile.in
+--- kdebase-3.4.1.orig/nsplugins/Makefile.in 2005-05-23 18:38:32.000000000 +0200
++++ kdebase-3.4.1/nsplugins/Makefile.in 2005-05-24 16:28:02.856430645 +0200
@@ -318,6 +318,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -47215,92 +25172,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -829,7 +832,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -841,7 +850,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -849,7 +858,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -870,7 +885,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/nsplugins/test/Makefile.in kdebase-3.4.0/nsplugins/test/Makefile.in
---- kdebase-3.4.0.orig/nsplugins/test/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/nsplugins/test/Makefile.in 2005-05-07 12:35:59.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -66,18 +66,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(testnsplugin_SOURCES)
- DIST_SOURCES = $(testnsplugin_SOURCES)
+diff -rua kdebase-3.4.1.orig/nsplugins/test/Makefile.in kdebase-3.4.1/nsplugins/test/Makefile.in
+--- kdebase-3.4.1.orig/nsplugins/test/Makefile.in 2005-05-23 18:38:32.000000000 +0200
++++ kdebase-3.4.1/nsplugins/test/Makefile.in 2005-05-24 16:28:02.876428839 +0200
@@ -270,6 +270,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -47332,44 +25206,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-diff -Nru kdebase-3.4.0.orig/nsplugins/viewer/Makefile.in kdebase-3.4.0/nsplugins/viewer/Makefile.in
---- kdebase-3.4.0.orig/nsplugins/viewer/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/nsplugins/viewer/Makefile.in 2005-05-07 12:35:59.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -74,18 +74,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(nspluginviewer_SOURCES)
- DIST_SOURCES = $(nspluginviewer_SOURCES)
+diff -rua kdebase-3.4.1.orig/nsplugins/viewer/Makefile.in kdebase-3.4.1/nsplugins/viewer/Makefile.in
+--- kdebase-3.4.1.orig/nsplugins/viewer/Makefile.in 2005-05-23 18:38:32.000000000 +0200
++++ kdebase-3.4.1/nsplugins/viewer/Makefile.in 2005-05-24 16:28:02.931423872 +0200
@@ -277,6 +277,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -47401,35 +25240,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/nsplugins/wrapper/Makefile.in kdebase-3.4.0/nsplugins/wrapper/Makefile.in
---- kdebase-3.4.0.orig/nsplugins/wrapper/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/nsplugins/wrapper/Makefile.in 2005-05-07 12:35:59.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -69,11 +69,11 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libnswrapper_la_SOURCES)
- DIST_SOURCES = $(libnswrapper_la_SOURCES)
+diff -rua kdebase-3.4.1.orig/nsplugins/wrapper/Makefile.in kdebase-3.4.1/nsplugins/wrapper/Makefile.in
+--- kdebase-3.4.1.orig/nsplugins/wrapper/Makefile.in 2005-05-23 18:38:32.000000000 +0200
++++ kdebase-3.4.1/nsplugins/wrapper/Makefile.in 2005-05-24 16:28:02.948422336 +0200
@@ -265,6 +265,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -47461,21 +25274,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdebase-3.4.0.orig/pics/crystalsvg/Makefile.in kdebase-3.4.0/pics/crystalsvg/Makefile.in
---- kdebase-3.4.0.orig/pics/crystalsvg/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/pics/crystalsvg/Makefile.in 2005-05-07 12:35:59.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/pics/crystalsvg/Makefile.in kdebase-3.4.1/pics/crystalsvg/Makefile.in
+--- kdebase-3.4.1.orig/pics/crystalsvg/Makefile.in 2005-05-23 18:38:32.000000000 +0200
++++ kdebase-3.4.1/pics/crystalsvg/Makefile.in 2005-05-24 16:28:03.050413124 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -47507,1517 +25308,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -706,786 +709,786 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=cr32-app-sodipodi.png cr48-app-terminal.png cr48-app-xedit.png cr48-app-gaim.png crsc-app-antivirus.svgz cr16-app-assistant.png cr32-app-mozilla.png cr64-app-licq.png cr48-app-xv.png cr32-app-xmag.png cr16-app-applixware.png cr64-app-package_network.png cr32-app-planner.png cr32-app-penguin.png cr64-app-package_development.png crsc-app-hardware.svgz cr16-app-remote.png cr32-app-edu_miscellaneous.png cr16-app-gnucash.png cr48-app-package_settings.png cr48-app-linuxconf.png cr16-app-package_settings.png cr32-app-gnomemeeting.png cr16-app-realplayer.png cr16-app-package_edutainment.png cr32-app-edu_mathematics.png cr128-app-package_multimedia.png cr16-app-thunderbird.png cr48-app-package_games_arcade.png cr32-app-mathematica.png cr32-app-gnumeric.png cr16-app-gnome_apps.png cr16-app-xchat.png cr48-app-package_favourite.png cr16-app-wine.png cr32-app-package_favourite.png cr16-app-package_editors.png cr32-app-xchat.png cr128-app-package_games.png cr16-app-xfig.png cr48-app-wmaker_apps.png cr32-app-thunderbird.png cr48-app-gnome_apps.png cr32-app-designer.png cr64-app-linuxconf.png cr32-app-edu_science.png cr16-app-package_wordprocessing.png cr16-app-mozilla_m.png cr48-app-sodipodi.png cr128-app-package_development.png cr128-app-package_utilities.png cr48-app-package_multimedia.png cr16-app-package_favourite.png cr32-app-mozilla_mail.png cr22-app-randr.png cr16-app-package_multimedia.png cr64-app-package_multimedia.png cr48-app-galeon.png crsc-app-clanbomber.svgz cr16-app-xconsole.png cr64-app-phppg.png cr32-app-blender.png cr48-app-clanbomber.png cr32-app-xedit.png cr16-app-sodipodi.png cr32-app-xclipboard.png crsc-app-openoffice.svgz crsc-app-aktion.svgz cr32-app-package_multimedia.png cr16-app-licq.png cr128-app-pysol.png cr16-app-netscape.png cr16-app-kvirc.png Makefile.in cr128-app-linuxconf.png cr16-app-xfmail.png cr32-app-bluefish.png cr48-app-edu_mathematics.png cr48-app-wp.png cr32-app-linguist.png crsc-app-xpaint.svgz crsc-app-browser.svgz cr48-app-xmag.png cr16-app-dlgedit.png crsc-app-xchat.svgz cr48-app-xclock.png cr64-app-package_toys.png cr128-app-wp.png cr64-app-package_utilities.png crsc-app-netscape.svgz cr128-app-package_network.png cr32-app-pybliographic.png cr32-app-eclipse.png cr16-app-designer.png cr64-app-package_games.png cr48-app-emacs.png cr32-app-kfm_home.png cr16-app-penguin.png cr48-app-gnomemeeting.png cr22-app-nedit.png cr22-app-kvirc.png cr32-app-applixware.png cr16-app-pybliographic.png cr16-app-mathematica.png cr16-app-clanbomber.png cr22-app-package_development.png crsc-app-terminal.svgz cr64-app-kfm_home.png cr32-app-xapp.png cr48-app-licq.png cr64-app-applixware.png cr48-app-xfmail.png cr16-app-package_applications.png cr32-app-xload.png cr32-app-package_toys.png cr64-app-tux.png crsc-app-realplayer.svgz cr64-app-package_favourite.png cr16-app-gimp.png crsc-app-quicktime.svgz cr64-app-package.png cr16-app-mozilla_mail.png cr16-app-package_system.png cr16-app-xclock.png cr22-app-email.png cr64-app-kvirc.png cr64-app-wp.png cr32-app-wine.png cr32-app-package_games.png cr32-app-assistant.png cr32-app-randr.png cr32-app-emacs.png cr32-app-edu_languages.png cr32-app-dlgedit.png cr64-app-gvim.png cr32-app-package_development.png cr64-app-penguin.png cr48-app-package_games_board.png cr32-app-package_games_board.png cr48-app-remote.png cr48-app-blender.png cr128-app-phppg.png cr48-app-package_applications.png cr48-app-gvim.png cr16-app-xosview.png cr64-app-nedit.png cr32-app-terminal.png cr16-app-package_games.png cr16-app-package_application.png cr48-app-staroffice.png cr16-app-phppg.png crsc-app-xcalc.svgz cr48-app-gnucash.png cr48-app-mozilla.png cr32-app-package_games_arcade.png cr32-app-phppg.png crsc-app-tux.svgz cr128-app-licq.png cr16-app-package_games_card.png cr16-app-edu_languages.png cr128-app-randr.png cr48-app-package_games.png cr48-app-opera.png cr128-app-terminal.png crsc-app-core.svgz cr48-app-evolution.png crsc-app-display.svgz cr64-app-terminal.png cr32-app-x.png cr16-app-dia.png cr48-app-kfm_home.png cr16-app-mozilla.png crsc-app-xclock.svgz cr32-app-clanbomber.png cr32-app-evolution.png cr32-app-package.png cr48-app-edu_science.png cr32-app-gaim.png cr64-app-gimp.png cr48-app-xemacs.png cr48-app-pan.png cr48-app-package.png cr48-app-pysol.png cr16-app-blender.png cr48-app-designer.png cr64-app-randr.png cr48-app-package_games_strategy.png crsc-app-my_mac.svgz cr32-app-xeyes.png cr32-app-acroread.png cr16-app-evolution.png crsc-app-shell.svgz cr48-app-xchat.png cr16-app-acroread.png cr64-app-package_settings.png cr128-app-email.png cr48-app-planner.png cr128-app-applixware.png cr48-app-vnc.png cr128-app-staroffice.png crsc-app-gnome_apps.svgz cr32-app-xcalc.png cr48-app-mozilla_mail.png cr48-app-applixware.png cr16-app-scribus.png cr16-app-xedit.png cr16-app-gnumeric.png cr48-app-wine.png cr32-app-package_games_strategy.png cr32-app-gv.png crsc-app-clock.svgz cr16-app-gabber.png cr64-app-email.png cr16-app-emacs.png cr16-app-plan.png cr32-app-licq.png cr32-app-xfig.png cr16-app-gvim.png cr16-app-wabi.png cr16-app-linuxconf.png cr32-app-xosview.png cr32-app-package_settings.png cr16-app-email.png cr32-app-vnc.png cr16-app-lyx.png cr48-app-eclipse.png cr128-app-acroread.png cr48-app-edu_languages.png cr32-app-xv.png cr128-app-kfm_home.png crsc-app-email.svgz cr64-app-package_applications.png cr16-app-xpaint.png crsc-app-x.svgz cr32-app-package_edutainment.png crsc-app-camera.svgz cr48-app-randr.png cr48-app-abiword.png cr16-app-nedit.png cr32-app-linuxconf.png cr32-app-gabber.png cr16-app-xv.png cr16-app-gnomemeeting.png cr32-app-package_wordprocessing.png cr128-app-package_toys.png cr16-app-gv.png cr48-app-netscape.png cr64-app-xmag.png cr16-app-package_development.png cr16-app-xemacs.png cr64-app-pysol.png cr16-app-package_games_strategy.png cr48-app-package_network.png crsc-app-package_toys.svgz cr16-app-eclipse.png cr16-app-xeyes.png cr32-app-xpaint.png crsc-app-personal.svgz cr16-app-alevt.png cr48-app-kvirc.png cr128-app-mozilla.png cr16-app-tux.png crsc-app-penguin.svgz cr128-app-gimp.png cr16-app-package_utilities.png cr48-app-bluefish.png cr32-app-xclock.png cr16-app-vnc.png cr16-app-package_network.png cr16-app-kfm_home.png cr32-app-wabi.png cr128-app-clanbomber.png cr48-app-scribus.png cr128-app-tux.png cr32-app-pan.png cr16-app-randr.png crsc-app-galeon.svgz cr32-app-lyx.png cr32-app-opera.png cr48-app-package_system.png cr48-app-gabber.png cr16-app-xclipboard.png cr48-app-mozilla_m.png cr64-app-xfmail.png cr48-app-gimp.png cr16-app-package_games_arcade.png crsc-app-xeyes.svgz cr32-app-email.png cr32-app-package_utilities.png cr48-app-nedit.png cr16-app-gaim.png cr128-app-xmag.png cr128-app-penguin.png cr32-app-package_games_card.png cr48-app-package_edutainment.png cr48-app-package_development.png crsc-app-applixware.svgz cr32-app-xmms.png cr48-app-package_toys.png crsc-app-wine.svgz cr32-app-xemacs.png cr32-app-abiword.png cr48-app-gnumeric.png cr16-app-xcalc.png cr16-app-abiword.png cr64-app-xclock.png cr32-app-package_applications.png cr64-app-mozilla.png cr32-app-alevt.png cr16-app-xmms.png cr48-app-email.png cr48-app-package_utilities.png crsc-app-aim.svgz cr32-app-realplayer.png cr32-app-xawtv.png cr48-app-penguin.png cr32-app-package_editors.png cr32-app-nedit.png cr16-app-planner.png cr128-app-netscape.png cr16-app-package.png cr32-app-package_graphics.png cr32-app-kvirc.png cr16-app-package_toys.png cr16-app-xmag.png cr32-app-scribus.png crsc-app-error.svgz cr48-app-tux.png cr32-app-tux.png cr16-app-edu_science.png cr48-app-acroread.png cr32-app-xconsole.png cr128-app-package_favourite.png cr16-app-bluefish.png crsc-app-package_development.svgz cr64-app-qtella.png crsc-app-xapp.svgz cr32-app-gimp.png cr16-app-pan.png cr64-app-staroffice.png cr32-app-mozilla_m.png cr128-app-package_applications.png cr64-app-acroread.png cr48-app-package_graphics.png crsc-app-download_manager.svgz cr32-app-wp.png cr16-app-wp.png cr16-app-package_graphics.png cr32-app-firefox.png cr16-app-edu_miscellaneous.png cr32-app-galeon.png cr48-app-dia.png cr32-app-plan.png cr16-app-linguist.png cr48-app-package_editors.png cr16-app-firefox.png cr128-app-package_settings.png cr48-app-firefox.png cr48-app-phppg.png cr128-app-package.png cr16-app-package_games_board.png cr32-app-gnucash.png cr16-app-edu_mathematics.png cr128-app-xfmail.png cr32-app-pysol.png cr16-app-opera.png cr32-app-package_system.png crsc-app-acroread.svgz cr48-app-package_wordprocessing.png cr32-app-gvim.png cr32-app-netscape.png cr32-app-dia.png cr48-app-edu_miscellaneous.png cr32-app-xfmail.png crsc-app-staroffice.svgz cr64-app-netscape.png cr64-app-clanbomber.png cr48-app-package_games_card.png cr128-app-xclock.png cr32-app-package_network.png cr16-app-terminal.png cr32-app-gnome_apps.png Makefile.am cr16-app-xload.png
-+KDE_DIST=cr32-app-sodipodi.png cr48-app-terminal.png cr48-app-gaim.png cr48-app-xedit.png crsc-app-antivirus.svgz cr16-app-assistant.png cr32-app-mozilla.png cr64-app-licq.png cr48-app-xv.png cr16-app-applixware.png cr32-app-xmag.png cr64-app-package_network.png cr32-app-planner.png cr32-app-penguin.png cr64-app-package_development.png crsc-app-hardware.svgz cr16-app-remote.png cr32-app-edu_miscellaneous.png cr16-app-gnucash.png cr48-app-package_settings.png cr48-app-linuxconf.png cr16-app-package_settings.png cr32-app-gnomemeeting.png cr16-app-package_edutainment.png cr16-app-realplayer.png cr32-app-edu_mathematics.png cr128-app-package_multimedia.png cr16-app-thunderbird.png cr48-app-package_games_arcade.png cr32-app-gnumeric.png cr32-app-mathematica.png cr16-app-gnome_apps.png cr16-app-xchat.png cr48-app-package_favourite.png cr16-app-wine.png cr32-app-package_favourite.png cr16-app-package_editors.png cr32-app-xchat.png cr128-app-package_games.png cr16-app-xfig.png cr48-app-wmaker_apps.png cr32-app-thunderbird.png cr48-app-gnome_apps.png cr32-app-designer.png cr64-app-linuxconf.png cr16-app-package_wordprocessing.png cr32-app-edu_science.png cr16-app-mozilla_m.png cr48-app-sodipodi.png cr128-app-package_utilities.png cr128-app-package_development.png cr48-app-package_multimedia.png cr16-app-package_favourite.png cr32-app-mozilla_mail.png cr22-app-randr.png cr16-app-package_multimedia.png cr48-app-galeon.png cr64-app-package_multimedia.png crsc-app-clanbomber.svgz cr16-app-xconsole.png cr32-app-blender.png cr64-app-phppg.png cr32-app-xedit.png cr16-app-sodipodi.png cr48-app-clanbomber.png cr32-app-xclipboard.png crsc-app-openoffice.svgz cr32-app-package_multimedia.png cr128-app-pysol.png cr16-app-licq.png crsc-app-aktion.svgz cr16-app-netscape.png cr16-app-kvirc.png Makefile.in cr128-app-linuxconf.png cr16-app-xfmail.png cr32-app-bluefish.png cr48-app-edu_mathematics.png cr48-app-wp.png cr32-app-linguist.png crsc-app-xpaint.svgz crsc-app-browser.svgz cr48-app-xmag.png cr16-app-dlgedit.png cr48-app-xclock.png crsc-app-xchat.svgz cr64-app-package_toys.png cr128-app-wp.png cr64-app-package_utilities.png crsc-app-netscape.svgz cr128-app-package_network.png cr32-app-pybliographic.png cr16-app-designer.png cr32-app-eclipse.png cr64-app-package_games.png cr48-app-emacs.png cr32-app-kfm_home.png cr16-app-penguin.png cr48-app-gnomemeeting.png cr22-app-nedit.png cr22-app-kvirc.png cr32-app-applixware.png cr16-app-pybliographic.png cr16-app-mathematica.png cr16-app-clanbomber.png cr22-app-package_development.png crsc-app-terminal.svgz cr64-app-kfm_home.png cr32-app-xapp.png cr48-app-licq.png cr48-app-xfmail.png cr64-app-applixware.png cr16-app-package_applications.png cr32-app-xload.png cr32-app-package_toys.png cr64-app-tux.png crsc-app-realplayer.svgz cr64-app-package_favourite.png cr16-app-gimp.png crsc-app-quicktime.svgz cr64-app-package.png cr16-app-mozilla_mail.png cr16-app-package_system.png cr16-app-xclock.png cr22-app-email.png cr64-app-kvirc.png cr64-app-wp.png cr32-app-package_games.png cr32-app-wine.png cr32-app-assistant.png cr32-app-randr.png cr32-app-emacs.png cr32-app-edu_languages.png cr32-app-dlgedit.png cr64-app-gvim.png cr32-app-package_development.png cr32-app-package_games_board.png cr64-app-penguin.png cr48-app-package_games_board.png cr48-app-remote.png cr48-app-blender.png cr128-app-phppg.png cr48-app-package_applications.png cr48-app-gvim.png cr16-app-xosview.png cr64-app-nedit.png cr32-app-terminal.png cr16-app-package_application.png cr16-app-package_games.png cr48-app-staroffice.png cr16-app-phppg.png cr48-app-gnucash.png crsc-app-xcalc.svgz cr32-app-package_games_arcade.png cr48-app-mozilla.png cr32-app-phppg.png crsc-app-tux.svgz cr128-app-licq.png cr16-app-package_games_card.png cr16-app-edu_languages.png cr128-app-randr.png cr48-app-package_games.png cr48-app-opera.png cr128-app-terminal.png cr48-app-evolution.png crsc-app-core.svgz crsc-app-display.svgz cr64-app-terminal.png cr16-app-dia.png cr32-app-x.png cr16-app-mozilla.png cr48-app-kfm_home.png cr32-app-clanbomber.png crsc-app-xclock.svgz cr32-app-evolution.png cr32-app-package.png cr48-app-edu_science.png cr32-app-gaim.png cr64-app-gimp.png cr48-app-pan.png cr48-app-xemacs.png cr48-app-package.png cr48-app-pysol.png cr16-app-blender.png cr48-app-designer.png cr64-app-randr.png cr48-app-package_games_strategy.png crsc-app-my_mac.svgz cr32-app-acroread.png cr16-app-evolution.png cr32-app-xeyes.png crsc-app-shell.svgz cr16-app-acroread.png cr48-app-xchat.png cr64-app-package_settings.png cr128-app-email.png cr48-app-planner.png cr128-app-applixware.png cr48-app-vnc.png cr128-app-staroffice.png cr32-app-xcalc.png crsc-app-gnome_apps.svgz cr48-app-mozilla_mail.png cr48-app-applixware.png cr16-app-scribus.png cr16-app-xedit.png cr16-app-gnumeric.png cr48-app-wine.png cr32-app-gv.png cr32-app-package_games_strategy.png cr16-app-gabber.png crsc-app-clock.svgz cr64-app-email.png cr16-app-emacs.png cr16-app-plan.png cr32-app-licq.png cr16-app-gvim.png cr32-app-xfig.png cr16-app-wabi.png cr16-app-linuxconf.png cr32-app-xosview.png cr32-app-package_settings.png cr16-app-email.png cr16-app-lyx.png cr32-app-vnc.png cr48-app-eclipse.png cr128-app-acroread.png cr32-app-xv.png cr48-app-edu_languages.png cr128-app-kfm_home.png crsc-app-email.svgz cr64-app-package_applications.png cr16-app-xpaint.png crsc-app-x.svgz cr32-app-package_edutainment.png crsc-app-camera.svgz cr48-app-randr.png cr16-app-nedit.png cr48-app-abiword.png cr32-app-linuxconf.png cr16-app-gnomemeeting.png cr16-app-xv.png cr32-app-gabber.png cr32-app-package_wordprocessing.png cr128-app-package_toys.png cr16-app-gv.png cr48-app-netscape.png cr64-app-xmag.png cr16-app-package_development.png cr16-app-xemacs.png cr64-app-pysol.png cr16-app-package_games_strategy.png cr48-app-package_network.png crsc-app-package_toys.svgz cr16-app-eclipse.png cr16-app-xeyes.png cr32-app-xpaint.png crsc-app-personal.svgz cr16-app-alevt.png cr48-app-kvirc.png cr128-app-mozilla.png cr16-app-tux.png crsc-app-penguin.svgz cr128-app-gimp.png cr16-app-package_utilities.png cr48-app-bluefish.png cr16-app-kfm_home.png cr32-app-xclock.png cr16-app-vnc.png cr16-app-package_network.png cr32-app-wabi.png cr128-app-clanbomber.png cr48-app-scribus.png cr128-app-tux.png cr32-app-pan.png cr16-app-randr.png crsc-app-galeon.svgz cr32-app-lyx.png cr32-app-opera.png cr48-app-package_system.png cr48-app-gabber.png cr16-app-xclipboard.png cr48-app-mozilla_m.png cr64-app-xfmail.png cr48-app-gimp.png cr16-app-package_games_arcade.png crsc-app-xeyes.svgz cr32-app-email.png cr32-app-package_utilities.png cr16-app-gaim.png cr128-app-xmag.png cr48-app-nedit.png cr128-app-penguin.png cr32-app-package_games_card.png cr48-app-package_edutainment.png crsc-app-applixware.svgz cr48-app-package_development.png cr32-app-xmms.png cr48-app-package_toys.png crsc-app-wine.svgz cr32-app-xemacs.png cr32-app-abiword.png cr48-app-gnumeric.png cr16-app-xcalc.png cr16-app-abiword.png cr32-app-package_applications.png cr64-app-xclock.png cr16-app-xmms.png cr64-app-mozilla.png cr32-app-alevt.png cr48-app-email.png cr48-app-package_utilities.png crsc-app-aim.svgz cr32-app-realplayer.png cr32-app-xawtv.png cr48-app-penguin.png cr32-app-package_editors.png cr32-app-nedit.png cr16-app-planner.png cr128-app-netscape.png cr16-app-package.png cr32-app-kvirc.png cr32-app-package_graphics.png cr16-app-package_toys.png cr16-app-xmag.png cr32-app-scribus.png cr48-app-tux.png crsc-app-error.svgz cr32-app-tux.png cr16-app-edu_science.png cr48-app-acroread.png cr128-app-package_favourite.png cr32-app-xconsole.png cr16-app-bluefish.png crsc-app-package_development.svgz cr64-app-qtella.png crsc-app-xapp.svgz cr32-app-gimp.png cr16-app-pan.png cr64-app-staroffice.png cr32-app-mozilla_m.png cr128-app-package_applications.png cr64-app-acroread.png cr48-app-package_graphics.png cr32-app-wp.png crsc-app-download_manager.svgz cr16-app-wp.png cr16-app-package_graphics.png cr32-app-firefox.png cr32-app-galeon.png cr16-app-edu_miscellaneous.png cr48-app-dia.png cr16-app-linguist.png cr32-app-plan.png cr16-app-firefox.png cr128-app-package_settings.png cr48-app-package_editors.png cr48-app-firefox.png cr128-app-package.png cr48-app-phppg.png cr16-app-package_games_board.png cr32-app-gnucash.png cr16-app-edu_mathematics.png cr128-app-xfmail.png cr32-app-pysol.png cr16-app-opera.png cr32-app-package_system.png cr48-app-package_wordprocessing.png crsc-app-acroread.svgz cr32-app-gvim.png cr32-app-dia.png cr32-app-netscape.png cr48-app-edu_miscellaneous.png cr32-app-xfmail.png crsc-app-staroffice.svgz cr64-app-clanbomber.png cr64-app-netscape.png cr48-app-package_games_card.png cr128-app-xclock.png cr32-app-package_network.png cr16-app-terminal.png cr32-app-gnome_apps.png Makefile.am cr16-app-xload.png
-
- #>+ 2
- docs-am:
-
- #>+ 775
- install-kde-icons:
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-gnome_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnome_apps.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-browser.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/browser.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gimp.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-evolution.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/evolution.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-error.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/error.svgz
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_games.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_development.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xmag.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_science.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-assistant.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/assistant.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/blender.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-xload.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xload.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gimp.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclock.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-abiword.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/abiword.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wine.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/phppg.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/linuxconf.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmag.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-antivirus.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/antivirus.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pan.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-- $(INSTALL_DATA) $(srcdir)/cr128-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/acroread.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/applixware.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clanbomber.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/gimp.png
- $(INSTALL_DATA) $(srcdir)/cr128-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kfm_home.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/licq.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/linuxconf.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/mozilla.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-package_wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_wordprocessing.png
- $(INSTALL_DATA) $(srcdir)/cr128-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/netscape.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_applications.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_favourite.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_games.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_multimedia.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_network.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_settings.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_toys.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_utilities.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/penguin.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/phppg.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/pysol.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/randr.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-staroffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/staroffice.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/terminal.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/tux.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/wp.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xclock.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xfmail.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xmag.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-abiword.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/abiword.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/acroread.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-alevt.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/alevt.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/applixware.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-assistant.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/assistant.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/blender.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-bluefish.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bluefish.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clanbomber.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-designer.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/designer.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-dia.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dia.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-dlgedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dlgedit.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-display.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/display.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-dlgedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dlgedit.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_development.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-tux.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/tux.svgz
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-xeyes.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xeyes.svgz
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/email.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-package_edutainment.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_edutainment.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xclock.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-eclipse.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/eclipse.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/emacs.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-evolution.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/evolution.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-firefox.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/firefox.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-gabber.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gabber.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-gaim.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gaim.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gimp.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-gnome_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnome_apps.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-gnomemeeting.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnomemeeting.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-gnucash.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnucash.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-gnumeric.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnumeric.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-gv.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gv.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gvim.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfm_home.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kvirc.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/licq.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-linguist.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linguist.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linuxconf.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-lyx.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/lyx.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-mathematica.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mathematica.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-mozilla_m.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_m.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-mozilla_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_mail.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/nedit.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/netscape.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-opera.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/opera.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-package_application.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_application.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_applications.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_development.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-package_editors.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_editors.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-package_edutainment.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_edutainment.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_favourite.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_arcade.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_board.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-package_games_card.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_card.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-package_games_strategy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_strategy.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-package_graphics.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_graphics.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_multimedia.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_network.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_settings.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-package_system.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_system.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_toys.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_games.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-vnc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/vnc.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-opera.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/opera.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_utilities.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-package_wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_wordprocessing.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pan.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/penguin.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/phppg.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-plan.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/plan.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-planner.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/planner.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-pybliographic.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pybliographic.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/gimp.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-galeon.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/galeon.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clanbomber.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-xedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xedit.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/randr.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kvirc.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-realplayer.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/realplayer.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-remote.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/remote.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-scribus.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/scribus.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-sodipodi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/sodipodi.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
-- $(INSTALL_DATA) $(srcdir)/cr22-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/email.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/terminal.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-thunderbird.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/thunderbird.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/tux.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-vnc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/vnc.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-wabi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wabi.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wine.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wp.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-xcalc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xcalc.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-xchat.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xchat.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-xclipboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclipboard.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclock.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-xconsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xconsole.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-xedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xedit.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-xemacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xemacs.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-xeyes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xeyes.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-xfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfig.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfmail.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/linuxconf.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-xchat.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xchat.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-mozilla_m.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_m.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-edu_mathematics.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_mathematics.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/acroread.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-core.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/core.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-package_system.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_system.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-x.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/x.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-planner.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/planner.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_network.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pysol.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-plan.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/plan.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-package_toys.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_toys.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-xfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfig.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-gnumeric.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnumeric.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/tux.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_development.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-xload.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xload.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmag.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-xmms.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmms.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-xosview.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xosview.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-xpaint.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xpaint.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-xv.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xv.png
-- $(INSTALL_DATA) $(srcdir)/cr22-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kvirc.png
-- $(INSTALL_DATA) $(srcdir)/cr22-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/nedit.png
-- $(INSTALL_DATA) $(srcdir)/cr22-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/randr.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-abiword.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/abiword.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/acroread.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-alevt.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/alevt.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/blender.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/applixware.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-assistant.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/assistant.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-bluefish.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bluefish.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clanbomber.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-designer.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/designer.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-dia.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dia.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-dlgedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dlgedit.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-eclipse.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/eclipse.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/emacs.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-evolution.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/evolution.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-firefox.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/firefox.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-gabber.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gabber.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-package_games_card.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_card.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-package_editors.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_editors.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-gaim.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gaim.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-galeon.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/galeon.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gimp.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-gnome_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnome_apps.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-gnomemeeting.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnomemeeting.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-gnucash.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnucash.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-gnumeric.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnumeric.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-gv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gv.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/phppg.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-xclock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xclock.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-designer.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/designer.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_network.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-xemacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xemacs.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-aktion.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aktion.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/nedit.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-bluefish.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bluefish.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gvim.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/blender.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfm_home.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_toys.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/netscape.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_toys.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/licq.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/applixware.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_settings.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-gabber.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gabber.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-opera.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/opera.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/randr.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/phppg.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_arcade.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kvirc.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-xmms.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmms.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_science.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gvim.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfm_home.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kvirc.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_settings.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-xpaint.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xpaint.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-acroread.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/acroread.svgz
- $(INSTALL_DATA) $(srcdir)/cr32-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/licq.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-linguist.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linguist.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linuxconf.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-lyx.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/lyx.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-mathematica.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mathematica.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-mozilla_m.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_m.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clanbomber.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_toys.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_multimedia.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_favourite.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-xosview.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xosview.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-mozilla_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_mail.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/nedit.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/netscape.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-opera.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/opera.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_applications.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-package_editors.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_editors.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-package_edutainment.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_edutainment.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_favourite.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_arcade.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_board.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-package_games_card.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_card.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-gnome_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnome_apps.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-download_manager.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/download_manager.svgz
- $(INSTALL_DATA) $(srcdir)/cr32-app-package_games_strategy.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_strategy.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-package_graphics.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_graphics.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_multimedia.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_network.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_settings.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-package_system.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_system.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_toys.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_utilities.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-package_wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_wordprocessing.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pan.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/penguin.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/phppg.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-plan.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/plan.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-planner.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/planner.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-pybliographic.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pybliographic.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pysol.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/randr.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-realplayer.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/realplayer.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-clock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clock.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-sodipodi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/sodipodi.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-designer.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/designer.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/penguin.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-edu_languages.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_languages.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-bluefish.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bluefish.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-linguist.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linguist.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_multimedia.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pan.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfm_home.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/netscape.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-edu_miscellaneous.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_miscellaneous.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-abiword.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/abiword.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linuxconf.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-xcalc.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xcalc.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-lyx.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/lyx.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-gv.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gv.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-gnucash.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnucash.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xfmail.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_science.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/nedit.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-vnc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/vnc.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_applications.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/tux.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-scribus.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/scribus.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-sodipodi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/sodipodi.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/email.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/terminal.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-thunderbird.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/thunderbird.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/tux.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-vnc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/vnc.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-wabi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wabi.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wine.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wp.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-x.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/x.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-xapp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xapp.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-xawtv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xawtv.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-xcalc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xcalc.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-xchat.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xchat.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-xclipboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclipboard.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclock.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-xconsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xconsole.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-xedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xedit.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-xemacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xemacs.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-xeyes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xeyes.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-xfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfig.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfmail.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-xload.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xload.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmag.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-xmms.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmms.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-xosview.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xosview.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-xpaint.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xpaint.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-xv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xv.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-abiword.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/abiword.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/acroread.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/applixware.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/blender.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-bluefish.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bluefish.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clanbomber.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-designer.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/designer.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-dia.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/dia.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-eclipse.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/eclipse.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/emacs.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-evolution.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/evolution.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-firefox.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/firefox.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-gabber.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gabber.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-gaim.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gaim.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-galeon.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/galeon.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gimp.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-gnome_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnome_apps.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-gnomemeeting.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnomemeeting.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-gnucash.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnucash.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gimp.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-gv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gv.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-edu_mathematics.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_mathematics.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/applixware.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-edu_languages.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_languages.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-gnumeric.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnumeric.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gvim.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfm_home.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kvirc.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/licq.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/linuxconf.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clanbomber.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-gabber.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gabber.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-pybliographic.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pybliographic.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-mathematica.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mathematica.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-staroffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/staroffice.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-wabi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wabi.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-xpaint.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xpaint.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-xchat.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xchat.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-xedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xedit.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/terminal.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfmail.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_utilities.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-xeyes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xeyes.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gimp.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-dia.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dia.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-package_graphics.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_graphics.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-planner.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/planner.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-shell.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/shell.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/email.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-wine.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/wine.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_board.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-package_graphics.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_graphics.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-assistant.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/assistant.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xfmail.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/tux.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-xclipboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclipboard.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-openoffice.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/openoffice.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-edu_miscellaneous.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_miscellaneous.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-netscape.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/netscape.svgz
- $(INSTALL_DATA) $(srcdir)/cr48-app-mozilla_m.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_m.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-mozilla_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_mail.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/nedit.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/netscape.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-opera.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/opera.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_applications.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-package_editors.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_editors.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-package_edutainment.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_edutainment.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_favourite.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_arcade.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_board.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-package_games_card.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_card.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pan.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-gnumeric.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnumeric.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-package_games_strategy.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_strategy.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-package_graphics.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_graphics.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_multimedia.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_network.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_settings.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-package_system.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_system.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_toys.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_utilities.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-package_wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_wordprocessing.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/penguin.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/phppg.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-planner.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/planner.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pysol.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/randr.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-remote.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/remote.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-scribus.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/scribus.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/terminal.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/phppg.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-xconsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xconsole.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-abiword.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/abiword.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/emacs.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-package_system.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_system.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/applixware.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xclock.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_development.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-dlgedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dlgedit.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-package_edutainment.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_edutainment.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-sodipodi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/sodipodi.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-- $(INSTALL_DATA) $(srcdir)/cr64-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/email.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-staroffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/staroffice.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/terminal.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/tux.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-vnc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/vnc.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wine.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-wmaker_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wmaker_apps.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wp.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-xchat.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xchat.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xclock.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-xedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xedit.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-xemacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xemacs.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xfmail.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xmag.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-remote.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/remote.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kfm_home.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-wmaker_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wmaker_apps.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/penguin.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/netscape.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-firefox.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/firefox.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-xv.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xv.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/acroread.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/applixware.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-xedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xedit.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wp.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-xeyes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xeyes.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/mozilla.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-mozilla_m.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_m.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-xapp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xapp.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-staroffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/staroffice.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_favourite.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-package_editors.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_editors.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_board.png
- $(INSTALL_DATA) $(srcdir)/cr64-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clanbomber.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gimp.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gvim.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kfm_home.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/wp.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-xv.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xv.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/email.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-realplayer.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/realplayer.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_network.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-gnomemeeting.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnomemeeting.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/randr.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-planner.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/planner.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wp.png
- $(INSTALL_DATA) $(srcdir)/cr64-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kvirc.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/licq.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/linuxconf.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/mozilla.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/nedit.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/netscape.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_applications.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_favourite.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_games.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_multimedia.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_network.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_settings.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_toys.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_utilities.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/penguin.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/phppg.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/pysol.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pan.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-mozilla_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_mail.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-gnucash.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnucash.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-mozilla_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_mail.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-xv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xv.png
- $(INSTALL_DATA) $(srcdir)/cr64-app-qtella.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/qtella.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/randr.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-staroffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/staroffice.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/terminal.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/tux.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/wp.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xclock.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xfmail.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xmag.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-- $(INSTALL_DATA) $(srcdir)/crsc-app-acroread.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/acroread.svgz
-- $(INSTALL_DATA) $(srcdir)/crsc-app-aim.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aim.svgz
-- $(INSTALL_DATA) $(srcdir)/crsc-app-aktion.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aktion.svgz
-- $(INSTALL_DATA) $(srcdir)/crsc-app-antivirus.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/antivirus.svgz
-- $(INSTALL_DATA) $(srcdir)/crsc-app-applixware.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/applixware.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-mathematica.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mathematica.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/email.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-sodipodi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/sodipodi.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/phppg.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-gnome_apps.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/gnome_apps.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_development.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-vnc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/vnc.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-evolution.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/evolution.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-linguist.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linguist.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/terminal.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/acroread.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/nedit.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-scribus.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/scribus.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-dia.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/dia.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/tux.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclock.png
- $(INSTALL_DATA) $(srcdir)/crsc-app-package_development.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_development.svgz
-- $(INSTALL_DATA) $(srcdir)/crsc-app-personal.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/personal.svgz
-- $(INSTALL_DATA) $(srcdir)/cr16-app-edu_languages.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_languages.png
-- $(INSTALL_DATA) $(srcdir)/crsc-app-browser.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/browser.svgz
-- $(INSTALL_DATA) $(srcdir)/crsc-app-camera.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/camera.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/applixware.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/linuxconf.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-xapp.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xapp.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-eclipse.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/eclipse.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wine.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xmag.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-package_games_strategy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_strategy.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_utilities.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-xchat.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xchat.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-package_wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_wordprocessing.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/penguin.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/acroread.png
- $(INSTALL_DATA) $(srcdir)/crsc-app-clanbomber.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clanbomber.svgz
-- $(INSTALL_DATA) $(srcdir)/crsc-app-clock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clock.svgz
-- $(INSTALL_DATA) $(srcdir)/crsc-app-core.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/core.svgz
-- $(INSTALL_DATA) $(srcdir)/crsc-app-display.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/display.svgz
-- $(INSTALL_DATA) $(srcdir)/crsc-app-download_manager.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/download_manager.svgz
-- $(INSTALL_DATA) $(srcdir)/crsc-app-email.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/email.svgz
-- $(INSTALL_DATA) $(srcdir)/crsc-app-error.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/error.svgz
-- $(INSTALL_DATA) $(srcdir)/cr16-app-edu_mathematics.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_mathematics.png
-- $(INSTALL_DATA) $(srcdir)/crsc-app-galeon.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/galeon.svgz
-- $(INSTALL_DATA) $(srcdir)/crsc-app-gnome_apps.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/gnome_apps.svgz
-- $(INSTALL_DATA) $(srcdir)/cr16-app-edu_miscellaneous.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_miscellaneous.png
-- $(INSTALL_DATA) $(srcdir)/crsc-app-hardware.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hardware.svgz
-- $(INSTALL_DATA) $(srcdir)/cr16-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_science.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-edu_languages.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_languages.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-edu_mathematics.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_mathematics.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-edu_miscellaneous.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_miscellaneous.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_science.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-edu_languages.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_languages.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-edu_mathematics.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_mathematics.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-edu_miscellaneous.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_miscellaneous.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_science.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_favourite.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/randr.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-xosview.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xosview.png
- $(INSTALL_DATA) $(srcdir)/crsc-app-my_mac.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/my_mac.svgz
-- $(INSTALL_DATA) $(srcdir)/crsc-app-netscape.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/netscape.svgz
-- $(INSTALL_DATA) $(srcdir)/crsc-app-openoffice.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/openoffice.svgz
-- $(INSTALL_DATA) $(srcdir)/crsc-app-package_toys.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_toys.svgz
-- $(INSTALL_DATA) $(srcdir)/crsc-app-penguin.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/penguin.svgz
-- $(INSTALL_DATA) $(srcdir)/crsc-app-quicktime.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/quicktime.svgz
-- $(INSTALL_DATA) $(srcdir)/crsc-app-realplayer.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/realplayer.svgz
-- $(INSTALL_DATA) $(srcdir)/crsc-app-shell.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/shell.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/wp.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kvirc.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wine.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/terminal.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-gnome_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnome_apps.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmag.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linuxconf.png
- $(INSTALL_DATA) $(srcdir)/crsc-app-staroffice.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/staroffice.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_settings.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-alevt.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/alevt.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-edu_miscellaneous.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_miscellaneous.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/pysol.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-aim.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aim.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-wabi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wabi.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/randr.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/nedit.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_applications.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-gnucash.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnucash.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_settings.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/mozilla.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-galeon.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/galeon.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-xemacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xemacs.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-thunderbird.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/thunderbird.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/emacs.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xmag.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-package_editors.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_editors.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-edu_mathematics.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_mathematics.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/blender.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-gabber.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gabber.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-xconsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xconsole.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-scribus.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/scribus.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-firefox.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/firefox.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-xcalc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xcalc.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_network.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-gaim.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gaim.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-plan.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/plan.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-xfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfig.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-xchat.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xchat.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-lyx.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/lyx.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clanbomber.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-opera.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/opera.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-staroffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/staroffice.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_arcade.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-package_games_card.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_card.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_utilities.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/acroread.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-gaim.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gaim.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/email.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xfmail.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-xpaint.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xpaint.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-package_application.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_application.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gvim.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-alevt.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/alevt.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-personal.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/personal.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-package_games_card.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_card.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/nedit.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pysol.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-package_wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_wordprocessing.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/licq.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_favourite.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_settings.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-pybliographic.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pybliographic.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-email.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/email.svgz
- $(INSTALL_DATA) $(srcdir)/crsc-app-terminal.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/terminal.svgz
-- $(INSTALL_DATA) $(srcdir)/crsc-app-tux.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/tux.svgz
-- $(INSTALL_DATA) $(srcdir)/crsc-app-wine.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/wine.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-edu_languages.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_languages.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_applications.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-gnomemeeting.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnomemeeting.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-realplayer.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/realplayer.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-xclipboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclipboard.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-penguin.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/penguin.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-xmms.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmms.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-gnomemeeting.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnomemeeting.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gvim.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_toys.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/emacs.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_toys.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-package_system.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_system.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/licq.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/pysol.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_multimedia.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-galeon.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/galeon.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-xcalc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xcalc.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/package_development.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-dia.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dia.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/applixware.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/terminal.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/tux.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-applixware.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/applixware.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/acroread.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-xawtv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xawtv.png
- $(INSTALL_DATA) $(srcdir)/crsc-app-x.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/x.svgz
-- $(INSTALL_DATA) $(srcdir)/crsc-app-xapp.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xapp.svgz
-- $(INSTALL_DATA) $(srcdir)/crsc-app-xcalc.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xcalc.svgz
-- $(INSTALL_DATA) $(srcdir)/crsc-app-xchat.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xchat.svgz
-- $(INSTALL_DATA) $(srcdir)/crsc-app-xclock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xclock.svgz
-- $(INSTALL_DATA) $(srcdir)/crsc-app-xeyes.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xeyes.svgz
-- $(INSTALL_DATA) $(srcdir)/crsc-app-xpaint.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xpaint.svgz
-- $(INSTALL_DATA) $(srcdir)/cr128-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/email.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_development.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-eclipse.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/eclipse.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-package_graphics.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_graphics.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/penguin.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-quicktime.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/quicktime.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-remote.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/remote.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-firefox.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/firefox.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_multimedia.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-evolution.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/evolution.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_arcade.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_board.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/licq.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/email.png
-- $(INSTALL_DATA) $(srcdir)/cr22-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/package_development.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/email.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_development.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_development.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_development.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-package_edutainment.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_edutainment.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_favourite.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-hardware.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hardware.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-thunderbird.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/thunderbird.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xclock.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-designer.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/designer.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_network.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/randr.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_multimedia.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kvirc.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-bluefish.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bluefish.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfm_home.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfmail.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/netscape.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-camera.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/camera.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_utilities.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_applications.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/acroread.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/applixware.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clanbomber.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/gimp.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kfm_home.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/licq.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/linuxconf.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/mozilla.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/netscape.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_applications.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_favourite.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_games.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_multimedia.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_network.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_settings.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_toys.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_utilities.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/penguin.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/phppg.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/pysol.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/randr.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/staroffice.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/terminal.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/tux.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/wp.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xclock.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xfmail.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xmag.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/abiword.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/acroread.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/alevt.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/applixware.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnome_apps.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/browser.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gimp.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/evolution.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/error.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_games.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_development.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xmag.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_science.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/assistant.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/blender.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bluefish.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clanbomber.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/designer.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dia.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dlgedit.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/eclipse.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/emacs.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/evolution.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/firefox.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gabber.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gaim.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/blender.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xload.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gimp.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnome_apps.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnomemeeting.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnucash.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnumeric.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gv.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gvim.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfm_home.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kvirc.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/licq.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linguist.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linuxconf.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/lyx.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mathematica.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_m.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_mail.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/nedit.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/netscape.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/opera.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_application.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_applications.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_development.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_editors.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_edutainment.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_favourite.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_arcade.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_board.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_card.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_strategy.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_graphics.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_multimedia.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_network.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_settings.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_system.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_toys.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_utilities.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_wordprocessing.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pan.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/penguin.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/phppg.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/plan.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/planner.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pybliographic.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/randr.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/realplayer.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/remote.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/scribus.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/sodipodi.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/email.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/terminal.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/thunderbird.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/tux.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/vnc.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wabi.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wine.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wp.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xcalc.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xchat.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclipboard.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclock.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xconsole.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xedit.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xemacs.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xeyes.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfig.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfmail.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xload.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmag.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmms.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xosview.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xpaint.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xv.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kvirc.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/nedit.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/randr.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/abiword.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/acroread.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/alevt.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/blender.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/applixware.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/assistant.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bluefish.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clanbomber.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/designer.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dia.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dlgedit.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/eclipse.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/emacs.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/evolution.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/firefox.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gabber.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gaim.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/galeon.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gimp.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnome_apps.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnomemeeting.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnucash.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnumeric.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gv.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gvim.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfm_home.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kvirc.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/licq.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linguist.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linuxconf.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/lyx.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mathematica.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_m.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_mail.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/nedit.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/netscape.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/opera.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_applications.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_editors.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_edutainment.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_favourite.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_arcade.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_board.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_card.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_strategy.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_graphics.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_multimedia.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_network.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_settings.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_system.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_toys.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_utilities.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_wordprocessing.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wine.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/phppg.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/linuxconf.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmag.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/antivirus.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pan.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/penguin.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/phppg.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/plan.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/planner.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pybliographic.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pysol.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/randr.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/realplayer.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/scribus.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/sodipodi.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/email.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/terminal.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/thunderbird.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/tux.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kfm_home.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_wordprocessing.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/netscape.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/display.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dlgedit.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_development.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/tux.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xeyes.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/email.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_edutainment.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xclock.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/eclipse.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_games.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/vnc.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wabi.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wine.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wp.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/opera.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_utilities.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/penguin.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/gimp.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/galeon.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clanbomber.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xedit.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/randr.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kvirc.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/realplayer.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/linuxconf.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xchat.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_m.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_mathematics.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/acroread.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/core.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_system.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/x.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xapp.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xawtv.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xcalc.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xchat.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclipboard.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclock.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xconsole.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xedit.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xemacs.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xeyes.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/planner.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_network.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pysol.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/plan.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_toys.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfig.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfmail.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xload.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmag.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnumeric.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/tux.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_development.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xload.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_card.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_editors.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gaim.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/phppg.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xclock.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/designer.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_network.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xemacs.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aktion.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/nedit.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bluefish.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gvim.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/blender.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfm_home.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_toys.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/netscape.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_toys.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/licq.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/applixware.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_settings.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gabber.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/opera.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/randr.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/phppg.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_arcade.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kvirc.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmms.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_science.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gvim.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_settings.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xpaint.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/acroread.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/licq.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clanbomber.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_toys.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_multimedia.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_favourite.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xosview.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xpaint.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xv.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_mail.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnome_apps.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/download_manager.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_strategy.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clock.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/sodipodi.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/designer.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/penguin.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_languages.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bluefish.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linguist.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_multimedia.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pan.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfm_home.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/netscape.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_miscellaneous.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/abiword.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/acroread.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/applixware.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/blender.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bluefish.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clanbomber.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/designer.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/dia.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/eclipse.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/emacs.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/evolution.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/firefox.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gabber.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gaim.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/galeon.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gimp.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnome_apps.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnomemeeting.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnucash.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linuxconf.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xcalc.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/lyx.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gv.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnucash.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xfmail.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_science.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/nedit.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/vnc.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_applications.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/tux.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/scribus.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xemacs.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gimp.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gv.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_mathematics.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/applixware.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_languages.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnumeric.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gvim.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfm_home.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kvirc.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/licq.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/linuxconf.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clanbomber.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gabber.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pybliographic.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mathematica.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/staroffice.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wabi.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xpaint.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xchat.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xedit.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/terminal.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfmail.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_utilities.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xeyes.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gimp.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dia.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_graphics.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/planner.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/shell.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/email.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/wine.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_board.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_graphics.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/assistant.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xfmail.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/tux.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclipboard.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/openoffice.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_miscellaneous.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/netscape.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_m.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_mail.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/nedit.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/netscape.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/opera.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_applications.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_editors.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_edutainment.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_favourite.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_arcade.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_board.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_card.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pan.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnumeric.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_strategy.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_graphics.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_multimedia.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_network.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_settings.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_system.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_toys.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_utilities.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_wordprocessing.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/penguin.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/phppg.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/planner.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pysol.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/randr.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/remote.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/scribus.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/terminal.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/phppg.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xconsole.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/abiword.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/emacs.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_system.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/applixware.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xclock.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_development.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dlgedit.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_edutainment.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/sodipodi.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/email.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/staroffice.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/terminal.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/tux.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/vnc.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wine.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wmaker_apps.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wp.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xchat.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xclock.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xedit.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xemacs.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xfmail.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xmag.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/remote.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kfm_home.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wmaker_apps.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/penguin.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/netscape.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/firefox.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xv.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/acroread.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/applixware.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xedit.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wp.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xeyes.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/mozilla.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_m.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xapp.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/staroffice.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_favourite.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_editors.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_board.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clanbomber.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gimp.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gvim.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kfm_home.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/wp.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xv.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/email.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/realplayer.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_network.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnomemeeting.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/randr.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/planner.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wp.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kvirc.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/licq.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/linuxconf.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/mozilla.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/nedit.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/netscape.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pan.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_mail.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnucash.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_mail.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xv.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/qtella.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mathematica.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/email.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/sodipodi.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/phppg.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/gnome_apps.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_development.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/vnc.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/evolution.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linguist.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/terminal.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/acroread.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/nedit.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/scribus.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/dia.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/tux.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclock.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_development.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/applixware.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/linuxconf.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xapp.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/eclipse.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wine.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xmag.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_strategy.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_utilities.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xchat.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_wordprocessing.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/penguin.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/acroread.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clanbomber.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_favourite.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/randr.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xosview.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/my_mac.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/wp.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kvirc.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wine.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/terminal.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnome_apps.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_applications.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_favourite.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_games.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_multimedia.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_network.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmag.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linuxconf.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/staroffice.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_settings.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_toys.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_utilities.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/penguin.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/phppg.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/alevt.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_miscellaneous.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/pysol.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/qtella.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/randr.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/staroffice.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/terminal.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/tux.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/wp.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xclock.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xfmail.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xmag.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/acroread.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aim.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aktion.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/antivirus.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/applixware.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_development.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wabi.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/randr.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/nedit.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_applications.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnucash.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_settings.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/mozilla.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/galeon.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xemacs.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/thunderbird.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/emacs.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xmag.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_editors.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_mathematics.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/blender.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gabber.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xconsole.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/scribus.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/firefox.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xcalc.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_network.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gaim.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/plan.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfig.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xchat.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/lyx.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clanbomber.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/opera.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/staroffice.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_arcade.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_card.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_utilities.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/acroread.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gaim.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/email.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xfmail.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xpaint.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_application.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gvim.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/alevt.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/personal.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_languages.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/browser.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/camera.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clanbomber.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clock.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/core.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/display.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/download_manager.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_card.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/nedit.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pysol.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_wordprocessing.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/licq.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_favourite.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_settings.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pybliographic.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/email.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/error.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_mathematics.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/galeon.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/gnome_apps.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_miscellaneous.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hardware.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_science.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/terminal.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_languages.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_mathematics.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_miscellaneous.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_science.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_languages.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_mathematics.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_miscellaneous.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_science.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/my_mac.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/netscape.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/openoffice.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_toys.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/penguin.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/quicktime.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_applications.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnomemeeting.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/realplayer.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/shell.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/staroffice.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/terminal.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/tux.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/wine.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclipboard.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/penguin.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmms.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnomemeeting.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gvim.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_toys.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/emacs.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_toys.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_system.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/licq.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/pysol.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_multimedia.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/galeon.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xcalc.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/package_development.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dia.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/applixware.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/terminal.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/tux.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/applixware.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/acroread.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xawtv.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/x.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xapp.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xcalc.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xchat.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xclock.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xeyes.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xpaint.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/email.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_development.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/eclipse.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_graphics.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/penguin.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/quicktime.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/remote.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/firefox.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_multimedia.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/evolution.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_arcade.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_board.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/licq.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/email.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/package_development.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/email.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_development.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_development.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_development.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_edutainment.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_favourite.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hardware.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/thunderbird.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xclock.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/designer.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_network.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/randr.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_multimedia.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kvirc.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bluefish.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfm_home.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfmail.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/netscape.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/camera.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_utilities.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_applications.png
-
- #>+ 15
- force-reedit:
-diff -Nru kdebase-3.4.0.orig/pics/hicolor/Makefile.in kdebase-3.4.0/pics/hicolor/Makefile.in
---- kdebase-3.4.0.orig/pics/hicolor/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/pics/hicolor/Makefile.in 2005-05-07 12:35:59.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/pics/hicolor/Makefile.in kdebase-3.4.1/pics/hicolor/Makefile.in
+--- kdebase-3.4.1.orig/pics/hicolor/Makefile.in 2005-05-23 18:38:32.000000000 +0200
++++ kdebase-3.4.1/pics/hicolor/Makefile.in 2005-05-24 16:28:03.067411589 +0200
@@ -235,6 +235,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -49049,21 +25342,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdebase-3.4.0.orig/pics/Makefile.in kdebase-3.4.0/pics/Makefile.in
---- kdebase-3.4.0.orig/pics/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/pics/Makefile.in 2005-05-07 12:35:59.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/pics/Makefile.in kdebase-3.4.1/pics/Makefile.in
+--- kdebase-3.4.1.orig/pics/Makefile.in 2005-05-23 18:38:32.000000000 +0200
++++ kdebase-3.4.1/pics/Makefile.in 2005-05-24 16:28:02.962421072 +0200
@@ -251,6 +251,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -49095,69 +25376,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -599,7 +602,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -611,7 +620,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -619,7 +628,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -640,7 +655,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdebase-3.4.0.orig/pics/wallpapers/Makefile.in kdebase-3.4.0/pics/wallpapers/Makefile.in
---- kdebase-3.4.0.orig/pics/wallpapers/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/pics/wallpapers/Makefile.in 2005-05-07 12:35:59.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdebase-3.4.1.orig/pics/wallpapers/Makefile.in kdebase-3.4.1/pics/wallpapers/Makefile.in
+--- kdebase-3.4.1.orig/pics/wallpapers/Makefile.in 2005-05-23 18:38:32.000000000 +0200
++++ kdebase-3.4.1/pics/wallpapers/Makefile.in 2005-05-24 16:28:03.087409782 +0200
@@ -245,6 +245,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -49189,12 +25410,3 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -800,7 +803,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=Paper01.jpg andes-venezolanos.svgz All-Good-People-1.jpg.desktop gear-flowers.svgz.desktop Won-Ton-Soup-3.jpg lineart.svgz CREDITS Island-of-Elba.jpg konqui.svgz moon.svgz.desktop fulmine.jpg.desktop triplegears.jpg Time-For-Lunch-2.jpg Blkmarble.jpg.desktop seaofconero.jpg Makefile.in triplegears.jpg.desktop celtic.svgz.desktop gear-flowers.svgz Paper01.jpg.desktop andes-venezolanos.svgz.desktop aurora.svgz.desktop Totally-New-Product-1.jpg globe.svgz.desktop Marble01.jpg.desktop default_gears.jpg.desktop Blkmarble.jpg Chicken-Songs-2.jpg.desktop Planning-And-Probing-1.jpg.desktop only_k.jpg.desktop default_gears.jpg Time-For-Lunch-2.jpg.desktop kde_box.png.desktop fulmine.jpg here-gear.svgz blue-bend.jpg Won-Ton-Soup-3.jpg.desktop Marble01.jpg No-Ones-Laughing-3.jpg.desktop Foggy1.jpg Circuit.jpg.desktop celtic.svgz default_blue.jpg moon.svgz blue-bend.jpg.desktop Foggy1.jpg.desktop konqui.svgz.desktop default_blue.jpg.desktop seaofconero.jpg.desktop KDE34.png only_k.jpg aurora.svgz kde_passion.jpg globe.svgz Island-of-Elba.jpg.desktop All-Good-People-1.jpg Chicken-Songs-2.jpg Planning-And-Probing-1.jpg here-gear.svgz.desktop kde_box.png lineart.svgz.desktop Totally-New-Product-1.jpg.desktop No-Ones-Laughing-3.jpg kde_passion.jpg.desktop Circuit.jpg Makefile.am KDE34.png.desktop
-+KDE_DIST=Paper01.jpg andes-venezolanos.svgz All-Good-People-1.jpg.desktop gear-flowers.svgz.desktop Won-Ton-Soup-3.jpg lineart.svgz CREDITS Island-of-Elba.jpg konqui.svgz moon.svgz.desktop fulmine.jpg.desktop triplegears.jpg Time-For-Lunch-2.jpg Blkmarble.jpg.desktop seaofconero.jpg Makefile.in triplegears.jpg.desktop celtic.svgz.desktop gear-flowers.svgz Paper01.jpg.desktop andes-venezolanos.svgz.desktop aurora.svgz.desktop Totally-New-Product-1.jpg Marble01.jpg.desktop globe.svgz.desktop default_gears.jpg.desktop Blkmarble.jpg Chicken-Songs-2.jpg.desktop Planning-And-Probing-1.jpg.desktop only_k.jpg.desktop default_gears.jpg Time-For-Lunch-2.jpg.desktop kde_box.png.desktop fulmine.jpg here-gear.svgz blue-bend.jpg Won-Ton-Soup-3.jpg.desktop Marble01.jpg No-Ones-Laughing-3.jpg.desktop Foggy1.jpg Circuit.jpg.desktop celtic.svgz default_blue.jpg moon.svgz blue-bend.jpg.desktop Foggy1.jpg.desktop konqui.svgz.desktop default_blue.jpg.desktop seaofconero.jpg.desktop KDE34.png only_k.jpg aurora.svgz kde_passion.jpg globe.svgz Island-of-Elba.jpg.desktop All-Good-People-1.jpg Chicken-Songs-2.jpg Planning-And-Probing-1.jpg here-gear.svgz.desktop kde_box.png lineart.svgz.desktop Totally-New-Product-1.jpg.desktop No-Ones-Laughing-3.jpg kde_passion.jpg.desktop Circuit.jpg Makefile.am KDE34.png.desktop
-
- #>+ 2
- docs-am: