[Pkg-kde-commits] rev 1378 - branches/kde-3.4.0/packages/kdebase/debian/patches

Christopher Martin chrsmrtn-guest at costa.debian.org
Tue Jul 26 20:27:38 UTC 2005


Author: chrsmrtn-guest
Date: 2005-07-26 20:27:25 +0000 (Tue, 26 Jul 2005)
New Revision: 1378

Modified:
   branches/kde-3.4.0/packages/kdebase/debian/patches/98_buildprep.diff
Log:
And commit the new buildprep.diff.


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-07-26 20:25:28 UTC (rev 1377)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/98_buildprep.diff	2005-07-26 20:27:25 UTC (rev 1378)
@@ -1,7 +1,7 @@
-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 @@
+diff -Nru kdebase-3.4.2.orig/acinclude.m4 kdebase-3.4.2/acinclude.m4
+--- kdebase-3.4.2.orig/acinclude.m4	2005-07-20 21:00:48.000000000 +0000
++++ kdebase-3.4.2/acinclude.m4	2005-07-26 18:55:58.959105496 +0000
+@@ -1688,15 +1688,6 @@
         KDE_USE_CLOSURE_TRUE="#"
         KDE_USE_CLOSURE_FALSE=""
         KDE_NO_UNDEFINED=""
@@ -17,7 +17,7 @@
    fi
    AC_SUBST(KDE_USE_CLOSURE_TRUE)
    AC_SUBST(KDE_USE_CLOSURE_FALSE)
-@@ -2139,9 +2130,6 @@
+@@ -2138,9 +2129,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -27,7 +27,80 @@
  AC_TRY_COMPILE([
  $2
  ],
-@@ -5770,6 +5758,7 @@
+@@ -3288,39 +3276,39 @@
+ 
+   if test "x$GXX" = "xyes"; then
+     kde_have_gcc_visibility=no
+-    KDE_CHECK_COMPILER_FLAG(fvisibility=hidden, 
+-    [
+-      kde_have_gcc_visibility=yes
+-      AC_CACHE_CHECK([if Qt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched,
+-        [
+-          AC_LANG_SAVE
+-          AC_LANG_CPLUSPLUS
+-
+-          safe_CXXFLAGS=$CXXFLAGS
+-          CXXFLAGS="$CXXFLAGS $all_includes"
+-
+-          AC_TRY_COMPILE(
+-          [
+-#include <qglobal.h>
+-#if Q_EXPORT - 0 != 0
+-/* if this compiles, then Q_EXPORT is undefined */
+-/* if Q_EXPORT is nonempty, this will break compilation */
+-#endif
+-          ], [/* elvis is alive */],
+-          kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
+-
+-          CXXFLAGS=$safe_CXXFLAGS
+-          AC_LANG_RESTORE
+-        ]
+-      )
+-
+-      if test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
+-        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+-        KDE_CHECK_VISIBILITY_GCC_BUG
+-        HAVE_GCC_VISIBILITY=1
+-        AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
+-      fi
+-    ])
++dnl    KDE_CHECK_COMPILER_FLAG(fvisibility=hidden, 
++dnl    [
++dnl      kde_have_gcc_visibility=yes
++dnl      AC_CACHE_CHECK([if Qt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched,
++dnl        [
++dnl          AC_LANG_SAVE
++dnl          AC_LANG_CPLUSPLUS
++dnl
++dnl          safe_CXXFLAGS=$CXXFLAGS
++dnl          CXXFLAGS="$CXXFLAGS $all_includes"
++dnl
++dnl          AC_TRY_COMPILE(
++dnl          [
++dnl #include <qglobal.h>
++dnl #if Q_EXPORT - 0 != 0
++dnl /* if this compiles, then Q_EXPORT is undefined */
++dnl /* if Q_EXPORT is nonempty, this will break compilation */
++dnl #endif
++dnl          ], [/* elvis is alive */],
++dnl          kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
++dnl
++dnl          CXXFLAGS=$safe_CXXFLAGS
++dnl          AC_LANG_RESTORE
++dnl        ]
++dnl      )
++dnl
++dnl      if test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
++dnl        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
++dnl        KDE_CHECK_VISIBILITY_GCC_BUG
++dnl        HAVE_GCC_VISIBILITY=1
++dnl        AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
++dnl      fi
++dnl    ])
+   fi
+ ])
+ 
+@@ -5799,6 +5787,7 @@
  ## the same distribution terms that you use for the rest of that program.
  
  # serial 47 AC_PROG_LIBTOOL
@@ -35,7 +108,7 @@
  
  
  # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -5829,7 +5818,7 @@
+@@ -5858,7 +5847,7 @@
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
@@ -44,7 +117,7 @@
  AC_SUBST(LIBTOOL)dnl
  
  # Prevent multiple expansion
-@@ -6243,12 +6232,11 @@
+@@ -6272,12 +6261,11 @@
    if AC_TRY_EVAL(ac_compile); then
      case "`/usr/bin/file conftest.o`" in
      *32-bit*)
@@ -58,7 +131,7 @@
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
-@@ -6260,7 +6248,6 @@
+@@ -6289,7 +6277,6 @@
        esac
        ;;
      *64-bit*)
@@ -66,7 +139,7 @@
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
-@@ -6390,7 +6377,7 @@
+@@ -6419,7 +6406,7 @@
  AC_MSG_CHECKING([the maximum length of command line arguments])
  AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
    i=0
@@ -75,7 +148,7 @@
  
    case $build_os in
    msdosdjgpp*)
-@@ -6419,20 +6406,26 @@
+@@ -6448,20 +6435,26 @@
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -107,7 +180,7 @@
      # Add a significant safety factor because C++ compilers can tack on massive
      # amounts of additional arguments before passing them to the linker.
      # It appears as though 1/2 is a usable value.
-@@ -6582,7 +6575,7 @@
+@@ -6611,7 +6604,7 @@
      lt_cv_dlopen_self=yes
      ])
     ;;
@@ -116,7 +189,7 @@
    *)
      AC_CHECK_FUNC([shl_load],
  	  [lt_cv_dlopen="shl_load"],
-@@ -6671,13 +6664,6 @@
+@@ -6700,13 +6693,6 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -130,7 +203,7 @@
     lt_compiler_flag="-o out/conftest2.$ac_objext"
     # Insert the option either (1) after the last *FLAGS variable, or
     # (2) before a word containing "conftest.", or (3) at the end.
-@@ -6701,8 +6687,11 @@
+@@ -6730,8 +6716,11 @@
       fi
     fi
     chmod u+w .
@@ -144,7 +217,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -6819,7 +6808,7 @@
+@@ -6848,7 +6837,7 @@
     *)
    AC_MSG_RESULT([no])
      ;;
@@ -153,7 +226,7 @@
  fi
  ])# AC_LIBTOOL_SYS_LIB_STRIP
  
-@@ -6832,7 +6821,7 @@
+@@ -6861,7 +6850,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -162,7 +235,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -6842,7 +6831,20 @@
+@@ -6871,7 +6860,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -184,7 +257,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -6907,7 +6909,7 @@
+@@ -6936,7 +6938,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -193,7 +266,7 @@
    ;;
  
  beos*)
-@@ -6932,7 +6934,7 @@
+@@ -6961,7 +6963,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -202,7 +275,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -6997,7 +6999,7 @@
+@@ -7026,7 +7028,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -211,7 +284,7 @@
    # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
    if test "$GCC" = yes; then
      sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -7020,7 +7022,7 @@
+@@ -7049,7 +7051,7 @@
    dynamic_linker=no
    ;;
  
@@ -220,7 +293,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -7080,7 +7082,7 @@
+@@ -7109,7 +7111,7 @@
    need_version=no
    case "$host_cpu" in
    ia64*)
@@ -229,7 +302,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -7095,7 +7097,7 @@
+@@ -7124,7 +7126,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -238,7 +311,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7106,7 +7108,7 @@
+@@ -7135,7 +7137,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -247,7 +320,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7168,22 +7170,19 @@
+@@ -7197,22 +7199,19 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -276,7 +349,7 @@
    # We used to test for /lib/ld.so.1 and disable shared libraries on
    # powerpc, because MkLinux only supported shared libraries with the
    # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -7193,6 +7192,30 @@
+@@ -7222,6 +7221,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -307,7 +380,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -7202,7 +7225,7 @@
+@@ -7231,7 +7254,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -316,7 +389,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -7231,7 +7254,7 @@
+@@ -7260,7 +7283,7 @@
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
@@ -325,7 +398,7 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-@@ -7251,7 +7274,7 @@
+@@ -7280,7 +7303,7 @@
  
  os2*)
    libname_spec='$name'
@@ -334,7 +407,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -7842,31 +7865,23 @@
+@@ -7871,31 +7894,23 @@
    ;;
  
  cygwin*)
@@ -375,7 +448,7 @@
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      case $host_cpu in
      i*86 )
-@@ -7905,42 +7920,21 @@
+@@ -7934,42 +7949,21 @@
    ;;
  
  irix5* | irix6* | nonstopux*)
@@ -425,7 +498,7 @@
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
    else
-@@ -7969,9 +7963,6 @@
+@@ -7998,9 +7992,6 @@
    ;;
  
  osf3* | osf4* | osf5*)
@@ -435,7 +508,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
-@@ -7981,7 +7972,6 @@
+@@ -8010,7 +8001,6 @@
  
  solaris*)
    lt_cv_deplibs_check_method=pass_all
@@ -443,7 +516,7 @@
    ;;
  
  sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -8247,7 +8237,7 @@
+@@ -8276,7 +8266,7 @@
  fi
  if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
    AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
@@ -452,7 +525,7 @@
    else
      AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
      _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
-@@ -8297,7 +8287,7 @@
+@@ -8326,7 +8316,7 @@
    fi
    ;;
  
@@ -461,7 +534,7 @@
    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
      test "$enable_shared" = yes && enable_static=no
    fi
-@@ -8307,29 +8297,29 @@
+@@ -8336,29 +8326,29 @@
      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
      case "$host_os" in
      rhapsody* | darwin1.[[012]])
@@ -505,7 +578,7 @@
      _LT_AC_TAGVAR(hardcode_direct, $1)=no
      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8337,8 +8327,8 @@
+@@ -8366,8 +8356,8 @@
      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
    else
      _LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -516,7 +589,7 @@
  esac
  AC_MSG_RESULT([$enable_shared])
  
-@@ -8446,8 +8436,8 @@
+@@ -8475,8 +8465,8 @@
    # Check if GNU C++ uses GNU ld as the underlying linker, since the
    # archiving commands below assume that GNU ld is being used.
    if test "$with_gnu_ld" = yes; then
@@ -527,7 +600,7 @@
  
      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -8473,7 +8463,7 @@
+@@ -8502,7 +8492,7 @@
      # linker, instead of GNU ld.  If possible, this setting should
      # overridden to take advantage of the native linker features on
      # the platform it is being used on.
@@ -536,7 +609,7 @@
    fi
  
    # Commands to make compiler produce verbose output that lists
-@@ -8503,8 +8493,22 @@
+@@ -8532,8 +8522,22 @@
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
@@ -561,7 +634,7 @@
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
-@@ -8550,15 +8554,16 @@
+@@ -8579,15 +8583,16 @@
  	shared_flag='-G'
        else
  	if test "$aix_use_runtimelinking" = yes; then
@@ -582,7 +655,7 @@
      if test "$aix_use_runtimelinking" = yes; then
        # Warning - without using the other runtime loading flags (-brtl),
        # -berok will link without error, but may produce a broken library.
-@@ -8567,13 +8572,12 @@
+@@ -8596,13 +8601,12 @@
        _LT_AC_SYS_LIBPATH_AIX
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
  
@@ -598,7 +671,7 @@
        else
  	# Determine the default libpath from the value encoded in an empty executable.
  	_LT_AC_SYS_LIBPATH_AIX
-@@ -8588,7 +8592,7 @@
+@@ -8617,7 +8621,7 @@
  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
  	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
  	# This is similar to how AIX traditionally builds it's shared libraries.
@@ -607,7 +680,7 @@
        fi
      fi
      ;;
-@@ -8605,12 +8609,12 @@
+@@ -8634,12 +8638,12 @@
      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
      # as there is no search path for DLLs.
      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -622,7 +695,7 @@
        # If the export-symbols file already is a .def file (1st line
        # is EXPORTS), use it as is; otherwise, prepend...
        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -8619,7 +8623,7 @@
+@@ -8648,7 +8652,7 @@
  	echo EXPORTS > $output_objdir/$soname.def;
  	cat $export_symbols >> $output_objdir/$soname.def;
        fi~
@@ -631,7 +704,7 @@
      else
        _LT_AC_TAGVAR(ld_shlibs, $1)=no
      fi
-@@ -8630,20 +8634,20 @@
+@@ -8659,20 +8663,20 @@
      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
      case "$host_os" in
      rhapsody* | darwin1.[[012]])
@@ -662,7 +735,7 @@
        fi
        ;;
      esac
-@@ -8653,19 +8657,19 @@
+@@ -8682,19 +8686,19 @@
        lt_int_apple_cc_single_mod=yes
      fi
      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -688,7 +761,7 @@
      _LT_AC_TAGVAR(hardcode_direct, $1)=no
      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8700,7 +8704,7 @@
+@@ -8729,7 +8733,7 @@
    freebsd-elf*)
      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
      ;;
@@ -697,7 +770,7 @@
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8722,7 +8726,7 @@
+@@ -8751,7 +8755,7 @@
        _LT_AC_TAGVAR(ld_shlibs, $1)=no
        ;;
      aCC)
@@ -706,7 +779,7 @@
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
        # linking a shared library.
-@@ -8731,11 +8735,11 @@
+@@ -8760,11 +8764,11 @@
        # explicitly linking system object files so we need to strip them
        # from the output so that they don't get included in the library
        # dependencies.
@@ -720,7 +793,7 @@
        else
          # FIXME: insert proper C++ library support
          _LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8792,7 +8796,7 @@
+@@ -8821,7 +8825,7 @@
  	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
  	  ;;
  	*)
@@ -729,7 +802,7 @@
  	  ;;
  	esac
  	# Commands to make compiler produce verbose output that lists
-@@ -8813,7 +8817,7 @@
+@@ -8842,7 +8846,7 @@
  	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
  	      ;;
  	    *)
@@ -738,7 +811,7 @@
  	      ;;
  	    esac
  	  fi
-@@ -8828,7 +8832,7 @@
+@@ -8857,7 +8861,7 @@
      case $cc_basename in
        CC)
  	# SGI C++
@@ -747,7 +820,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -8839,9 +8843,9 @@
+@@ -8868,9 +8872,9 @@
        *)
  	if test "$GXX" = yes; then
  	  if test "$with_gnu_ld" = no; then
@@ -759,7 +832,7 @@
  	  fi
  	fi
  	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -8858,8 +8862,8 @@
+@@ -8887,8 +8891,8 @@
  	# KCC will only create a shared library if the output file
  	# ends with ".so" (or ".sl" for HP-UX), so rename the library
  	# to its proper name (with version) after linking.
@@ -770,7 +843,7 @@
  	# Commands to make compiler produce verbose output that lists
  	# what "hidden" libraries, object files and flags are used when
  	# linking a shared library.
-@@ -8881,16 +8885,16 @@
+@@ -8910,16 +8914,16 @@
  	# Intel C++
  	with_gnu_ld=yes
  	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -791,7 +864,7 @@
  
  	runpath_var=LD_RUN_PATH
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -8928,7 +8932,7 @@
+@@ -8957,7 +8961,7 @@
  	;;
      esac
      ;;
@@ -800,7 +873,7 @@
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
        _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
        wlarc=
-@@ -8947,7 +8951,7 @@
+@@ -8976,7 +8980,7 @@
  	# KCC will only create a shared library if the output file
  	# ends with ".so" (or ".sl" for HP-UX), so rename the library
  	# to its proper name (with version) after linking.
@@ -809,7 +882,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8964,7 +8968,7 @@
+@@ -8993,7 +8997,7 @@
  	;;
        cxx)
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -818,7 +891,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8982,7 +8986,7 @@
+@@ -9011,7 +9015,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -827,7 +900,7 @@
  
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9007,7 +9011,7 @@
+@@ -9036,7 +9040,7 @@
  	# KCC will only create a shared library if the output file
  	# ends with ".so" (or ".sl" for HP-UX), so rename the library
  	# to its proper name (with version) after linking.
@@ -836,7 +909,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9023,10 +9027,10 @@
+@@ -9052,10 +9056,10 @@
  	;;
        cxx)
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
@@ -849,7 +922,7 @@
  	  $rm $lib.exp'
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9045,7 +9049,7 @@
+@@ -9074,7 +9078,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -858,7 +931,7 @@
  
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9102,9 +9106,9 @@
+@@ -9131,9 +9135,9 @@
        CC)
  	# Sun C++ 4.2, 5.x and Centerline C++
  	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -870,7 +943,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
  	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -9138,7 +9142,7 @@
+@@ -9167,7 +9171,7 @@
  	;;
        gcx)
  	# Green Hills C++ Compiler
@@ -879,7 +952,7 @@
  
  	# The C++ compiler must be used to create the archive.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9148,9 +9152,9 @@
+@@ -9177,9 +9181,9 @@
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
  	  if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -891,7 +964,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -9159,9 +9163,9 @@
+@@ -9188,9 +9192,9 @@
  	  else
  	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	    # platform.
@@ -903,7 +976,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -9329,7 +9333,7 @@
+@@ -9358,7 +9362,7 @@
         fi
         ;;
  
@@ -912,7 +985,7 @@
         # This assumes that the test object file only shows up
         # once in the compiler output.
         if test "$p" = "conftest.$objext"; then
-@@ -9438,7 +9442,7 @@
+@@ -9467,7 +9471,7 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
@@ -921,7 +994,7 @@
    test "$enable_shared" = yes && enable_static=no
    ;;
  esac
-@@ -9580,11 +9584,12 @@
+@@ -9609,11 +9613,12 @@
    # without removal of \ escapes.
    if test -n "${ZSH_VERSION+set}" ; then
      setopt NO_GLOB_SUBST
@@ -936,7 +1009,7 @@
      libname_spec library_names_spec soname_spec extract_expsyms_cmds \
      old_striplib striplib file_magic_cmd finish_cmds finish_eval \
      deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -9634,7 +9639,7 @@
+@@ -9663,7 +9668,7 @@
      _LT_AC_TAGVAR(archive_cmds, $1) | \
      _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
      _LT_AC_TAGVAR(module_cmds, $1) | \
@@ -945,7 +1018,7 @@
      _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
      _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
      extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9765,7 +9770,7 @@
+@@ -9794,7 +9799,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -954,7 +1027,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -9796,7 +9801,7 @@
+@@ -9825,7 +9830,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -963,7 +1036,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -10040,7 +10045,10 @@
+@@ -10069,7 +10074,10 @@
    # If there is no Makefile yet, we rely on a make rule to execute
    # `config.status --recheck' to rerun these tests and create the
    # libtool script then.
@@ -975,7 +1048,7 @@
  fi
  ])# AC_LIBTOOL_CONFIG
  
-@@ -10113,7 +10121,7 @@
+@@ -10142,7 +10150,7 @@
    symcode='[[BCDEGQRST]]'
    ;;
  solaris* | sysv5*)
@@ -984,7 +1057,7 @@
    ;;
  sysv4)
    symcode='[[DFNSTU]]'
-@@ -10131,7 +10139,7 @@
+@@ -10160,7 +10168,7 @@
  # If we're using GNU nm, then use its standard symbol codes.
  case `$NM -V 2>&1` in
  *GNU* | *'with BFD'*)
@@ -993,7 +1066,7 @@
  esac
  
  # Try without a prefix undercore, then with it.
-@@ -10346,7 +10354,7 @@
+@@ -10375,7 +10383,7 @@
  	    ;;
  	esac
  	;;
@@ -1002,7 +1075,7 @@
  	# FreeBSD uses GNU C++
  	;;
        hpux9* | hpux10* | hpux11*)
-@@ -10397,7 +10405,7 @@
+@@ -10426,7 +10434,7 @@
  	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
  	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
@@ -1011,7 +1084,7 @@
  	  cxx)
  	    # Compaq C++
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -10422,7 +10430,7 @@
+@@ -10451,7 +10459,7 @@
  	    ;;
  	esac
  	;;
@@ -1020,7 +1093,7 @@
  	;;
        osf3* | osf4* | osf5*)
  	case $cc_basename in
-@@ -10733,6 +10741,9 @@
+@@ -10762,6 +10770,9 @@
    cygwin* | mingw*)
      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
    ;;
@@ -1030,7 +1103,7 @@
    *)
      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    ;;
-@@ -10757,7 +10768,7 @@
+@@ -10786,7 +10797,7 @@
    _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
    _LT_AC_TAGVAR(hardcode_automatic, $1)=no
    _LT_AC_TAGVAR(module_cmds, $1)=
@@ -1039,7 +1112,7 @@
    _LT_AC_TAGVAR(always_export_symbols, $1)=no
    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    # include_expsyms should be a list of space-separated symbols to be *always*
-@@ -10831,7 +10842,7 @@
+@@ -10860,7 +10871,7 @@
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -1048,7 +1121,7 @@
        else
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -10841,13 +10852,13 @@
+@@ -10870,13 +10881,13 @@
        # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
        # as there is no search path for DLLs.
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -1064,7 +1137,7 @@
  	# If the export-symbols file already is a .def file (1st line
  	# is EXPORTS), use it as is; otherwise, prepend...
  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -10856,19 +10867,19 @@
+@@ -10885,19 +10896,19 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -1088,7 +1161,7 @@
        fi
        ;;
  
-@@ -10886,8 +10897,8 @@
+@@ -10915,8 +10926,8 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -1099,7 +1172,7 @@
        else
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -10900,10 +10911,36 @@
+@@ -10929,10 +10940,36 @@
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
        ;;
  
@@ -1138,7 +1211,7 @@
        else
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -10953,9 +10990,20 @@
+@@ -10982,9 +11019,20 @@
  	else
  	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
  	fi
@@ -1161,7 +1234,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -11001,29 +11049,29 @@
+@@ -11030,29 +11078,29 @@
  	  shared_flag='-G'
  	else
    	if test "$aix_use_runtimelinking" = yes; then
@@ -1200,7 +1273,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 _LT_AC_SYS_LIBPATH_AIX
-@@ -11038,7 +11086,7 @@
+@@ -11067,7 +11115,7 @@
  	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
  	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
  	  # This is similar to how AIX traditionally builds it's shared libraries.
@@ -1209,7 +1282,7 @@
  	fi
        fi
        ;;
-@@ -11061,13 +11109,13 @@
+@@ -11090,13 +11138,13 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -1226,7 +1299,7 @@
        # The linker will automatically build a .lib file if we build a DLL.
        _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
        # FIXME: Should let the user specify the lib program.
-@@ -11081,21 +11129,21 @@
+@@ -11110,21 +11158,21 @@
        _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
        case "$host_os" in
        rhapsody* | darwin1.[[012]])
@@ -1261,7 +1334,7 @@
  	;;
        esac
      	lt_int_apple_cc_single_mod=no
-@@ -11104,26 +11152,26 @@
+@@ -11133,26 +11181,26 @@
      	  lt_int_apple_cc_single_mod=yes
      	fi
      	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -1296,7 +1369,7 @@
        ;;
  
      dgux*)
-@@ -11156,8 +11204,8 @@
+@@ -11185,8 +11233,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -1307,7 +1380,7 @@
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
        _LT_AC_TAGVAR(hardcode_direct, $1)=yes
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11165,7 +11213,7 @@
+@@ -11194,7 +11242,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -1316,7 +1389,7 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
        fi
-@@ -11183,10 +11231,10 @@
+@@ -11212,10 +11260,10 @@
        if test "$GCC" = yes -a "$with_gnu_ld" = no; then
  	case "$host_cpu" in
  	hppa*64*|ia64*)
@@ -1329,7 +1402,7 @@
  	  ;;
  	esac
        else
-@@ -11233,7 +11281,7 @@
+@@ -11262,7 +11310,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -1338,7 +1411,7 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-@@ -11243,7 +11291,7 @@
+@@ -11272,7 +11320,7 @@
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
        ;;
  
@@ -1347,7 +1420,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -11266,7 +11314,7 @@
+@@ -11295,7 +11343,7 @@
        _LT_AC_TAGVAR(hardcode_direct, $1)=yes
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -1356,7 +1429,7 @@
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
        else
-@@ -11276,7 +11324,7 @@
+@@ -11305,7 +11353,7 @@
  	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
  	   ;;
  	 *)
@@ -1365,7 +1438,7 @@
  	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -11287,14 +11335,14 @@
+@@ -11316,14 +11364,14 @@
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
        _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
        _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -1382,7 +1455,7 @@
        else
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -11306,7 +11354,7 @@
+@@ -11335,7 +11383,7 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1391,7 +1464,7 @@
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
        else
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-@@ -11331,9 +11379,9 @@
+@@ -11360,9 +11408,9 @@
      solaris*)
        _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
        if test "$GCC" = yes; then
@@ -1403,7 +1476,7 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -11353,7 +11401,7 @@
+@@ -11382,7 +11430,7 @@
        if test "x$host_vendor" = xsequent; then
  	# Use $CC to link under sequent, because it throws in some extra .o
  	# files that make .init and .fini sections work.
@@ -1412,7 +1485,7 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -11413,9 +11461,9 @@
+@@ -11442,9 +11490,9 @@
     sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
        _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
        if test "$GCC" = yes; then
@@ -1424,7 +1497,7 @@
        fi
        runpath_var='LD_RUN_PATH'
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11473,7 +11521,7 @@
+@@ -11502,7 +11550,7 @@
        AC_MSG_CHECKING([whether -lc should be explicitly linked in])
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -1433,7 +1506,7 @@
        if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
          soname=conftest
          lib=conftest
-@@ -11632,8 +11680,8 @@
+@@ -11661,8 +11709,8 @@
      fi
    done
  done
@@ -1443,9 +1516,9 @@
  AC_MSG_RESULT([$SED])
  ])
  
-diff -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
+diff -Nru kdebase-3.4.2.orig/aclocal.m4 kdebase-3.4.2/aclocal.m4
+--- kdebase-3.4.2.orig/aclocal.m4	2005-07-20 21:01:16.000000000 +0000
++++ kdebase-3.4.2/aclocal.m4	2005-07-26 18:56:33.491855720 +0000
 @@ -501,6 +501,35 @@
  rmdir .tst 2>/dev/null
  AC_SUBST([am__leading_dot])])
@@ -1482,10 +1555,10 @@
  # Check to see how 'make' treats includes.	            -*- Autoconf -*-
  
  # Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-diff -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 @@
+diff -Nru kdebase-3.4.2.orig/applnk/compat/Makefile.in kdebase-3.4.2/applnk/compat/Makefile.in
+--- kdebase-3.4.2.orig/applnk/compat/Makefile.in	2005-07-20 21:08:03.000000000 +0000
++++ kdebase-3.4.2/applnk/compat/Makefile.in	2005-07-26 19:06:28.300431072 +0000
+@@ -248,6 +248,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -1495,7 +1568,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -540,7 +543,7 @@
+@@ -541,7 +544,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -1504,7 +1577,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -578,9 +581,9 @@
+@@ -579,9 +582,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -1516,10 +1589,19 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -741,7 +744,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=kcmkxmlrpcd.desktop bwarning.desktop virtualdesktops.desktop cwarning.desktop battery.desktop socks.desktop Makefile.in kcmkonq.desktop passwords.desktop email.desktop konqhtml.desktop userinfo.desktop Makefile.am power.desktop 
++KDE_DIST=kcmkxmlrpcd.desktop bwarning.desktop virtualdesktops.desktop cwarning.desktop battery.desktop socks.desktop Makefile.in kcmkonq.desktop passwords.desktop email.desktop konqhtml.desktop userinfo.desktop power.desktop Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+diff -Nru kdebase-3.4.2.orig/applnk/Makefile.in kdebase-3.4.2/applnk/Makefile.in
+--- kdebase-3.4.2.orig/applnk/Makefile.in	2005-07-20 21:08:03.000000000 +0000
++++ kdebase-3.4.2/applnk/Makefile.in	2005-07-26 19:06:28.283433656 +0000
+@@ -265,6 +265,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -1529,7 +1611,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -549,7 +552,7 @@
+@@ -550,7 +553,7 @@
  SUBDIRS = compat
  xdg_menu_DATA = kde-settings.menu kde-information.menu kde-screensavers.menu
  xdg_mergedmenu_DATA = kde-essential.menu
@@ -1538,7 +1620,7 @@
  xdg_directory_DATA = \
  kde-main.directory \
  kde-development.directory \
-@@ -597,7 +600,7 @@
+@@ -598,7 +601,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -1547,7 +1629,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -635,9 +638,9 @@
+@@ -636,9 +639,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -1559,15 +1641,47 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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
+@@ -1001,7 +1004,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=kde-settings-sound.directory kde-settings-desktop.directory kde-games.directory kde-games-arcade.directory kde-settings-accessibility.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-essential.menu kde-games-board.directory kde-information.menu kde-office.directory 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-science.directory kde-settings.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.2.orig/config.h.in kdebase-3.4.2/config.h.in
+--- kdebase-3.4.2.orig/config.h.in	2005-07-20 21:01:31.000000000 +0000
++++ kdebase-3.4.2/config.h.in	2005-07-26 18:56:50.798224752 +0000
+@@ -134,6 +134,9 @@
+ /* Defines if you have GL (Mesa, OpenGL, ...) */
+ #undef HAVE_GL
+ 
++/* Define if you have glXChooseVisual() */
++#undef HAVE_GLXCHOOSEVISUAL
++
+ /* Define to 1 if you have the `grantpt' function. */
+ #undef HAVE_GRANTPT
+ 
+@@ -909,9 +912,6 @@
+ #endif
+ 
+ 
+-/* define to 1 if -fvisibility is supported */
+-#undef __KDE_HAVE_GCC_VISIBILITY
+-
+ 
+ #if defined(__SVR4) && !defined(__svr4__)
+ #define __svr4__ 1
+diff -Nru kdebase-3.4.2.orig/configure kdebase-3.4.2/configure
+--- kdebase-3.4.2.orig/configure	2005-07-20 21:08:37.000000000 +0000
++++ kdebase-3.4.2/configure	2005-07-26 19:07:04.463933384 +0000
 @@ -464,7 +464,7 @@
  # include <unistd.h>
  #endif"
  
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KSYCOCA LIB_KFILE LIB_KFM PAMLIBS LIBSHADOW LIBGEN SETUIDFLAGS PASSWDLIBS KDM_PAM_SERVICE KCHECKPASS_PAM_SERVICE KSCREENSAVER_PAM_SERVICE LIBALIB LIBRPC LIBOSSAUDIO LIBCFG LIBODM LIBCURSES LIBUTEMPTER LIBKSTAT LIBDEVINFO JAVAC JAVAH JAR JVMLIBS jni_includes MD5SUM MD5SUM_CUT XTESTLIB LIB_XCURSOR have_xcursor_TRUE have_xcursor_FALSE QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN RUN_KAPPFINDER include_kcontrol_access_TRUE include_kcontrol_access_FALSE include_kcontrol_accessibility_TRUE include_kcontrol_accessibility_FALSE SSL_INCLUDES SSL_LDFLAGS LIBSSL DPMSINC DPMSLIB LIBFONTCONFIG_LIBS LIBFONTCONFIG_CFLAGS LIBFONTCONFIG_RPATH LIB_TRU64_MACH GLINC GLLIB COMPILE_GL_INFO_TRUE COMPILE_GL_INFO_FALSE LIBUSBCONFIG USB_LIBS USB_CFLAGS include_kcontrol_joystick_TRUE include_kcontrol_joystick_FALSE LIBFREETYPE_LIBS LIBFREETYPE_CFLAGS LIBFREETYPE_RPATH UNAME LIB_FONT_ENC LIBXFT_LIB include_fontinst_tn_TRUE include_fontinst_tn_FALSE include_kcontrol_kfontinst_TRUE include_kcontrol_kfontinst_FALSE LIB_XRANDR include_kcontrol_randr_TRUE include_kcontrol_randr_FALSE include_kcontrol_smartcard_TRUE include_kcontrol_smartcard_FALSE include_kcontrol_usbview_TRUE include_kcontrol_usbview_FALSE include_kcontrol_view1394_TRUE include_kcontrol_view1394_FALSE LIB_XSS LIB_XF86MISC nogroup KDE_BINDIR LIBXDMCP KRB4_INCS KRB4_LIBS KRB4_RPATH LIB_LIBS LIBPOSIX4 KRB5_INCS KRB5_LIBS KRB5_RPATH LIB_KVM SASL2_LIBS LIBBZ2 include_BZIP2_TRUE include_BZIP2_FALSE LDAP_INCS LDAP_LIBS LDAP_RPATH include_kioslave_ldap_TRUE include_kioslave_ldap_FALSE LINUXCDPOLLING include_media_linuxcdpolling_TRUE include_media_linuxcdpolling_FALSE HAL_INCS HAL_LIBS DBUS_INCS DBUS_LIBS DBUSQT_INCS DBUSQT_LIBS HALBACKEND include_media_halbackend_TRUE include_media_halbackend_FALSE include_kioslave_smb_TRUE include_kioslave_smb_FALSE SMBCLIENT_EXTRA_LIBS LIBART_LIBS LIBART_CFLAGS LIBART_RPATH PKG_CONFIG LIB_EXR EXR_FLAGS include_EXR_MODULES_TRUE include_EXR_MODULES_FALSE LIBMALLOC LIB_XINERAMA include_ksysguardd_TRUE include_ksysguardd_FALSE include_ksysguardd_linux_TRUE include_ksysguardd_linux_FALSE include_ksysguardd_freebsd_TRUE include_ksysguardd_freebsd_FALSE include_ksysguardd_netbsd_TRUE include_ksysguardd_netbsd_FALSE include_ksysguardd_solaris_TRUE include_ksysguardd_solaris_FALSE include_ksysguardd_tru64_TRUE include_ksysguardd_tru64_FALSE include_ksysguardd_irix_TRUE include_ksysguardd_irix_FALSE include_ksysguardd_openbsd_TRUE include_ksysguardd_openbsd_FALSE LIBSENSORS supports_i8k_TRUE supports_i8k_FALSE LIBHOSTS include_kompmgr_TRUE include_kompmgr_FALSE TOPSUBDIRS libkonq_SUBDIR_included_TRUE libkonq_SUBDIR_included_FALSE applnk_SUBDIR_included_TRUE applnk_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE drkonqi_SUBDIR_included_TRUE drkonqi_SUBDIR_included_FALSE kappfinder_SUBDIR_included_TRUE kappfinder_SUBDIR_included_FALSE kate_SUBDIR_included_TRUE kate_SUBDIR_included_FALSE kcheckpass_SUBDIR_included_TRUE kcheckpass_SUBDIR_included_FALSE kcminit_SUBDIR_included_TRUE kcminit_SUBDIR_included_FALSE kdcop_SUBDIR_included_TRUE kdcop_SUBDIR_included_FALSE kdebugdialog_SUBDIR_included_TRUE kdebugdialog_SUBDIR_included_FALSE kdepasswd_SUBDIR_included_TRUE kdepasswd_SUBDIR_included_FALSE kdeprint_SUBDIR_included_TRUE kdeprint_SUBDIR_included_FALSE kdesu_SUBDIR_included_TRUE kdesu_SUBDIR_included_FALSE kdialog_SUBDIR_included_TRUE kdialog_SUBDIR_included_FALSE kdmlib_SUBDIR_included_TRUE kdmlib_SUBDIR_included_FALSE kfind_SUBDIR_included_TRUE kfind_SUBDIR_included_FALSE khelpcenter_SUBDIR_included_TRUE khelpcenter_SUBDIR_included_FALSE khotkeys_SUBDIR_included_TRUE khotkeys_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE klipper_SUBDIR_included_TRUE klipper_SUBDIR_included_FALSE kmenuedit_SUBDIR_included_TRUE kmenuedit_SUBDIR_included_FALSE knetattach_SUBDIR_included_TRUE knetattach_SUBDIR_included_FALSE konsole_SUBDIR_included_TRUE konsole_SUBDIR_included_FALSE kpager_SUBDIR_included_TRUE kpager_SUBDIR_included_FALSE kpersonalizer_SUBDIR_included_TRUE kpersonalizer_SUBDIR_included_FALSE kreadconfig_SUBDIR_included_TRUE kreadconfig_SUBDIR_included_FALSE kscreensaver_SUBDIR_included_TRUE kscreensaver_SUBDIR_included_FALSE ksplashml_SUBDIR_included_TRUE ksplashml_SUBDIR_included_FALSE kstart_SUBDIR_included_TRUE kstart_SUBDIR_included_FALSE ksysguard_SUBDIR_included_TRUE ksysguard_SUBDIR_included_FALSE ksystraycmd_SUBDIR_included_TRUE ksystraycmd_SUBDIR_included_FALSE ktip_SUBDIR_included_TRUE ktip_SUBDIR_included_FALSE kwin_SUBDIR_included_TRUE kwin_SUBDIR_included_FALSE kxkb_SUBDIR_included_TRUE kxkb_SUBDIR_included_FALSE l10n_SUBDIR_included_TRUE l10n_SUBDIR_included_FALSE nsplugins_SUBDIR_included_TRUE nsplugins_SUBDIR_included_FALSE pics_SUBDIR_included_TRUE pics_SUBDIR_included_FALSE konqueror_SUBDIR_included_TRUE konqueror_SUBDIR_included_FALSE ksmserver_SUBDIR_included_TRUE ksmserver_SUBDIR_included_FALSE kicker_SUBDIR_included_TRUE kicker_SUBDIR_included_FALSE kcontrol_SUBDIR_included_TRUE kcontrol_SUBDIR_included_FALSE kdesktop_SUBDIR_included_TRUE kdesktop_SUBDIR_included_FALSE kdm_SUBDIR_included_TRUE kdm_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KSYCOCA LIB_KFILE LIB_KFM PAMLIBS LIBSHADOW LIBGEN SETUIDFLAGS PASSWDLIBS KDM_PAM_SERVICE KCHECKPASS_PAM_SERVICE KSCREENSAVER_PAM_SERVICE LIBALIB LIBRPC LIBOSSAUDIO LIBCFG LIBODM LIBCURSES LIBUTEMPTER LIBKSTAT LIBDEVINFO JAVAC JAVAH JAR JVMLIBS jni_includes MD5SUM MD5SUM_CUT XTESTLIB LIB_XCURSOR have_xcursor_TRUE have_xcursor_FALSE QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN RUN_KAPPFINDER include_kcontrol_access_TRUE include_kcontrol_access_FALSE include_kcontrol_accessibility_TRUE include_kcontrol_accessibility_FALSE SSL_INCLUDES SSL_LDFLAGS LIBSSL DPMSINC DPMSLIB LIBFONTCONFIG_LIBS LIBFONTCONFIG_CFLAGS LIBFONTCONFIG_RPATH LIB_TRU64_MACH GLINC GLLIB COMPILE_GL_INFO_TRUE COMPILE_GL_INFO_FALSE LIBUSBCONFIG USB_LIBS USB_CFLAGS include_kcontrol_joystick_TRUE include_kcontrol_joystick_FALSE LIBFREETYPE_LIBS LIBFREETYPE_CFLAGS LIBFREETYPE_RPATH UNAME LIB_FONT_ENC LIBXFT_LIB include_fontinst_tn_TRUE include_fontinst_tn_FALSE include_kcontrol_kfontinst_TRUE include_kcontrol_kfontinst_FALSE LIB_XRANDR include_kcontrol_randr_TRUE include_kcontrol_randr_FALSE include_kcontrol_smartcard_TRUE include_kcontrol_smartcard_FALSE include_kcontrol_usbview_TRUE include_kcontrol_usbview_FALSE include_kcontrol_view1394_TRUE include_kcontrol_view1394_FALSE LIB_XSS LIB_XF86MISC nogroup KDE_BINDIR LIBXDMCP KRB4_INCS KRB4_LIBS KRB4_RPATH LIB_LIBS LIBPOSIX4 KRB5_INCS KRB5_LIBS KRB5_RPATH LIB_KVM SASL2_LIBS LIBBZ2 include_BZIP2_TRUE include_BZIP2_FALSE LDAP_INCS LDAP_LIBS LDAP_RPATH include_kioslave_ldap_TRUE include_kioslave_ldap_FALSE LINUXCDPOLLING include_media_linuxcdpolling_TRUE include_media_linuxcdpolling_FALSE HAL_INCS HAL_LIBS DBUS_INCS DBUS_LIBS DBUSQT_INCS DBUSQT_LIBS HALBACKEND include_media_halbackend_TRUE include_media_halbackend_FALSE include_kioslave_smb_TRUE include_kioslave_smb_FALSE SMBCLIENT_EXTRA_LIBS LIBART_LIBS LIBART_CFLAGS LIBART_RPATH PKG_CONFIG LIB_EXR EXR_FLAGS include_EXR_MODULES_TRUE include_EXR_MODULES_FALSE LIBMALLOC LIB_XINERAMA include_ksysguardd_TRUE include_ksysguardd_FALSE include_ksysguardd_linux_TRUE include_ksysguardd_linux_FALSE include_ksysguardd_freebsd_TRUE include_ksysguardd_freebsd_FALSE include_ksysguardd_netbsd_TRUE include_ksysguardd_netbsd_FALSE include_ksysguardd_solaris_TRUE include_ksysguardd_solaris_FALSE include_ksysguardd_tru64_TRUE include_ksysguardd_tru64_FALSE include_ksysguardd_irix_TRUE include_ksysguardd_irix_FALSE include_ksysguardd_openbsd_TRUE include_ksysguardd_openbsd_FALSE LIBSENSORS supports_i8k_TRUE supports_i8k_FALSE LIBHOSTS include_kompmgr_TRUE include_kompmgr_FALSE TOPSUBDIRS libkonq_SUBDIR_included_TRUE libkonq_SUBDIR_included_FALSE applnk_SUBDIR_included_TRUE applnk_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE drkonqi_SUBDIR_included_TRUE drkonqi_SUBDIR_included_FALSE kappfinder_SUBDIR_included_TRUE kappfinder_SUBDIR_included_FALSE kate_SUBDIR_included_TRUE kate_SUBDIR_included_FALSE kcheckpass_SUBDIR_included_TRUE kcheckpass_SUBDIR_included_FALSE kcminit_SUBDIR_included_TRUE kcminit_SUBDIR_included_FALSE kdcop_SUBDIR_included_TRUE kdcop_SUBDIR_included_FALSE kdebugdialog_SUBDIR_included_TRUE kdebugdialog_SUBDIR_included_FALSE kdepasswd_SUBDIR_included_TRUE kdepasswd_SUBDIR_included_FALSE kdeprint_SUBDIR_included_TRUE kdeprint_SUBDIR_included_FALSE kdesu_SUBDIR_included_TRUE kdesu_SUBDIR_included_FALSE kdialog_SUBDIR_included_TRUE kdialog_SUBDIR_included_FALSE kdmlib_SUBDIR_included_TRUE kdmlib_SUBDIR_included_FALSE kfind_SUBDIR_included_TRUE kfind_SUBDIR_included_FALSE khelpcenter_SUBDIR_included_TRUE khelpcenter_SUBDIR_included_FALSE khotkeys_SUBDIR_included_TRUE khotkeys_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE klipper_SUBDIR_included_TRUE klipper_SUBDIR_included_FALSE kmenuedit_SUBDIR_included_TRUE kmenuedit_SUBDIR_included_FALSE knetattach_SUBDIR_included_TRUE knetattach_SUBDIR_included_FALSE konsole_SUBDIR_included_TRUE konsole_SUBDIR_included_FALSE kpager_SUBDIR_included_TRUE kpager_SUBDIR_included_FALSE kpersonalizer_SUBDIR_included_TRUE kpersonalizer_SUBDIR_included_FALSE kreadconfig_SUBDIR_included_TRUE kreadconfig_SUBDIR_included_FALSE kscreensaver_SUBDIR_included_TRUE kscreensaver_SUBDIR_included_FALSE ksplashml_SUBDIR_included_TRUE ksplashml_SUBDIR_included_FALSE kstart_SUBDIR_included_TRUE kstart_SUBDIR_included_FALSE ksysguard_SUBDIR_included_TRUE ksysguard_SUBDIR_included_FALSE ksystraycmd_SUBDIR_included_TRUE ksystraycmd_SUBDIR_included_FALSE ktip_SUBDIR_included_TRUE ktip_SUBDIR_included_FALSE kwin_SUBDIR_included_TRUE kwin_SUBDIR_included_FALSE kxkb_SUBDIR_included_TRUE kxkb_SUBDIR_included_FALSE l10n_SUBDIR_included_TRUE l10n_SUBDIR_included_FALSE nsplugins_SUBDIR_included_TRUE nsplugins_SUBDIR_included_FALSE pics_SUBDIR_included_TRUE pics_SUBDIR_included_FALSE konqueror_SUBDIR_included_TRUE konqueror_SUBDIR_included_FALSE ksmserver_SUBDIR_included_TRUE ksmserver_SUBDIR_included_FALSE kicker_SUBDIR_included_TRUE kicker_SUBDIR_included_FALSE kcontrol_SUBDIR_included_TRUE kcontrol_SUBDIR_included_FALSE kdesktop_SUBDIR_included_TRUE kdesktop_SUBDIR_included_FALSE kdm_SUBDIR_included_TRUE kdm_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM PAMLIBS LIBSHADOW LIBGEN SETUIDFLAGS PASSWDLIBS KDM_PAM_SERVICE KCHECKPASS_PAM_SERVICE KSCREENSAVER_PAM_SERVICE LIBALIB LIBRPC LIBOSSAUDIO LIBCFG LIBODM LIBCURSES LIBUTEMPTER LIBKSTAT LIBDEVINFO JAVAC JAVAH JAR JVMLIBS jni_includes MD5SUM MD5SUM_CUT XTESTLIB LIB_XCURSOR have_xcursor_TRUE have_xcursor_FALSE QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN RUN_KAPPFINDER include_kcontrol_access_TRUE include_kcontrol_access_FALSE include_kcontrol_accessibility_TRUE include_kcontrol_accessibility_FALSE SSL_INCLUDES SSL_LDFLAGS LIBSSL DPMSINC DPMSLIB LIBFONTCONFIG_LIBS LIBFONTCONFIG_CFLAGS LIBFONTCONFIG_RPATH LIB_TRU64_MACH GLINC GLLIB COMPILE_GL_INFO_TRUE COMPILE_GL_INFO_FALSE LIBUSBCONFIG USB_LIBS USB_CFLAGS include_kcontrol_joystick_TRUE include_kcontrol_joystick_FALSE LIBFREETYPE_LIBS LIBFREETYPE_CFLAGS LIBFREETYPE_RPATH UNAME LIB_FONT_ENC LIBXFT_LIB include_fontinst_tn_TRUE include_fontinst_tn_FALSE include_kcontrol_kfontinst_TRUE include_kcontrol_kfontinst_FALSE LIB_XRANDR include_kcontrol_randr_TRUE include_kcontrol_randr_FALSE include_kcontrol_smartcard_TRUE include_kcontrol_smartcard_FALSE include_kcontrol_usbview_TRUE include_kcontrol_usbview_FALSE include_kcontrol_view1394_TRUE include_kcontrol_view1394_FALSE LIB_XSS LIB_XF86MISC nogroup KDE_BINDIR LIBXDMCP KRB4_INCS KRB4_LIBS KRB4_RPATH LIB_LIBS LIBPOSIX4 KRB5_INCS KRB5_LIBS KRB5_RPATH LIB_KVM SASL2_LIBS LIBBZ2 include_BZIP2_TRUE include_BZIP2_FALSE LDAP_INCS LDAP_LIBS LDAP_RPATH include_kioslave_ldap_TRUE include_kioslave_ldap_FALSE LINUXCDPOLLING include_media_linuxcdpolling_TRUE include_media_linuxcdpolling_FALSE HAL_INCS HAL_LIBS DBUS_INCS DBUS_LIBS DBUSQT_INCS DBUSQT_LIBS HALBACKEND include_media_halbackend_TRUE include_media_halbackend_FALSE include_kioslave_smb_TRUE include_kioslave_smb_FALSE SMBCLIENT_EXTRA_LIBS LIBART_LIBS LIBART_CFLAGS LIBART_RPATH PKG_CONFIG LIB_EXR EXR_FLAGS include_EXR_MODULES_TRUE include_EXR_MODULES_FALSE LIBMALLOC LIB_XINERAMA include_ksysguardd_TRUE include_ksysguardd_FALSE include_ksysguardd_linux_TRUE include_ksysguardd_linux_FALSE include_ksysguardd_freebsd_TRUE include_ksysguardd_freebsd_FALSE include_ksysguardd_netbsd_TRUE include_ksysguardd_netbsd_FALSE include_ksysguardd_solaris_TRUE include_ksysguardd_solaris_FALSE include_ksysguardd_tru64_TRUE include_ksysguardd_tru64_FALSE include_ksysguardd_irix_TRUE include_ksysguardd_irix_FALSE include_ksysguardd_openbsd_TRUE include_ksysguardd_openbsd_FALSE LIBSENSORS supports_i8k_TRUE supports_i8k_FALSE LIBHOSTS include_kompmgr_TRUE include_kompmgr_FALSE TOPSUBDIRS libkonq_SUBDIR_included_TRUE libkonq_SUBDIR_included_FALSE applnk_SUBDIR_included_TRUE applnk_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE drkonqi_SUBDIR_included_TRUE drkonqi_SUBDIR_included_FALSE kappfinder_SUBDIR_included_TRUE kappfinder_SUBDIR_included_FALSE kate_SUBDIR_included_TRUE kate_SUBDIR_included_FALSE kcheckpass_SUBDIR_included_TRUE kcheckpass_SUBDIR_included_FALSE kcminit_SUBDIR_included_TRUE kcminit_SUBDIR_included_FALSE kdcop_SUBDIR_included_TRUE kdcop_SUBDIR_included_FALSE kdebugdialog_SUBDIR_included_TRUE kdebugdialog_SUBDIR_included_FALSE kdepasswd_SUBDIR_included_TRUE kdepasswd_SUBDIR_included_FALSE kdeprint_SUBDIR_included_TRUE kdeprint_SUBDIR_included_FALSE kdesu_SUBDIR_included_TRUE kdesu_SUBDIR_included_FALSE kdialog_SUBDIR_included_TRUE kdialog_SUBDIR_included_FALSE kdmlib_SUBDIR_included_TRUE kdmlib_SUBDIR_included_FALSE kfind_SUBDIR_included_TRUE kfind_SUBDIR_included_FALSE khelpcenter_SUBDIR_included_TRUE khelpcenter_SUBDIR_included_FALSE khotkeys_SUBDIR_included_TRUE khotkeys_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE klipper_SUBDIR_included_TRUE klipper_SUBDIR_included_FALSE kmenuedit_SUBDIR_included_TRUE kmenuedit_SUBDIR_included_FALSE knetattach_SUBDIR_included_TRUE knetattach_SUBDIR_included_FALSE konsole_SUBDIR_included_TRUE konsole_SUBDIR_included_FALSE kpager_SUBDIR_included_TRUE kpager_SUBDIR_included_FALSE kpersonalizer_SUBDIR_included_TRUE kpersonalizer_SUBDIR_included_FALSE kreadconfig_SUBDIR_included_TRUE kreadconfig_SUBDIR_included_FALSE kscreensaver_SUBDIR_included_TRUE kscreensaver_SUBDIR_included_FALSE ksplashml_SUBDIR_included_TRUE ksplashml_SUBDIR_included_FALSE kstart_SUBDIR_included_TRUE kstart_SUBDIR_included_FALSE ksysguard_SUBDIR_included_TRUE ksysguard_SUBDIR_included_FALSE ksystraycmd_SUBDIR_included_TRUE ksystraycmd_SUBDIR_included_FALSE ktip_SUBDIR_included_TRUE ktip_SUBDIR_included_FALSE kwin_SUBDIR_included_TRUE kwin_SUBDIR_included_FALSE kxkb_SUBDIR_included_TRUE kxkb_SUBDIR_included_FALSE l10n_SUBDIR_included_TRUE l10n_SUBDIR_included_FALSE nsplugins_SUBDIR_included_TRUE nsplugins_SUBDIR_included_FALSE pics_SUBDIR_included_TRUE pics_SUBDIR_included_FALSE konqueror_SUBDIR_included_TRUE konqueror_SUBDIR_included_FALSE ksmserver_SUBDIR_included_TRUE ksmserver_SUBDIR_included_FALSE kicker_SUBDIR_included_TRUE kicker_SUBDIR_included_FALSE kcontrol_SUBDIR_included_TRUE kcontrol_SUBDIR_included_FALSE kdesktop_SUBDIR_included_TRUE kdesktop_SUBDIR_included_FALSE kdm_SUBDIR_included_TRUE kdm_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM PAMLIBS LIBSHADOW LIBGEN SETUIDFLAGS PASSWDLIBS KDM_PAM_SERVICE KCHECKPASS_PAM_SERVICE KSCREENSAVER_PAM_SERVICE LIBALIB LIBRPC LIBOSSAUDIO LIBCFG LIBODM LIBCURSES LIBUTEMPTER LIBKSTAT LIBDEVINFO JAVAC JAVAH JAR JVMLIBS jni_includes MD5SUM MD5SUM_CUT XTESTLIB LIB_XCURSOR have_xcursor_TRUE have_xcursor_FALSE QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN RUN_KAPPFINDER include_kcontrol_access_TRUE include_kcontrol_access_FALSE include_kcontrol_accessibility_TRUE include_kcontrol_accessibility_FALSE SSL_INCLUDES SSL_LDFLAGS LIBSSL DPMSINC DPMSLIB LIBFONTCONFIG_LIBS LIBFONTCONFIG_CFLAGS LIBFONTCONFIG_RPATH LIB_TRU64_MACH GLINC GLLIB COMPILE_GL_INFO_TRUE COMPILE_GL_INFO_FALSE LIBUSBCONFIG USB_LIBS USB_CFLAGS include_kcontrol_joystick_TRUE include_kcontrol_joystick_FALSE LIBFREETYPE_LIBS LIBFREETYPE_CFLAGS LIBFREETYPE_RPATH UNAME LIB_FONT_ENC LIBXFT_LIB include_fontinst_tn_TRUE include_fontinst_tn_FALSE include_kcontrol_kfontinst_TRUE include_kcontrol_kfontinst_FALSE LIB_XRANDR include_kcontrol_randr_TRUE include_kcontrol_randr_FALSE include_kcontrol_smartcard_TRUE include_kcontrol_smartcard_FALSE include_kcontrol_usbview_TRUE include_kcontrol_usbview_FALSE include_kcontrol_view1394_TRUE include_kcontrol_view1394_FALSE LIB_XSS LIB_XF86MISC nogroup KDE_BINDIR LIBXDMCP KRB4_INCS KRB4_LIBS KRB4_RPATH LIB_LIBS LIBPOSIX4 KRB5_INCS KRB5_LIBS KRB5_RPATH LIB_KVM SASL2_LIBS LIBBZ2 include_BZIP2_TRUE include_BZIP2_FALSE LDAP_INCS LDAP_LIBS LDAP_RPATH include_kioslave_ldap_TRUE include_kioslave_ldap_FALSE LINUXCDPOLLING include_media_linuxcdpolling_TRUE include_media_linuxcdpolling_FALSE HAL_INCS HAL_LIBS DBUS_INCS DBUS_LIBS DBUSQT_INCS DBUSQT_LIBS HALBACKEND include_media_halbackend_TRUE include_media_halbackend_FALSE include_kioslave_smb_TRUE include_kioslave_smb_FALSE SMBCLIENT_EXTRA_LIBS LIBART_LIBS LIBART_CFLAGS LIBART_RPATH PKG_CONFIG LIB_EXR EXR_FLAGS include_EXR_MODULES_TRUE include_EXR_MODULES_FALSE LIBMALLOC LIB_XINERAMA include_ksysguardd_TRUE include_ksysguardd_FALSE include_ksysguardd_linux_TRUE include_ksysguardd_linux_FALSE include_ksysguardd_freebsd_TRUE include_ksysguardd_freebsd_FALSE include_ksysguardd_netbsd_TRUE include_ksysguardd_netbsd_FALSE include_ksysguardd_solaris_TRUE include_ksysguardd_solaris_FALSE include_ksysguardd_tru64_TRUE include_ksysguardd_tru64_FALSE include_ksysguardd_irix_TRUE include_ksysguardd_irix_FALSE include_ksysguardd_openbsd_TRUE include_ksysguardd_openbsd_FALSE LIBSENSORS supports_i8k_TRUE supports_i8k_FALSE LIBHOSTS include_kompmgr_TRUE include_kompmgr_FALSE TOPSUBDIRS libkonq_SUBDIR_included_TRUE libkonq_SUBDIR_included_FALSE applnk_SUBDIR_included_TRUE applnk_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE drkonqi_SUBDIR_included_TRUE drkonqi_SUBDIR_included_FALSE kappfinder_SUBDIR_included_TRUE kappfinder_SUBDIR_included_FALSE kate_SUBDIR_included_TRUE kate_SUBDIR_included_FALSE kcheckpass_SUBDIR_included_TRUE kcheckpass_SUBDIR_included_FALSE kcminit_SUBDIR_included_TRUE kcminit_SUBDIR_included_FALSE kdcop_SUBDIR_included_TRUE kdcop_SUBDIR_included_FALSE kdebugdialog_SUBDIR_included_TRUE kdebugdialog_SUBDIR_included_FALSE kdepasswd_SUBDIR_included_TRUE kdepasswd_SUBDIR_included_FALSE kdeprint_SUBDIR_included_TRUE kdeprint_SUBDIR_included_FALSE kdesu_SUBDIR_included_TRUE kdesu_SUBDIR_included_FALSE kdialog_SUBDIR_included_TRUE kdialog_SUBDIR_included_FALSE kdmlib_SUBDIR_included_TRUE kdmlib_SUBDIR_included_FALSE kfind_SUBDIR_included_TRUE kfind_SUBDIR_included_FALSE khelpcenter_SUBDIR_included_TRUE khelpcenter_SUBDIR_included_FALSE khotkeys_SUBDIR_included_TRUE khotkeys_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE klipper_SUBDIR_included_TRUE klipper_SUBDIR_included_FALSE kmenuedit_SUBDIR_included_TRUE kmenuedit_SUBDIR_included_FALSE knetattach_SUBDIR_included_TRUE knetattach_SUBDIR_included_FALSE konsole_SUBDIR_included_TRUE konsole_SUBDIR_included_FALSE kpager_SUBDIR_included_TRUE kpager_SUBDIR_included_FALSE kpersonalizer_SUBDIR_included_TRUE kpersonalizer_SUBDIR_included_FALSE kreadconfig_SUBDIR_included_TRUE kreadconfig_SUBDIR_included_FALSE kscreensaver_SUBDIR_included_TRUE kscreensaver_SUBDIR_included_FALSE ksplashml_SUBDIR_included_TRUE ksplashml_SUBDIR_included_FALSE kstart_SUBDIR_included_TRUE kstart_SUBDIR_included_FALSE ksysguard_SUBDIR_included_TRUE ksysguard_SUBDIR_included_FALSE ksystraycmd_SUBDIR_included_TRUE ksystraycmd_SUBDIR_included_FALSE ktip_SUBDIR_included_TRUE ktip_SUBDIR_included_FALSE kwin_SUBDIR_included_TRUE kwin_SUBDIR_included_FALSE kxkb_SUBDIR_included_TRUE kxkb_SUBDIR_included_FALSE l10n_SUBDIR_included_TRUE l10n_SUBDIR_included_FALSE nsplugins_SUBDIR_included_TRUE nsplugins_SUBDIR_included_FALSE pics_SUBDIR_included_TRUE pics_SUBDIR_included_FALSE konqueror_SUBDIR_included_TRUE konqueror_SUBDIR_included_FALSE ksmserver_SUBDIR_included_TRUE ksmserver_SUBDIR_included_FALSE kicker_SUBDIR_included_TRUE kicker_SUBDIR_included_FALSE kcontrol_SUBDIR_included_TRUE kcontrol_SUBDIR_included_FALSE kdesktop_SUBDIR_included_TRUE kdesktop_SUBDIR_included_FALSE kdm_SUBDIR_included_TRUE kdm_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
  ac_subst_files=''
  
  # Initialize some variables set by options.
@@ -6435,7 +6549,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28610,8 +28533,7 @@
+@@ -28613,8 +28536,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6445,7 +6559,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28686,8 +28608,7 @@
+@@ -28689,8 +28611,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6455,7 +6569,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28747,8 +28668,7 @@
+@@ -28750,8 +28671,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6465,7 +6579,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28831,8 +28751,7 @@
+@@ -28834,8 +28754,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6475,7 +6589,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28925,8 +28844,7 @@
+@@ -28928,8 +28847,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6485,7 +6599,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29100,8 +29018,7 @@
+@@ -29103,8 +29021,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6495,7 +6609,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29199,8 +29116,7 @@
+@@ -29202,8 +29119,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6505,7 +6619,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29293,8 +29209,7 @@
+@@ -29296,8 +29212,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6515,7 +6629,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29377,8 +29292,7 @@
+@@ -29380,8 +29295,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6525,25 +6639,25 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29431,7 +29345,7 @@
+@@ -29434,7 +29348,7 @@
  do
    for j in jpeglib.h;
    do
--    echo "configure: 29434: $i/$j" >&5
-+    echo "configure: 29348: $i/$j" >&5
+-    echo "configure: 29437: $i/$j" >&5
++    echo "configure: 29351: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        jpeg_incdir=$i
-@@ -29739,7 +29653,7 @@
+@@ -29737,7 +29651,7 @@
  do
    for j in $kde_qt_header;
    do
--    echo "configure: 29742: $i/$j" >&5
-+    echo "configure: 29656: $i/$j" >&5
+-    echo "configure: 29740: $i/$j" >&5
++    echo "configure: 29654: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        qt_incdir=$i
-@@ -30416,8 +30330,7 @@
+@@ -30414,8 +30328,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6553,93 +6667,443 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30576,7 +30489,7 @@
+@@ -30574,7 +30487,7 @@
  do
    for j in $kde_check_header;
    do
--    echo "configure: 30579: $i/$j" >&5
-+    echo "configure: 30492: $i/$j" >&5
+-    echo "configure: 30577: $i/$j" >&5
++    echo "configure: 30490: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_incdir=$i
-@@ -30606,7 +30519,7 @@
+@@ -30604,7 +30517,7 @@
  do
    for j in $kde_check_lib;
    do
--    echo "configure: 30609: $i/$j" >&5
-+    echo "configure: 30522: $i/$j" >&5
+-    echo "configure: 30607: $i/$j" >&5
++    echo "configure: 30520: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_libdir=$i
-@@ -30624,7 +30537,7 @@
+@@ -30622,7 +30535,7 @@
  do
    for j in "kde3/plugins/designer/kdewidgets.la";
    do
--    echo "configure: 30627: $i/$j" >&5
-+    echo "configure: 30540: $i/$j" >&5
+-    echo "configure: 30625: $i/$j" >&5
++    echo "configure: 30538: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_widgetdir=$i
-@@ -32142,7 +32055,7 @@
+@@ -32140,7 +32053,7 @@
  do
    for j in apps/ksgmltools2/customization/kde-chunk.xsl;
    do
--    echo "configure: 32145: $i/$j" >&5
-+    echo "configure: 32058: $i/$j" >&5
+-    echo "configure: 32143: $i/$j" >&5
++    echo "configure: 32056: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        KDE_XSL_STYLESHEET=$i
-@@ -32339,8 +32252,7 @@
+@@ -32297,38 +32210,59 @@
+ 
+   if test "x$GXX" = "xyes"; then
+     kde_have_gcc_visibility=no
++  fi
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -fvisibility=hidden" >&5
+-echo $ECHO_N "checking whether $CXX supports -fvisibility=hidden... $ECHO_C" >&6
+-kde_cache=`echo fvisibility=hidden | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+ 
+ 
+ 
+-   ac_ext=cc
+-ac_cpp='$CXXCPP $CPPFLAGS'
+-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ 
+-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++  want_pam=
++
++# Check whether --with-pam or --without-pam was given.
++if test "${with_pam+set}" = set; then
++  withval="$with_pam"
++   if test "x$withval" = "xyes"; then
++        want_pam=yes
++        pam_service=kde
++      elif test "x$withval" = "xno"; then
++        want_pam=no
++      else
++        want_pam=yes
++        pam_service=$withval
++      fi
+ 
++else
++   pam_service=kde
++fi;
+ 
+-  save_CXXFLAGS="$CXXFLAGS"
+-  CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+-  cat >conftest.$ac_ext <<_ACEOF
++  use_pam=
++  PAMLIBS=
++  if test "x$want_pam" != xno; then
++    echo "$as_me:$LINENO: checking for pam_start in -lpam" >&5
++echo $ECHO_N "checking for pam_start in -lpam... $ECHO_C" >&6
++if test "${ac_cv_lib_pam_pam_start+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lpam $LIBDL $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char pam_start ();
+ int
+ main ()
+ {
+- return 0;
++pam_start ();
+   ;
+   return 0;
+ }
+@@ -32342,8 +32276,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'
++	 { 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=$?
-@@ -32427,8 +32339,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
+@@ -32355,312 +32288,7 @@
    ac_status=$?
-@@ -32515,8 +32426,7 @@
-   cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+   (exit $ac_status); }; }; then
+-  eval "kde_cv_prog_cxx_$kde_cache=yes"
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-  CXXFLAGS="$save_CXXFLAGS"
+-  ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+-
+-fi
+-
+-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+- :
+-
+-      kde_have_gcc_visibility=yes
+-      echo "$as_me:$LINENO: checking if Qt is patched for -fvisibility" >&5
+-echo $ECHO_N "checking if Qt is patched for -fvisibility... $ECHO_C" >&6
+-if test "${kde_cv_val_qt_gcc_visibility_patched+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+-
+-
+-           ac_ext=cc
+-ac_cpp='$CXXCPP $CPPFLAGS'
+-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+-
+-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-
+-
+-
+-          safe_CXXFLAGS=$CXXFLAGS
+-          CXXFLAGS="$CXXFLAGS $all_includes"
+-
+-          cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-#include <qglobal.h>
+-#if Q_EXPORT - 0 != 0
+-/* if this compiles, then Q_EXPORT is undefined */
+-/* if Q_EXPORT is nonempty, this will break compilation */
+-#endif
+-
+-int
+-main ()
+-{
+-/* elvis is alive */
+-  ;
+-  return 0;
+-}
+-_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); } &&
 -	 { 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=$?
-@@ -32603,8 +32513,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  { (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
+-  kde_cv_val_qt_gcc_visibility_patched=no
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-kde_cv_val_qt_gcc_visibility_patched=yes
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-
+-          CXXFLAGS=$safe_CXXFLAGS
+-          ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+-
+-
+-fi
+-echo "$as_me:$LINENO: result: $kde_cv_val_qt_gcc_visibility_patched" >&5
+-echo "${ECHO_T}$kde_cv_val_qt_gcc_visibility_patched" >&6
+-
+-      if test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
+-        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+-
+-    echo "$as_me:$LINENO: checking for gcc -fvisibility-inlines-hidden bug" >&5
+-echo $ECHO_N "checking for gcc -fvisibility-inlines-hidden bug... $ECHO_C" >&6
+-if test "${kde_cv_val_gcc_visibility_bug+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+-
+-
+-         ac_ext=cc
+-ac_cpp='$CXXCPP $CPPFLAGS'
+-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+-
+-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-
+-
+-
+-        safe_CXXFLAGS=$CXXFLAGS
+-        safe_LDFLAGS=$LDFLAGS
+-        CXXFLAGS="$CXXFLAGS -fPIC -fvisibility-inlines-hidden -O0"
+-        LDFLAGS="$LDFLAGS -shared -fPIC"
+-
+-        cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-          /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */
+-	  #include <string>
+-          int some_function( void ) __attribute__ ((visibility("default")));
+-          int some_function( void )
+-          {
+-	    std::string s("blafasel");
+-            return 0;
+-          }
+-
+-int
+-main ()
+-{
+-/* elvis is alive */
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 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); } &&
 -	 { 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=$?
-@@ -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"
+-  { (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_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
+-  kde_cv_val_gcc_visibility_bug=no
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-kde_cv_val_gcc_visibility_bug=yes
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-
+-        CXXFLAGS=$safe_CXXFLAGS
+-        LDFLAGS=$safe_LDFLAGS
+-        ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+-
+-
+-fi
+-echo "$as_me:$LINENO: result: $kde_cv_val_gcc_visibility_bug" >&5
+-echo "${ECHO_T}$kde_cv_val_gcc_visibility_bug" >&6
+-
+-    if test x$kde_cv_val_gcc_visibility_bug = xno; then
+-      CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
+-    fi
+-
+-
+-        HAVE_GCC_VISIBILITY=1
+-
+-cat >>confdefs.h <<_ACEOF
+-#define __KDE_HAVE_GCC_VISIBILITY "$HAVE_GCC_VISIBILITY"
+-_ACEOF
+-
+-      fi
+-
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+- :
+-
+-fi
+-
+-  fi
+-
+-
+-
+-
+-
+-  want_pam=
+-
+-# Check whether --with-pam or --without-pam was given.
+-if test "${with_pam+set}" = set; then
+-  withval="$with_pam"
+-   if test "x$withval" = "xyes"; then
+-        want_pam=yes
+-        pam_service=kde
+-      elif test "x$withval" = "xno"; then
+-        want_pam=no
+-      else
+-        want_pam=yes
+-        pam_service=$withval
+-      fi
+-
+-else
+-   pam_service=kde
+-fi;
+-
+-  use_pam=
+-  PAMLIBS=
+-  if test "x$want_pam" != xno; then
+-    echo "$as_me:$LINENO: checking for pam_start in -lpam" >&5
+-echo $ECHO_N "checking for pam_start in -lpam... $ECHO_C" >&6
+-if test "${ac_cv_lib_pam_pam_start+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpam $LIBDL $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char pam_start ();
+-int
+-main ()
+-{
+-pam_start ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 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); } &&
+-	 { ac_try='test -z "$ac_c_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 @@
+-  { (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_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_lib_pam_pam_start=yes
++  ac_cv_lib_pam_pam_start=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -32705,8 +32333,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6649,7 +7113,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32881,8 +32788,7 @@
+@@ -32845,8 +32472,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6659,7 +7123,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33021,8 +32927,7 @@
+@@ -33086,8 +32712,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6669,7 +7133,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33262,8 +33167,7 @@
+@@ -33155,8 +32780,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6679,7 +7143,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33331,8 +33235,7 @@
+@@ -33251,8 +32875,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6689,7 +7153,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33427,8 +33330,7 @@
+@@ -33495,8 +33118,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6699,7 +7163,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33671,8 +33573,7 @@
+@@ -33568,8 +33190,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6709,7 +7173,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33744,8 +33645,7 @@
+@@ -33623,8 +33244,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6719,7 +7183,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33799,8 +33699,7 @@
+@@ -33695,8 +33315,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6729,7 +7193,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33871,8 +33770,7 @@
+@@ -33750,8 +33369,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6739,7 +7203,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33926,8 +33824,7 @@
+@@ -33818,8 +33436,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6749,7 +7213,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33994,8 +33891,7 @@
+@@ -34023,8 +33640,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6759,7 +7223,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34201,8 +34097,7 @@
+@@ -34170,8 +33786,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6769,7 +7233,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34347,8 +34242,7 @@
+@@ -34234,8 +33849,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6779,7 +7243,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34521,8 +34415,7 @@
+@@ -34408,8 +34022,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6789,7 +7253,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34581,8 +34474,7 @@
+@@ -34468,8 +34081,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6799,7 +7263,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34677,8 +34569,7 @@
+@@ -34564,8 +34176,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6809,7 +7273,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34744,8 +34635,7 @@
+@@ -34631,8 +34242,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6819,7 +7283,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34810,8 +34700,7 @@
+@@ -34697,8 +34307,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6829,7 +7293,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34874,8 +34763,7 @@
+@@ -34761,8 +34370,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6839,7 +7303,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34936,8 +34824,7 @@
+@@ -34823,8 +34431,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6849,7 +7313,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35007,8 +34894,7 @@
+@@ -34894,8 +34501,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6859,7 +7323,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35074,8 +34960,7 @@
+@@ -34961,8 +34567,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6869,7 +7333,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35141,8 +35026,7 @@
+@@ -35028,8 +34633,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6879,7 +7343,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35227,8 +35111,7 @@
+@@ -35114,8 +34718,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6889,7 +7353,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35333,8 +35216,7 @@
+@@ -35220,8 +34823,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6899,7 +7363,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35399,8 +35281,7 @@
+@@ -35286,8 +34888,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6909,7 +7373,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35475,8 +35356,7 @@
+@@ -35362,8 +34963,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6919,7 +7383,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35555,8 +35435,7 @@
+@@ -35442,8 +35042,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6929,7 +7393,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35745,8 +35624,7 @@
+@@ -35632,8 +35231,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6939,7 +7403,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35808,8 +35686,7 @@
+@@ -35695,8 +35293,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6949,7 +7413,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35849,8 +35726,7 @@
+@@ -35736,8 +35333,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6959,7 +7423,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35906,8 +35782,7 @@
+@@ -35793,8 +35389,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6969,7 +7433,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35947,8 +35822,7 @@
+@@ -35834,8 +35429,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6979,7 +7443,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36012,8 +35886,7 @@
+@@ -35899,8 +35493,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6989,7 +7453,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36044,10 +35917,8 @@
+@@ -35931,10 +35524,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -7002,7 +7466,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -36159,8 +36030,7 @@
+@@ -36046,8 +35637,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7012,7 +7476,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36222,8 +36092,7 @@
+@@ -36109,8 +35699,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7022,7 +7486,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36263,8 +36132,7 @@
+@@ -36150,8 +35739,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7032,7 +7496,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36320,8 +36188,7 @@
+@@ -36207,8 +35795,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7042,7 +7506,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36361,8 +36228,7 @@
+@@ -36248,8 +35835,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7052,7 +7516,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36426,8 +36292,7 @@
+@@ -36313,8 +35899,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7062,7 +7526,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36458,10 +36323,8 @@
+@@ -36345,10 +35930,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -7075,7 +7539,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -36573,8 +36436,7 @@
+@@ -36460,8 +36043,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7085,7 +7549,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36636,8 +36498,7 @@
+@@ -36523,8 +36105,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7095,7 +7559,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36677,8 +36538,7 @@
+@@ -36564,8 +36145,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7105,7 +7569,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36734,8 +36594,7 @@
+@@ -36621,8 +36201,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7115,7 +7579,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36775,8 +36634,7 @@
+@@ -36662,8 +36241,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7125,7 +7589,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36840,8 +36698,7 @@
+@@ -36727,8 +36305,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7135,7 +7599,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36872,10 +36729,8 @@
+@@ -36759,10 +36336,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -7148,7 +7612,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -36987,8 +36842,7 @@
+@@ -36874,8 +36449,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7158,7 +7622,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37050,8 +36904,7 @@
+@@ -36937,8 +36511,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7168,7 +7632,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37091,8 +36944,7 @@
+@@ -36978,8 +36551,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7178,7 +7642,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37148,8 +37000,7 @@
+@@ -37035,8 +36607,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7188,7 +7652,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37189,8 +37040,7 @@
+@@ -37076,8 +36647,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7198,7 +7662,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37254,8 +37104,7 @@
+@@ -37141,8 +36711,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7208,7 +7672,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37286,10 +37135,8 @@
+@@ -37173,10 +36742,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -7221,7 +7685,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -37404,8 +37251,7 @@
+@@ -37291,8 +36858,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7231,7 +7695,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37447,8 +37293,7 @@
+@@ -37334,8 +36900,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7241,7 +7705,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37505,8 +37350,7 @@
+@@ -37392,8 +36957,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7251,7 +7715,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37687,8 +37531,7 @@
+@@ -37575,8 +37139,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7261,7 +7725,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37742,9 +37585,6 @@
+@@ -37630,9 +37193,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7271,7 +7735,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -37778,8 +37618,7 @@
+@@ -37666,8 +37226,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7281,7 +7745,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37883,8 +37722,7 @@
+@@ -37771,8 +37330,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7291,7 +7755,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37963,9 +37801,6 @@
+@@ -37851,9 +37409,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7301,7 +7765,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -37996,8 +37831,7 @@
+@@ -37884,8 +37439,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7311,7 +7775,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38098,8 +37932,7 @@
+@@ -37986,8 +37540,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7321,7 +7785,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38178,9 +38011,6 @@
+@@ -38066,9 +37619,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7331,7 +7795,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -38211,8 +38041,7 @@
+@@ -38099,8 +37649,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7341,7 +7805,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38313,8 +38142,7 @@
+@@ -38201,8 +37750,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7351,7 +7815,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38393,9 +38221,6 @@
+@@ -38281,9 +37829,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7361,7 +7825,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -38431,8 +38256,7 @@
+@@ -38319,8 +37864,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7371,7 +7835,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38539,8 +38363,7 @@
+@@ -38427,8 +37971,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7381,7 +7845,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38619,9 +38442,6 @@
+@@ -38507,9 +38050,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7391,7 +7855,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -38656,8 +38476,7 @@
+@@ -38544,8 +38084,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7401,7 +7865,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38762,8 +38581,7 @@
+@@ -38650,8 +38189,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7411,7 +7875,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38842,9 +38660,6 @@
+@@ -38730,9 +38268,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7421,7 +7885,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -38877,8 +38692,7 @@
+@@ -38765,8 +38300,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7431,7 +7895,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38981,8 +38795,7 @@
+@@ -38869,8 +38403,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7441,7 +7905,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39061,9 +38874,6 @@
+@@ -38949,9 +38482,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7451,7 +7915,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -39096,8 +38906,7 @@
+@@ -38984,8 +38514,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7461,7 +7925,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39200,8 +39009,7 @@
+@@ -39088,8 +38617,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7471,7 +7935,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39279,9 +39087,6 @@
+@@ -39167,9 +38695,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7481,7 +7945,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -39314,8 +39119,7 @@
+@@ -39202,8 +38727,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7491,7 +7955,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39418,8 +39222,7 @@
+@@ -39306,8 +38830,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7501,7 +7965,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39513,8 +39316,7 @@
+@@ -39401,8 +38924,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7511,7 +7975,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39701,8 +39503,7 @@
+@@ -39589,8 +39111,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7521,7 +7985,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39772,8 +39573,7 @@
+@@ -39660,8 +39181,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7531,7 +7995,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39926,8 +39726,7 @@
+@@ -39814,8 +39334,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7541,7 +8005,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40461,8 +40260,7 @@
+@@ -40349,8 +39868,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7551,7 +8015,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40754,8 +40552,7 @@
+@@ -40642,8 +40160,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7561,7 +8025,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40900,8 +40697,7 @@
+@@ -40788,8 +40305,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7571,7 +8035,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40987,8 +40783,7 @@
+@@ -40875,8 +40391,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7581,7 +8045,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41050,8 +40845,7 @@
+@@ -40938,8 +40453,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7591,7 +8055,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41122,8 +40916,7 @@
+@@ -41010,8 +40524,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7601,7 +8065,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41213,8 +41006,7 @@
+@@ -41101,8 +40614,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7611,7 +8075,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41288,8 +41080,7 @@
+@@ -41176,8 +40688,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7621,7 +8085,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41399,8 +41190,7 @@
+@@ -41287,8 +40798,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7631,7 +8095,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41569,8 +41359,7 @@
+@@ -41457,8 +40967,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7641,16 +8105,16 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41632,7 +41421,7 @@
+@@ -41520,7 +41029,7 @@
  do
    for j in qsql.html;
    do
--    echo "configure: 41635: $i/$j" >&5
-+    echo "configure: 41424: $i/$j" >&5
+-    echo "configure: 41523: $i/$j" >&5
++    echo "configure: 41032: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        QTDOCDIR=$i
-@@ -41842,8 +41631,7 @@
+@@ -41730,8 +41239,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7660,7 +8124,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41936,8 +41724,7 @@
+@@ -41824,8 +41332,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7670,16 +8134,16 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42109,7 +41896,7 @@
+@@ -41997,7 +41504,7 @@
  do
    for j in openssl/ssl.h;
    do
--    echo "configure: 42112: $i/$j" >&5
-+    echo "configure: 41899: $i/$j" >&5
+-    echo "configure: 42000: $i/$j" >&5
++    echo "configure: 41507: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        ssl_incdir=$i
-@@ -42164,8 +41951,7 @@
+@@ -42052,8 +41559,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7689,7 +8153,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42413,8 +42199,7 @@
+@@ -42301,8 +41807,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7699,7 +8163,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42468,8 +42253,7 @@
+@@ -42356,8 +41861,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7709,7 +8173,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42571,8 +42355,7 @@
+@@ -42459,8 +41963,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7719,7 +8183,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42637,8 +42420,7 @@
+@@ -42525,8 +42028,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7729,7 +8193,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42896,8 +42678,7 @@
+@@ -42784,8 +42286,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7739,7 +8203,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42962,8 +42743,7 @@
+@@ -42850,8 +42351,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7749,7 +8213,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43113,8 +42893,7 @@
+@@ -43001,8 +42501,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7759,7 +8223,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43267,8 +43046,7 @@
+@@ -43155,8 +42654,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7769,7 +8233,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43370,8 +43148,7 @@
+@@ -43260,8 +42758,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7779,7 +8243,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43489,8 +43266,7 @@
+@@ -43380,8 +42877,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7789,7 +8253,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43615,8 +43391,7 @@
+@@ -43506,8 +43002,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7799,7 +8263,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44003,8 +43778,7 @@
+@@ -43894,8 +43389,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7809,7 +8273,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44174,8 +43948,7 @@
+@@ -44065,8 +43559,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7819,7 +8283,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44227,13 +44000,13 @@
+@@ -44118,13 +43611,13 @@
  	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
  	;;
       esac
@@ -7837,7 +8301,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -44265,8 +44038,7 @@
+@@ -44156,8 +43649,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7847,7 +8311,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44278,20 +44050,20 @@
+@@ -44169,20 +43661,20 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -7873,7 +8337,7 @@
    ac_font_enc_lib=1
  else
    ac_font_enc_lib=0
-@@ -44301,7 +44073,7 @@
+@@ -44192,7 +43684,7 @@
       LIBS="$kde_save_LIBS"
  
              if test "$ac_font_enc_lib" = "1"; then
@@ -7882,7 +8346,7 @@
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_FONT_ENC 1
-@@ -44352,8 +44124,7 @@
+@@ -44243,8 +43735,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7892,7 +8356,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44583,8 +44354,7 @@
+@@ -44474,8 +43965,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7902,7 +8366,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44650,8 +44420,7 @@
+@@ -44541,8 +44031,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7912,7 +8376,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44697,8 +44466,7 @@
+@@ -44588,8 +44077,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7922,7 +8386,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44778,8 +44546,7 @@
+@@ -44669,8 +44157,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7932,7 +8396,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44869,8 +44636,7 @@
+@@ -44760,8 +44247,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7942,7 +8406,224 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44973,8 +44739,7 @@
+@@ -44821,6 +44307,216 @@
+ 
+ 
+ 
++ test -z "$GL_LDFLAGS" && GL_LDFLAGS=
++ test -z "$GL_INCLUDE" && GL_INCLUDE=
++
++
++# Check whether --with-gl or --without-gl was given.
++if test "${with_gl+set}" = set; then
++  withval="$with_gl"
++  gl_test=$withval
++else
++  gl_test="yes"
++fi;
++ if test "x$kde_use_qt_emb" = "xyes"; then
++   # GL and Qt Embedded is a no-go for now.
++   ac_cv_have_gl=no
++ elif test "x$gl_test" = xno; then
++   ac_cv_have_gl=no
++ else
++   echo "$as_me:$LINENO: checking for GL" >&5
++echo $ECHO_N "checking for GL... $ECHO_C" >&6
++   if test "${ac_cv_have_gl+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++
++
++     ac_ext=cc
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
++
++ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++
++
++    ac_save_ldflags=$LDFLAGS
++    ac_save_cxxflags=$CXXFLAGS
++    ac_save_libs=$LIBS
++    LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries"
++    LIBS="$LIBS -lGL -lGLU"
++    test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LIBS="$LIBS -lX11"
++    LIBS="$LIBS $LIB_XEXT -lm $LIBSOCKET"
++    CXXFLAGS="$CFLAGS $X_INCLUDES"
++    test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS"
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <GL/gl.h>
++#include <GL/glu.h>
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { 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=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s 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_have_gl="yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_have_gl="no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++    ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++    LDFLAGS=$ac_save_ldflags
++    CXXFLAGS=$ac_save_cxxflags
++    LIBS=$ac_save_libs
++
++fi
++
++  if test "$ac_cv_have_gl" = "no"; then
++    echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++    GL_LDFLAGS=""
++    GLINC=""
++
++
++  else
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_GL 1
++_ACEOF
++
++    if test "$GL_LDFLAGS" = ""; then
++       GLLIB='-lGLU -lGL $(LIB_X11)'
++    else
++       GLLIB="$GL_LDFLAGS -lGLU -lGL "'$(LIB_X11)'
++    fi
++    if test "$GL_INCLUDE" = ""; then
++       GLINC=""
++    else
++       GLINC="-I$GL_INCLUDE"
++    fi
++    echo "$as_me:$LINENO: result: $ac_cv_have_gl" >&5
++echo "${ECHO_T}$ac_cv_have_gl" >&6
++
++    echo "$as_me:$LINENO: checking for glXChooseVisual in -lGL" >&5
++echo $ECHO_N "checking for glXChooseVisual in -lGL... $ECHO_C" >&6
++if test "${ac_cv_lib_GL_glXChooseVisual+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lGL  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char glXChooseVisual ();
++int
++main ()
++{
++glXChooseVisual ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { 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_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_lib_GL_glXChooseVisual=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_GL_glXChooseVisual=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_GL_glXChooseVisual" >&5
++echo "${ECHO_T}$ac_cv_lib_GL_glXChooseVisual" >&6
++if test $ac_cv_lib_GL_glXChooseVisual = yes; then
++
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_GLXCHOOSEVISUAL 1
++_ACEOF
++
++
++fi
++
++
++  fi
++ fi
++
++
++
++
++
++
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+ 
+@@ -44864,8 +44560,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7952,7 +8633,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45171,8 +44936,7 @@
+@@ -45062,8 +44757,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7962,7 +8643,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45373,8 +45137,7 @@
+@@ -45264,8 +44958,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7972,7 +8653,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45452,8 +45215,7 @@
+@@ -45343,8 +45036,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7982,7 +8663,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45516,8 +45278,7 @@
+@@ -45407,8 +45099,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7992,7 +8673,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45601,8 +45362,7 @@
+@@ -45492,8 +45183,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8002,25 +8683,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45644,13 +45404,13 @@
- 
- fi
- 
--        echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo in -lXss" >&5
--echo $ECHO_N "checking for XScreenSaverQueryInfo in -lXss... $ECHO_C" >&6
--if test "${ac_cv_lib_Xss_XScreenSaverQueryInfo+set}" = set; then
-+        echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo in -lXss_pic" >&5
-+echo $ECHO_N "checking for XScreenSaverQueryInfo in -lXss_pic... $ECHO_C" >&6
-+if test "${ac_cv_lib_Xss_pic_XScreenSaverQueryInfo+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lXss  $ld_shared_flag $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS  $LIBS"
-+LIBS="-lXss_pic  $ld_shared_flag $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -45682,8 +45442,7 @@
+@@ -45573,8 +45263,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8030,41 +8693,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45695,27 +45454,27 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_lib_Xss_XScreenSaverQueryInfo=yes
-+  ac_cv_lib_Xss_pic_XScreenSaverQueryInfo=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_Xss_XScreenSaverQueryInfo=no
-+ac_cv_lib_Xss_pic_XScreenSaverQueryInfo=no
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_Xss_XScreenSaverQueryInfo" >&5
--echo "${ECHO_T}$ac_cv_lib_Xss_XScreenSaverQueryInfo" >&6
--if test $ac_cv_lib_Xss_XScreenSaverQueryInfo = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_lib_Xss_pic_XScreenSaverQueryInfo" >&5
-+echo "${ECHO_T}$ac_cv_lib_Xss_pic_XScreenSaverQueryInfo" >&6
-+if test $ac_cv_lib_Xss_pic_XScreenSaverQueryInfo = yes; then
- 
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_XSCREENSAVER 1
- _ACEOF
- 
--            LIB_XSS="-lXss"
-+            LIB_XSS="-lXss_pic"
- 
- fi
- 
-@@ -45784,8 +45543,7 @@
+@@ -45675,8 +45364,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8074,25 +8703,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -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
- 
--    echo "$as_me:$LINENO: checking for XF86MiscQueryVersion in -lXxf86misc" >&5
--echo $ECHO_N "checking for XF86MiscQueryVersion in -lXxf86misc... $ECHO_C" >&6
--if test "${ac_cv_lib_Xxf86misc_XF86MiscQueryVersion+set}" = set; then
-+    echo "$as_me:$LINENO: checking for XF86MiscQueryVersion in -lXxf86misc_pic" >&5
-+echo $ECHO_N "checking for XF86MiscQueryVersion in -lXxf86misc_pic... $ECHO_C" >&6
-+if test "${ac_cv_lib_Xxf86misc_pic_XF86MiscQueryVersion+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lXxf86misc  $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS  $LIBS"
-+LIBS="-lXxf86misc_pic  $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -45848,8 +45606,7 @@
+@@ -45739,8 +45427,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8102,59 +8713,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45861,27 +45618,27 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_lib_Xxf86misc_XF86MiscQueryVersion=yes
-+  ac_cv_lib_Xxf86misc_pic_XF86MiscQueryVersion=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_Xxf86misc_XF86MiscQueryVersion=no
-+ac_cv_lib_Xxf86misc_pic_XF86MiscQueryVersion=no
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86misc_XF86MiscQueryVersion" >&5
--echo "${ECHO_T}$ac_cv_lib_Xxf86misc_XF86MiscQueryVersion" >&6
--if test $ac_cv_lib_Xxf86misc_XF86MiscQueryVersion = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86misc_pic_XF86MiscQueryVersion" >&5
-+echo "${ECHO_T}$ac_cv_lib_Xxf86misc_pic_XF86MiscQueryVersion" >&6
-+if test $ac_cv_lib_Xxf86misc_pic_XF86MiscQueryVersion = yes; then
- 
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_XF86MISC 1
- _ACEOF
- 
--	LIB_XF86MISC="-lXxf86misc"
-+	LIB_XF86MISC="-lXxf86misc_pic"
- 
- fi
- 
-@@ -45900,13 +45657,13 @@
- 
- 
- if test -n "$LIB_XF86MISC"; then
--    echo "$as_me:$LINENO: checking for XF86MiscSetGrabKeysState in -lXxf86misc" >&5
--echo $ECHO_N "checking for XF86MiscSetGrabKeysState in -lXxf86misc... $ECHO_C" >&6
--if test "${ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState+set}" = set; then
-+    echo "$as_me:$LINENO: checking for XF86MiscSetGrabKeysState in -lXxf86misc_pic" >&5
-+echo $ECHO_N "checking for XF86MiscSetGrabKeysState in -lXxf86misc_pic... $ECHO_C" >&6
-+if test "${ac_cv_lib_Xxf86misc_pic_XF86MiscSetGrabKeysState+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lXxf86misc  $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS  $LIBS"
-+LIBS="-lXxf86misc_pic  $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -45938,8 +45695,7 @@
+@@ -45829,8 +45516,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8164,33 +8723,224 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45951,20 +45707,20 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState=yes
-+  ac_cv_lib_Xxf86misc_pic_XF86MiscSetGrabKeysState=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -45869,6 +45555,216 @@
  
--ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState=no
-+ac_cv_lib_Xxf86misc_pic_XF86MiscSetGrabKeysState=no
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState" >&5
--echo "${ECHO_T}$ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState" >&6
--if test $ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86misc_pic_XF86MiscSetGrabKeysState" >&5
-+echo "${ECHO_T}$ac_cv_lib_Xxf86misc_pic_XF86MiscSetGrabKeysState" >&6
-+if test $ac_cv_lib_Xxf86misc_pic_XF86MiscSetGrabKeysState = yes; then
+ LDFLAGS="$xss_save_ldflags"
  
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -46167,8 +45923,7 @@
++
++
++ test -z "$GL_LDFLAGS" && GL_LDFLAGS=
++ test -z "$GL_INCLUDE" && GL_INCLUDE=
++
++
++# Check whether --with-gl or --without-gl was given.
++if test "${with_gl+set}" = set; then
++  withval="$with_gl"
++  gl_test=$withval
++else
++  gl_test="yes"
++fi;
++ if test "x$kde_use_qt_emb" = "xyes"; then
++   # GL and Qt Embedded is a no-go for now.
++   ac_cv_have_gl=no
++ elif test "x$gl_test" = xno; then
++   ac_cv_have_gl=no
++ else
++   echo "$as_me:$LINENO: checking for GL" >&5
++echo $ECHO_N "checking for GL... $ECHO_C" >&6
++   if test "${ac_cv_have_gl+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++
++
++     ac_ext=cc
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
++
++ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++
++
++    ac_save_ldflags=$LDFLAGS
++    ac_save_cxxflags=$CXXFLAGS
++    ac_save_libs=$LIBS
++    LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries"
++    LIBS="$LIBS -lGL -lGLU"
++    test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LIBS="$LIBS -lX11"
++    LIBS="$LIBS $LIB_XEXT -lm $LIBSOCKET"
++    CXXFLAGS="$CFLAGS $X_INCLUDES"
++    test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS"
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <GL/gl.h>
++#include <GL/glu.h>
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { 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=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s 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_have_gl="yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_have_gl="no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++    ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++    LDFLAGS=$ac_save_ldflags
++    CXXFLAGS=$ac_save_cxxflags
++    LIBS=$ac_save_libs
++
++fi
++
++  if test "$ac_cv_have_gl" = "no"; then
++    echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++    GL_LDFLAGS=""
++    GLINC=""
++
++
++  else
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_GL 1
++_ACEOF
++
++    if test "$GL_LDFLAGS" = ""; then
++       GLLIB='-lGLU -lGL $(LIB_X11)'
++    else
++       GLLIB="$GL_LDFLAGS -lGLU -lGL "'$(LIB_X11)'
++    fi
++    if test "$GL_INCLUDE" = ""; then
++       GLINC=""
++    else
++       GLINC="-I$GL_INCLUDE"
++    fi
++    echo "$as_me:$LINENO: result: $ac_cv_have_gl" >&5
++echo "${ECHO_T}$ac_cv_have_gl" >&6
++
++    echo "$as_me:$LINENO: checking for glXChooseVisual in -lGL" >&5
++echo $ECHO_N "checking for glXChooseVisual in -lGL... $ECHO_C" >&6
++if test "${ac_cv_lib_GL_glXChooseVisual+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lGL  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char glXChooseVisual ();
++int
++main ()
++{
++glXChooseVisual ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { 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_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_lib_GL_glXChooseVisual=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_GL_glXChooseVisual=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_GL_glXChooseVisual" >&5
++echo "${ECHO_T}$ac_cv_lib_GL_glXChooseVisual" >&6
++if test $ac_cv_lib_GL_glXChooseVisual = yes; then
++
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_GLXCHOOSEVISUAL 1
++_ACEOF
++
++
++fi
++
++
++  fi
++ fi
++
++
++
++
+ echo "$as_me:$LINENO: checking \"struct ucred\"" >&5
+ echo $ECHO_N "checking \"struct ucred\"... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -46058,8 +45954,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8200,7 +8950,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46439,8 +46194,7 @@
+@@ -46330,8 +46225,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8210,7 +8960,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46540,8 +46294,7 @@
+@@ -46431,8 +46325,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8220,7 +8970,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46639,8 +46392,7 @@
+@@ -46530,8 +46423,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8230,7 +8980,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46708,8 +46460,7 @@
+@@ -46599,8 +46491,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8240,7 +8990,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46753,8 +46504,7 @@
+@@ -46644,8 +46535,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8250,7 +9000,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46820,8 +46570,7 @@
+@@ -46711,8 +46601,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8260,7 +9010,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46865,8 +46614,7 @@
+@@ -46756,8 +46645,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8270,7 +9020,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46935,8 +46683,7 @@
+@@ -46826,8 +46714,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8280,7 +9030,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46983,8 +46730,7 @@
+@@ -46874,8 +46761,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8290,7 +9040,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47094,8 +46840,7 @@
+@@ -46985,8 +46871,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8300,7 +9050,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47202,8 +46947,7 @@
+@@ -47093,8 +46978,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8310,7 +9060,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47305,8 +47049,7 @@
+@@ -47196,8 +47080,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8320,7 +9070,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47417,8 +47160,7 @@
+@@ -47308,8 +47191,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8330,25 +9080,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47452,13 +47194,13 @@
- fi
- 
- 
--echo "$as_me:$LINENO: checking for main in -lXau" >&5
--echo $ECHO_N "checking for main in -lXau... $ECHO_C" >&6
--if test "${ac_cv_lib_Xau_main+set}" = set; then
-+echo "$as_me:$LINENO: checking for main in -lXau_pic" >&5
-+echo $ECHO_N "checking for main in -lXau_pic... $ECHO_C" >&6
-+if test "${ac_cv_lib_Xau_pic_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lXau $X_LDFLAGS -lX11 $LIBSOCKET $LIBS"
-+LIBS="-lXau_pic $X_LDFLAGS -lX11 $LIBSOCKET $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -47484,8 +47226,7 @@
+@@ -47375,8 +47257,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8358,51 +9090,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47497,20 +47238,20 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_lib_Xau_main=yes
-+  ac_cv_lib_Xau_pic_main=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_Xau_main=no
-+ac_cv_lib_Xau_pic_main=no
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_Xau_main" >&5
--echo "${ECHO_T}$ac_cv_lib_Xau_main" >&6
--if test $ac_cv_lib_Xau_main = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_lib_Xau_pic_main" >&5
-+echo "${ECHO_T}$ac_cv_lib_Xau_pic_main" >&6
-+if test $ac_cv_lib_Xau_pic_main = yes; then
-   :
- else
- 
-@@ -47530,13 +47271,13 @@
-   with_xdmcp=yes
- fi;
- if test "x$with_xdmcp" = xyes; then
--  echo "$as_me:$LINENO: checking for main in -lXdmcp" >&5
--echo $ECHO_N "checking for main in -lXdmcp... $ECHO_C" >&6
--if test "${ac_cv_lib_Xdmcp_main+set}" = set; then
-+  echo "$as_me:$LINENO: checking for main in -lXdmcp_pic" >&5
-+echo $ECHO_N "checking for main in -lXdmcp_pic... $ECHO_C" >&6
-+if test "${ac_cv_lib_Xdmcp_pic_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lXdmcp $X_LDFLAGS -lX11 $LIBSOCKET $LIBS"
-+LIBS="-lXdmcp_pic $X_LDFLAGS -lX11 $LIBSOCKET $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -47562,8 +47303,7 @@
+@@ -47453,8 +47334,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8412,35 +9100,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47575,21 +47315,21 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_lib_Xdmcp_main=yes
-+  ac_cv_lib_Xdmcp_pic_main=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_Xdmcp_main=no
-+ac_cv_lib_Xdmcp_pic_main=no
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_Xdmcp_main" >&5
--echo "${ECHO_T}$ac_cv_lib_Xdmcp_main" >&6
--if test $ac_cv_lib_Xdmcp_main = yes; then
--  LIBXDMCP="-lXdmcp"
-+echo "$as_me:$LINENO: result: $ac_cv_lib_Xdmcp_pic_main" >&5
-+echo "${ECHO_T}$ac_cv_lib_Xdmcp_pic_main" >&6
-+if test $ac_cv_lib_Xdmcp_pic_main = yes; then
-+  LIBXDMCP="-lXdmcp_pic"
- fi
- 
-   if test -n "$LIBXDMCP"; then
-@@ -47619,8 +47359,7 @@
+@@ -47510,8 +47390,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8450,7 +9110,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47729,8 +47468,7 @@
+@@ -47620,8 +47499,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8460,7 +9120,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47839,8 +47577,7 @@
+@@ -47730,8 +47608,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8470,7 +9130,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47943,8 +47680,7 @@
+@@ -47834,8 +47711,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8480,7 +9140,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -48012,8 +47748,7 @@
+@@ -47903,8 +47779,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8490,7 +9150,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -48103,8 +47838,7 @@
+@@ -47994,8 +47869,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8500,7 +9160,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -48280,8 +48014,7 @@
+@@ -48171,8 +48045,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8510,7 +9170,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -48587,8 +48320,7 @@
+@@ -48478,8 +48351,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8520,7 +9180,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -48671,8 +48403,7 @@
+@@ -48562,8 +48434,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8530,16 +9190,16 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -48831,7 +48562,7 @@
+@@ -48722,7 +48593,7 @@
  do
    for j in openssl/ssl.h;
    do
--    echo "configure: 48834: $i/$j" >&5
-+    echo "configure: 48565: $i/$j" >&5
+-    echo "configure: 48725: $i/$j" >&5
++    echo "configure: 48596: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        ssl_incdir=$i
-@@ -48886,8 +48617,7 @@
+@@ -48777,8 +48648,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8549,7 +9209,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -49124,8 +48854,7 @@
+@@ -49015,8 +48885,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8559,7 +9219,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -49297,8 +49026,7 @@
+@@ -49188,8 +49057,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8569,7 +9229,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -49469,8 +49197,7 @@
+@@ -49360,8 +49228,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8579,7 +9239,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -49562,8 +49289,7 @@
+@@ -49453,8 +49320,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8589,7 +9249,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -49652,8 +49378,7 @@
+@@ -49543,8 +49409,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8599,7 +9259,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -49742,8 +49467,7 @@
+@@ -49633,8 +49498,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8609,7 +9269,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -49837,8 +49561,7 @@
+@@ -49728,8 +49592,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8619,7 +9279,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -49943,8 +49666,7 @@
+@@ -49834,8 +49697,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8629,7 +9289,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -50133,8 +49855,7 @@
+@@ -50024,8 +49886,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8639,25 +9299,25 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -50192,7 +49913,7 @@
+@@ -50083,7 +49944,7 @@
  do
    for j in ldap.h;
    do
--    echo "configure: 50195: $i/$j" >&5
-+    echo "configure: 49916: $i/$j" >&5
+-    echo "configure: 50086: $i/$j" >&5
++    echo "configure: 49947: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        ldap_incdir=$i
-@@ -50214,7 +49935,7 @@
+@@ -50105,7 +49966,7 @@
  do
    for j in libldap.$ext;
    do
--    echo "configure: 50217: $i/$j" >&5
-+    echo "configure: 49938: $i/$j" >&5
+-    echo "configure: 50108: $i/$j" >&5
++    echo "configure: 49969: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        ldap_libdir=$i
-@@ -50311,8 +50032,7 @@
+@@ -50202,8 +50063,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8667,7 +9327,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -50409,8 +50129,7 @@
+@@ -50300,8 +50160,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8677,70 +9337,70 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -50568,7 +50287,7 @@
+@@ -50459,7 +50318,7 @@
  do
    for j in libhal.h libhal-storage.h;
    do
--    echo "configure: 50571: $i/$j" >&5
-+    echo "configure: 50290: $i/$j" >&5
+-    echo "configure: 50462: $i/$j" >&5
++    echo "configure: 50321: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        hal_incdir=$i
-@@ -50590,7 +50309,7 @@
+@@ -50481,7 +50340,7 @@
  do
    for j in libhal.so libhal-storage.so;
    do
--    echo "configure: 50593: $i/$j" >&5
-+    echo "configure: 50312: $i/$j" >&5
+-    echo "configure: 50484: $i/$j" >&5
++    echo "configure: 50343: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        hal_libdir=$i
-@@ -50644,7 +50363,7 @@
+@@ -50535,7 +50394,7 @@
  do
    for j in dbus/dbus.h;
    do
--    echo "configure: 50647: $i/$j" >&5
-+    echo "configure: 50366: $i/$j" >&5
+-    echo "configure: 50538: $i/$j" >&5
++    echo "configure: 50397: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        dbus_incdir=$i
-@@ -50661,7 +50380,7 @@
+@@ -50552,7 +50411,7 @@
  do
    for j in dbus/dbus-arch-deps.h;
    do
--    echo "configure: 50664: $i/$j" >&5
-+    echo "configure: 50383: $i/$j" >&5
+-    echo "configure: 50555: $i/$j" >&5
++    echo "configure: 50414: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        dbus_incdir_arch_deps=$i
-@@ -50683,7 +50402,7 @@
+@@ -50574,7 +50433,7 @@
  do
    for j in libdbus-1.so;
    do
--    echo "configure: 50686: $i/$j" >&5
-+    echo "configure: 50405: $i/$j" >&5
+-    echo "configure: 50577: $i/$j" >&5
++    echo "configure: 50436: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        dbus_libdir=$i
-@@ -50726,7 +50445,7 @@
+@@ -50617,7 +50476,7 @@
  do
    for j in dbus/connection.h;
    do
--    echo "configure: 50729: $i/$j" >&5
-+    echo "configure: 50448: $i/$j" >&5
+-    echo "configure: 50620: $i/$j" >&5
++    echo "configure: 50479: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        dbusqt_incdir=$i
-@@ -50753,7 +50472,7 @@
+@@ -50644,7 +50503,7 @@
  do
    for j in libdbus-qt-1.so;
    do
--    echo "configure: 50756: $i/$j" >&5
-+    echo "configure: 50475: $i/$j" >&5
+-    echo "configure: 50647: $i/$j" >&5
++    echo "configure: 50506: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        dbusqt_libdir=$i
-@@ -50867,8 +50586,7 @@
+@@ -50758,8 +50617,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8750,7 +9410,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -50897,8 +50615,7 @@
+@@ -50788,8 +50646,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8760,7 +9420,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -50968,8 +50685,7 @@
+@@ -50859,8 +50716,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8770,7 +9430,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -51021,8 +50737,7 @@
+@@ -50912,8 +50768,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8780,7 +9440,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -51093,8 +50808,7 @@
+@@ -50984,8 +50839,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8790,7 +9450,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -51146,8 +50860,7 @@
+@@ -51037,8 +50891,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8800,7 +9460,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -51237,8 +50950,7 @@
+@@ -51128,8 +50981,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8810,7 +9470,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -51407,8 +51119,7 @@
+@@ -51298,8 +51150,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8820,7 +9480,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -51525,8 +51236,7 @@
+@@ -51416,8 +51267,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8830,7 +9490,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -51601,8 +51311,7 @@
+@@ -51492,8 +51342,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8840,7 +9500,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -51862,8 +51571,7 @@
+@@ -51753,8 +51602,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8850,7 +9510,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -51985,8 +51693,7 @@
+@@ -51876,8 +51724,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8860,7 +9520,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -52072,8 +51779,7 @@
+@@ -51963,8 +51810,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8870,7 +9530,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -52141,8 +51847,7 @@
+@@ -52032,8 +51878,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8880,7 +9540,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -52197,8 +51902,7 @@
+@@ -52088,8 +51933,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8890,7 +9550,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -52822,8 +52526,7 @@
+@@ -52713,8 +52557,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8900,7 +9560,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -52902,8 +52605,7 @@
+@@ -52793,8 +52636,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8910,7 +9570,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -52966,8 +52668,7 @@
+@@ -52857,8 +52699,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8920,7 +9580,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -53164,8 +52865,7 @@
+@@ -53055,8 +52896,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8930,7 +9590,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -53267,8 +52967,7 @@
+@@ -53158,8 +52998,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8940,7 +9600,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -53437,8 +53136,7 @@
+@@ -53328,8 +53167,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8950,7 +9610,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -53524,8 +53222,7 @@
+@@ -53415,8 +53253,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8960,7 +9620,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -53611,8 +53308,7 @@
+@@ -53502,8 +53339,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8970,7 +9630,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -53710,8 +53406,7 @@
+@@ -53601,8 +53437,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8980,7 +9640,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -53867,8 +53562,7 @@
+@@ -53758,8 +53593,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8990,7 +9650,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -53948,8 +53642,7 @@
+@@ -53839,8 +53673,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9000,7 +9660,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -55514,6 +55207,13 @@
+@@ -55405,6 +55238,13 @@
  LTLIBOBJS=$ac_ltlibobjs
  
  
@@ -9014,7 +9674,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
-@@ -57091,6 +56791,9 @@
+@@ -56982,6 +56822,9 @@
  s, at AMTAR@,$AMTAR,;t t
  s, at am__tar@,$am__tar,;t t
  s, at am__untar@,$am__untar,;t t
@@ -9024,7 +9684,7 @@
  s, at KDECONFIG@,$KDECONFIG,;t t
  s, at kde_libs_prefix@,$kde_libs_prefix,;t t
  s, at kde_libs_htmldir@,$kde_libs_htmldir,;t t
-@@ -57659,11 +57362,6 @@
+@@ -57551,11 +57394,6 @@
    *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
    esac
  
@@ -9036,7 +9696,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.  */
-@@ -57702,6 +57400,12 @@
+@@ -57594,6 +57432,12 @@
  	 fi;;
        esac
      done` || { (exit 1); exit 1; }
@@ -9049,19 +9709,30 @@
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
    sed "$ac_vpsub
-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
+diff -Nru kdebase-3.4.2.orig/configure.files kdebase-3.4.2/configure.files
+--- kdebase-3.4.2.orig/configure.files	2005-07-20 21:00:50.000000000 +0000
++++ kdebase-3.4.2/configure.files	2005-07-26 18:56:00.109930544 +0000
+@@ -15,6 +15,7 @@
+ ./kcontrol/kfontinst/configure.in.in
+ ./kcontrol/nics/configure.in.in
+ ./kcontrol/randr/configure.in.in
++./kcontrol/screensaver/configure.in.in
+ ./kcontrol/smartcard/configure.in.in
+ ./kcontrol/usbview/configure.in.in
+ ./kcontrol/view1394/configure.in.in
+diff -Nru kdebase-3.4.2.orig/configure.in kdebase-3.4.2/configure.in
+--- kdebase-3.4.2.orig/configure.in	2005-07-20 21:00:55.000000000 +0000
++++ kdebase-3.4.2/configure.in	2005-07-26 18:56:04.002338808 +0000
 @@ -42,6 +42,8 @@
  dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdebase, "3.4.1") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdebase, "3.4.2") dnl searches for some needed programs
  
 +AM_MAINTAINER_MODE
 +
  KDE_SET_PREFIX
  
  dnl generate the config header
-@@ -563,9 +565,9 @@
+@@ -568,9 +570,9 @@
              ld_shared_flag=
              KDE_CHECK_COMPILER_FLAG(shared, [ld_shared_flag="-shared"])
              LDFLAGS="$LDFLAGS $ld_shared_flag $all_libraries -lz"
@@ -9073,63 +9744,45 @@
                  AC_DEFINE(HAVE_FONT_ENC, 1, [Defines if you have FontEnc])
              fi
              LDFLAGS="$ac_LDFLAGS_save"
-@@ -696,10 +698,10 @@
-         xss_save_cxxflags="$CXXFLAGS"
-         CXXFLAGS="$CXXFLAGS $lt_prog_compiler_pic_CXX"
-         KDE_CHECK_COMPILER_FLAG(shared, [ld_shared_flag="-shared"])
--        AC_CHECK_LIB(Xss,XScreenSaverQueryInfo,
-+        AC_CHECK_LIB(Xss_pic,XScreenSaverQueryInfo,
-             [
-             AC_DEFINE(HAVE_XSCREENSAVER, 1, [Define if you have the XScreenSaver extension])
--            LIB_XSS="-lXss"
-+            LIB_XSS="-lXss_pic"
-             ],
-             [],
-             [ $ld_shared_flag $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS ])
-@@ -724,10 +726,10 @@
+@@ -643,6 +645,18 @@
+ AM_CONDITIONAL(include_kcontrol_randr, test -n "$RANDR_SUBDIR")
  
- KDE_CHECK_HEADER(X11/extensions/xf86misc.h,
-     [
--    AC_CHECK_LIB(Xxf86misc,XF86MiscQueryVersion,
-+    AC_CHECK_LIB(Xxf86misc_pic,XF86MiscQueryVersion,
- 	[
-         AC_DEFINE(HAVE_XF86MISC, 1, [Define if you have the xf86misc extension])
--	LIB_XF86MISC="-lXxf86misc"
-+	LIB_XF86MISC="-lXxf86misc_pic"
-         ],
-         [], [ $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS ])
-     ],[],
-@@ -737,7 +739,7 @@
- AC_SUBST(LIB_XF86MISC)
+ dnl =======================================================
++dnl FILE: ./kcontrol/screensaver/configure.in.in
++dnl =======================================================
++
++AC_HAVE_GL(
++    [
++    AC_CHECK_LIB(GL,glXChooseVisual,
++        [
++        AC_DEFINE(HAVE_GLXCHOOSEVISUAL, 1, [Define if you have glXChooseVisual()])
++        ])
++    ],[]
++    )
++dnl =======================================================
+ dnl FILE: ./kcontrol/smartcard/configure.in.in
+ dnl =======================================================
  
- if test -n "$LIB_XF86MISC"; then
--    AC_CHECK_LIB(Xxf86misc,XF86MiscSetGrabKeysState,
-+    AC_CHECK_LIB(Xxf86misc_pic,XF86MiscSetGrabKeysState,
- 	[
-         AC_DEFINE(HAVE_XF86MISCSETGRABKEYSSTATE, 1, [Define if you have XF86MiscSetGrabKeysState()])
-         ],
-@@ -885,7 +887,7 @@
- AC_CHECK_FUNC(vsyslog, [
-   AC_DEFINE(USE_SYSLOG, 1, [Define if kdm should be built with syslog support])])
+@@ -750,6 +764,15 @@
+ fi
  
--AC_CHECK_LIB(Xau, main, [:], 
-+AC_CHECK_LIB(Xau_pic, main, [:], 
- 	[
- 	  AC_MSG_WARN([Cannot build KDM! Make sure that libXau.a is installed!])
- 	  DO_NOT_COMPILE="$DO_NOT_COMPILE kdm"
-@@ -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
--  AC_CHECK_LIB(Xdmcp, main, [LIBXDMCP="-lXdmcp"], , $X_LDFLAGS -lX11 $LIBSOCKET)
-+  AC_CHECK_LIB(Xdmcp_pic, main, [LIBXDMCP="-lXdmcp_pic"], , $X_LDFLAGS -lX11 $LIBSOCKET)
-   if test -n "$LIBXDMCP"; then
-     cppflags_safe=$CPPFLAGS
-     CPPFLAGS="$CPPFLAGS $X_INCLUDES"
-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 @@
+ LDFLAGS="$xss_save_ldflags"
++
++AC_HAVE_GL(
++    [
++    AC_CHECK_LIB(GL,glXChooseVisual,
++        [
++        AC_DEFINE(HAVE_GLXCHOOSEVISUAL, 1, [Define if you have glXChooseVisual()])
++        ])
++    ],[]
++    )
+ dnl =======================================================
+ dnl FILE: ./kdesu/configure.in.in
+ dnl =======================================================
+diff -Nru kdebase-3.4.2.orig/doc/faq/Makefile.in kdebase-3.4.2/doc/faq/Makefile.in
+--- kdebase-3.4.2.orig/doc/faq/Makefile.in	2005-07-20 21:08:03.000000000 +0000
++++ kdebase-3.4.2/doc/faq/Makefile.in	2005-07-26 19:06:28.346424080 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9139,7 +9792,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -9148,7 +9801,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9160,10 +9813,47 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -710,10 +713,10 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-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 configkde.docbook install.docbook Makefile.in contrib.docbook questions.docbook webbrowse.docbook notrelated.docbook panel.docbook filemng.docbook Makefile.am index.cache.bz2 
++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) notrelated.docbook contrib.docbook TODO nonkdeapps.docbook getkde.docbook install.docbook index.docbook desktop.docbook about.docbook moreinfo.docbook tips.docbook filemng.docbook configkde.docbook kdeapps.docbook sound.docbook intro.docbook misc.docbook questions.docbook webbrowse.docbook panel.docbook winmng.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
+@@ -740,20 +743,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/faq
+-	@for base in notrelated.docbook contrib.docbook TODO nonkdeapps.docbook getkde.docbook install.docbook index.docbook desktop.docbook about.docbook moreinfo.docbook tips.docbook filemng.docbook configkde.docbook kdeapps.docbook sound.docbook intro.docbook misc.docbook questions.docbook webbrowse.docbook panel.docbook winmng.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 notrelated.docbook contrib.docbook TODO nonkdeapps.docbook getkde.docbook install.docbook index.docbook desktop.docbook about.docbook moreinfo.docbook tips.docbook filemng.docbook configkde.docbook kdeapps.docbook sound.docbook intro.docbook misc.docbook questions.docbook webbrowse.docbook panel.docbook winmng.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 notrelated.docbook contrib.docbook TODO nonkdeapps.docbook getkde.docbook install.docbook index.docbook desktop.docbook about.docbook moreinfo.docbook tips.docbook filemng.docbook configkde.docbook kdeapps.docbook sound.docbook intro.docbook misc.docbook questions.docbook webbrowse.docbook panel.docbook winmng.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.2.orig/doc/glossary/Makefile.in kdebase-3.4.2/doc/glossary/Makefile.in
+--- kdebase-3.4.2.orig/doc/glossary/Makefile.in	2005-07-20 21:08:03.000000000 +0000
++++ kdebase-3.4.2/doc/glossary/Makefile.in	2005-07-26 19:06:28.365421192 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9173,7 +9863,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -9182,7 +9872,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9194,10 +9884,43 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -713,7 +716,7 @@
+ KDE_DIST=kdeprintingglossary.docbook index.docbook Makefile.in checkxrefs Makefile.am index.cache.bz2 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kdeprintingglossary.docbook checkxrefs index.docbook 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) checkxrefs index.docbook kdeprintingglossary.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)/khelpcenter/glossary
+-	@for base in kdeprintingglossary.docbook checkxrefs index.docbook ; do \
++	@for base in checkxrefs index.docbook kdeprintingglossary.docbook ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/glossary/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/glossary/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in kdeprintingglossary.docbook checkxrefs index.docbook ; do \
++	for base in checkxrefs index.docbook kdeprintingglossary.docbook ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/glossary/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in kdeprintingglossary.docbook checkxrefs index.docbook ; do \
++	for file in checkxrefs index.docbook kdeprintingglossary.docbook ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+diff -Nru kdebase-3.4.2.orig/doc/kappfinder/Makefile.in kdebase-3.4.2/doc/kappfinder/Makefile.in
+--- kdebase-3.4.2.orig/doc/kappfinder/Makefile.in	2005-07-20 21:08:03.000000000 +0000
++++ kdebase-3.4.2/doc/kappfinder/Makefile.in	2005-07-26 19:06:28.384418304 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9207,7 +9930,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -526,7 +529,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -9216,7 +9939,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -564,9 +567,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9228,10 +9951,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kate/Makefile.in kdebase-3.4.2/doc/kate/Makefile.in
+--- kdebase-3.4.2.orig/doc/kate/Makefile.in	2005-07-20 21:08:03.000000000 +0000
++++ kdebase-3.4.2/doc/kate/Makefile.in	2005-07-26 19:06:28.432411008 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9241,7 +9964,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -9250,7 +9973,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9262,10 +9985,43 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -713,7 +716,7 @@
+ 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) kate.png TODO highlighting.docbook advanced.docbook part.docbook index.docbook mdi.docbook configuring.docbook mimetypechooser.png plugins.docbook fundamentals.docbook highlighted.png regular-expressions.docbook unhighlighted.png menus.docbook configdialog01.png configdialog02.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
+@@ -740,20 +743,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kate
+-	@for base in kate.png TODO highlighting.docbook advanced.docbook part.docbook index.docbook mdi.docbook configuring.docbook mimetypechooser.png plugins.docbook fundamentals.docbook highlighted.png regular-expressions.docbook unhighlighted.png menus.docbook configdialog01.png configdialog02.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 kate.png TODO highlighting.docbook advanced.docbook part.docbook index.docbook mdi.docbook configuring.docbook mimetypechooser.png plugins.docbook fundamentals.docbook highlighted.png regular-expressions.docbook unhighlighted.png menus.docbook configdialog01.png configdialog02.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 kate.png TODO highlighting.docbook advanced.docbook part.docbook index.docbook mdi.docbook configuring.docbook mimetypechooser.png plugins.docbook fundamentals.docbook highlighted.png regular-expressions.docbook unhighlighted.png menus.docbook configdialog01.png configdialog02.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.2.orig/doc/kcontrol/arts/Makefile.in kdebase-3.4.2/doc/kcontrol/arts/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/arts/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/arts/Makefile.in	2005-07-26 19:06:28.480403712 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9275,7 +10031,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -9284,7 +10040,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9296,10 +10052,43 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -713,7 +716,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
+@@ -740,20 +743,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.2.orig/doc/kcontrol/background/Makefile.in kdebase-3.4.2/doc/kcontrol/background/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/background/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/background/Makefile.in	2005-07-26 19:06:28.502400368 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9309,7 +10098,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -9318,7 +10107,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9330,10 +10119,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kcontrol/bell/Makefile.in kdebase-3.4.2/doc/kcontrol/bell/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/bell/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/bell/Makefile.in	2005-07-26 19:06:28.520397632 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9343,7 +10132,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -9352,7 +10141,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9364,10 +10153,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kcontrol/cache/Makefile.in kdebase-3.4.2/doc/kcontrol/cache/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/cache/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/cache/Makefile.in	2005-07-26 19:06:28.539394744 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9377,7 +10166,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -9386,7 +10175,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9398,10 +10187,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kcontrol/clock/Makefile.in kdebase-3.4.2/doc/kcontrol/clock/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/clock/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/clock/Makefile.in	2005-07-26 19:06:28.557392008 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9411,7 +10200,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -9420,7 +10209,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9432,10 +10221,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kcontrol/colors/Makefile.in kdebase-3.4.2/doc/kcontrol/colors/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/colors/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/colors/Makefile.in	2005-07-26 19:06:28.574389424 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9445,7 +10234,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -9454,7 +10243,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9466,10 +10255,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kcontrol/cookies/Makefile.in kdebase-3.4.2/doc/kcontrol/cookies/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/cookies/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/cookies/Makefile.in	2005-07-26 19:06:28.592386688 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9479,7 +10268,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -9488,7 +10277,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9500,10 +10289,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kcontrol/crypto/Makefile.in kdebase-3.4.2/doc/kcontrol/crypto/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/crypto/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/crypto/Makefile.in	2005-07-26 19:06:28.610383952 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9513,7 +10302,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -9522,7 +10311,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9534,10 +10323,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kcontrol/desktop/Makefile.in kdebase-3.4.2/doc/kcontrol/desktop/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/desktop/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/desktop/Makefile.in	2005-07-26 19:06:28.627381368 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9547,7 +10336,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -9556,7 +10345,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9568,10 +10357,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kcontrol/desktopbehavior/Makefile.in kdebase-3.4.2/doc/kcontrol/desktopbehavior/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/desktopbehavior/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/desktopbehavior/Makefile.in	2005-07-26 19:06:28.645378632 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9581,7 +10370,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -9590,7 +10379,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9602,10 +10391,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kcontrol/ebrowsing/Makefile.in kdebase-3.4.2/doc/kcontrol/ebrowsing/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/ebrowsing/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/ebrowsing/Makefile.in	2005-07-26 19:06:28.664375744 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9615,7 +10404,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -9624,7 +10413,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9636,10 +10425,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kcontrol/email/Makefile.in kdebase-3.4.2/doc/kcontrol/email/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/email/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/email/Makefile.in	2005-07-26 19:06:28.682373008 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9649,7 +10438,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -9658,7 +10447,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9670,10 +10459,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kcontrol/energy/Makefile.in kdebase-3.4.2/doc/kcontrol/energy/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/energy/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/energy/Makefile.in	2005-07-26 19:06:28.700370272 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9683,7 +10472,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -9692,7 +10481,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9704,10 +10493,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kcontrol/filemanager/Makefile.in kdebase-3.4.2/doc/kcontrol/filemanager/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/filemanager/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/filemanager/Makefile.in	2005-07-26 19:06:28.719367384 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9717,7 +10506,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -9726,7 +10515,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9738,10 +10527,43 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -713,7 +716,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
+@@ -740,20 +743,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.2.orig/doc/kcontrol/filetypes/Makefile.in kdebase-3.4.2/doc/kcontrol/filetypes/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/filetypes/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/filetypes/Makefile.in	2005-07-26 19:06:28.736364800 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9751,7 +10573,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -9760,7 +10582,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9772,10 +10594,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kcontrol/fonts/Makefile.in kdebase-3.4.2/doc/kcontrol/fonts/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/fonts/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/fonts/Makefile.in	2005-07-26 19:06:28.754362064 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9785,7 +10607,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -9794,7 +10616,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9806,10 +10628,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kcontrol/helpindex/Makefile.in kdebase-3.4.2/doc/kcontrol/helpindex/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/helpindex/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/helpindex/Makefile.in	2005-07-26 19:06:28.772359328 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9819,7 +10641,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -9828,7 +10650,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9840,10 +10662,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kcontrol/icons/Makefile.in kdebase-3.4.2/doc/kcontrol/icons/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/icons/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/icons/Makefile.in	2005-07-26 19:06:28.790356592 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9853,7 +10675,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -9862,7 +10684,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9874,10 +10696,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kcontrol/kcmaccess/Makefile.in kdebase-3.4.2/doc/kcontrol/kcmaccess/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/kcmaccess/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/kcmaccess/Makefile.in	2005-07-26 19:06:28.808353856 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9887,7 +10709,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -9896,7 +10718,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9908,10 +10730,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kcontrol/kcmcss/Makefile.in kdebase-3.4.2/doc/kcontrol/kcmcss/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/kcmcss/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/kcmcss/Makefile.in	2005-07-26 19:06:28.828350816 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9921,7 +10743,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -9930,7 +10752,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9942,10 +10764,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kcontrol/kcmfontinst/Makefile.in kdebase-3.4.2/doc/kcontrol/kcmfontinst/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/kcmfontinst/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/kcmfontinst/Makefile.in	2005-07-26 19:06:28.846348080 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9955,7 +10777,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -9964,7 +10786,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9976,10 +10798,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kcontrol/kcmkonsole/Makefile.in kdebase-3.4.2/doc/kcontrol/kcmkonsole/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/kcmkonsole/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/kcmkonsole/Makefile.in	2005-07-26 19:06:28.865345192 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9989,7 +10811,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -9998,7 +10820,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10010,10 +10832,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kcontrol/kcmlaunch/Makefile.in kdebase-3.4.2/doc/kcontrol/kcmlaunch/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/kcmlaunch/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/kcmlaunch/Makefile.in	2005-07-26 19:06:28.899340024 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10023,7 +10845,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -10032,7 +10854,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10044,10 +10866,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kcontrol/kcmnotify/Makefile.in kdebase-3.4.2/doc/kcontrol/kcmnotify/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/kcmnotify/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/kcmnotify/Makefile.in	2005-07-26 19:06:28.917337288 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10057,7 +10879,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -10066,7 +10888,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10078,10 +10900,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kcontrol/kcmsmserver/Makefile.in kdebase-3.4.2/doc/kcontrol/kcmsmserver/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/kcmsmserver/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/kcmsmserver/Makefile.in	2005-07-26 19:06:28.936334400 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10091,7 +10913,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -10100,7 +10922,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10112,10 +10934,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kcontrol/kcmstyle/Makefile.in kdebase-3.4.2/doc/kcontrol/kcmstyle/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/kcmstyle/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/kcmstyle/Makefile.in	2005-07-26 19:06:28.954331664 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10125,7 +10947,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -10134,7 +10956,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10146,10 +10968,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kcontrol/kcmtaskbar/Makefile.in kdebase-3.4.2/doc/kcontrol/kcmtaskbar/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/kcmtaskbar/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/kcmtaskbar/Makefile.in	2005-07-26 19:06:28.972328928 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10159,7 +10981,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -10168,7 +10990,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10180,10 +11002,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kcontrol/kdm/Makefile.in kdebase-3.4.2/doc/kcontrol/kdm/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/kdm/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/kdm/Makefile.in	2005-07-26 19:06:28.989326344 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10193,7 +11015,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -10202,7 +11024,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10214,10 +11036,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kcontrol/keyboard/Makefile.in kdebase-3.4.2/doc/kcontrol/keyboard/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/keyboard/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/keyboard/Makefile.in	2005-07-26 19:06:29.007323608 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10227,7 +11049,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -10236,7 +11058,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10248,10 +11070,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kcontrol/keys/Makefile.in kdebase-3.4.2/doc/kcontrol/keys/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/keys/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/keys/Makefile.in	2005-07-26 19:06:29.025320872 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10261,7 +11083,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -10270,7 +11092,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10282,10 +11104,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kcontrol/khtml/Makefile.in kdebase-3.4.2/doc/kcontrol/khtml/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/khtml/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/khtml/Makefile.in	2005-07-26 19:06:29.043318136 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10295,7 +11117,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -10304,7 +11126,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10316,10 +11138,43 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -713,7 +716,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
+@@ -740,20 +743,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.2.orig/doc/kcontrol/kwindecoration/Makefile.in kdebase-3.4.2/doc/kcontrol/kwindecoration/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/kwindecoration/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/kwindecoration/Makefile.in	2005-07-26 19:06:29.061315400 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10329,7 +11184,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -10338,7 +11193,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10350,10 +11205,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kcontrol/language/Makefile.in kdebase-3.4.2/doc/kcontrol/language/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/language/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/language/Makefile.in	2005-07-26 19:06:29.079312664 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10363,7 +11218,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -10372,7 +11227,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10384,10 +11239,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kcontrol/Makefile.in kdebase-3.4.2/doc/kcontrol/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/Makefile.in	2005-07-26 19:06:28.461406600 +0000
+@@ -252,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10397,7 +11252,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -543,7 +546,7 @@
+@@ -536,7 +539,7 @@
+ xdg_menudir = @xdg_menudir@
+ #>- SUBDIRS = $(AUTODIRS)
+ #>+ 1
+-SUBDIRS =. background khtml helpindex proxy kcmtaskbar language passwords email fonts desktopbehavior cookies useragent kcmfontinst ebrowsing panel cache filetypes windowmanagement kcmlaunch arts desktop filemanager bell panelappearance crypto kwindecoration screensaver smb kcmcss mouse energy kcmstyle clock kcmaccess keyboard kcmsmserver colors kcmnotify netpref kcmkonsole keys kdm icons spellchecking
++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
+@@ -544,7 +547,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -10406,7 +11270,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -581,9 +584,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10418,10 +11282,43 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -880,7 +883,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
+@@ -907,20 +910,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.2.orig/doc/kcontrol/mouse/Makefile.in kdebase-3.4.2/doc/kcontrol/mouse/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/mouse/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/mouse/Makefile.in	2005-07-26 19:06:29.097309928 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10431,7 +11328,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -10440,7 +11337,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10452,10 +11349,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kcontrol/netpref/Makefile.in kdebase-3.4.2/doc/kcontrol/netpref/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/netpref/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/netpref/Makefile.in	2005-07-26 19:06:29.115307192 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10465,7 +11362,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -10474,7 +11371,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10486,10 +11383,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kcontrol/panel/Makefile.in kdebase-3.4.2/doc/kcontrol/panel/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/panel/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/panel/Makefile.in	2005-07-26 19:06:29.133304456 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10499,7 +11396,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -10508,7 +11405,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10520,10 +11417,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kcontrol/panelappearance/Makefile.in kdebase-3.4.2/doc/kcontrol/panelappearance/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/panelappearance/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/panelappearance/Makefile.in	2005-07-26 19:06:29.151301720 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10533,7 +11430,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -10542,7 +11439,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10554,10 +11451,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kcontrol/passwords/Makefile.in kdebase-3.4.2/doc/kcontrol/passwords/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/passwords/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/passwords/Makefile.in	2005-07-26 19:06:29.169298984 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10567,7 +11464,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -10576,7 +11473,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10588,10 +11485,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kcontrol/proxy/Makefile.in kdebase-3.4.2/doc/kcontrol/proxy/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/proxy/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/proxy/Makefile.in	2005-07-26 19:06:29.187296248 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10601,7 +11498,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -10610,7 +11507,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10622,10 +11519,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kcontrol/screensaver/Makefile.in kdebase-3.4.2/doc/kcontrol/screensaver/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/screensaver/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/screensaver/Makefile.in	2005-07-26 19:06:29.204293664 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10635,7 +11532,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -10644,7 +11541,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10656,10 +11553,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kcontrol/smb/Makefile.in kdebase-3.4.2/doc/kcontrol/smb/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/smb/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/smb/Makefile.in	2005-07-26 19:06:29.222290928 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10669,7 +11566,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -10678,7 +11575,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10690,10 +11587,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kcontrol/spellchecking/Makefile.in kdebase-3.4.2/doc/kcontrol/spellchecking/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/spellchecking/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/spellchecking/Makefile.in	2005-07-26 19:06:29.240288192 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10703,7 +11600,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -10712,7 +11609,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10724,10 +11621,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kcontrol/useragent/Makefile.in kdebase-3.4.2/doc/kcontrol/useragent/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/useragent/Makefile.in	2005-07-20 21:08:04.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/useragent/Makefile.in	2005-07-26 19:06:29.258285456 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10737,7 +11634,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -10746,7 +11643,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10758,10 +11655,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kcontrol/windowmanagement/Makefile.in kdebase-3.4.2/doc/kcontrol/windowmanagement/Makefile.in
+--- kdebase-3.4.2.orig/doc/kcontrol/windowmanagement/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/doc/kcontrol/windowmanagement/Makefile.in	2005-07-26 19:06:29.276282720 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10771,7 +11668,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -10780,7 +11677,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10792,10 +11689,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kdcop/Makefile.in kdebase-3.4.2/doc/kdcop/Makefile.in
+--- kdebase-3.4.2.orig/doc/kdcop/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/doc/kdcop/Makefile.in	2005-07-26 19:06:29.294279984 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10805,7 +11702,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -10814,7 +11711,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10826,10 +11723,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kdebugdialog/Makefile.in kdebase-3.4.2/doc/kdebugdialog/Makefile.in
+--- kdebase-3.4.2.orig/doc/kdebugdialog/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/doc/kdebugdialog/Makefile.in	2005-07-26 19:06:29.314276944 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10839,7 +11736,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -10848,7 +11745,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10860,10 +11757,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kdeprint/Makefile.in kdebase-3.4.2/doc/kdeprint/Makefile.in
+--- kdebase-3.4.2.orig/doc/kdeprint/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/doc/kdeprint/Makefile.in	2005-07-26 19:06:29.340272992 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10873,7 +11770,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -10882,7 +11779,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10894,10 +11791,47 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -710,10 +713,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 cupsaddprinterwizard3_networkscan_results.png cupsserverconfiguration_resourceadminaccessmasks.png cupsaddprinterwizard3_networkscan.png ps-boxes.png cupsserverconfiguration4_directories.png final-word.docbook cupsserverconfiguration10_browsinggeneral.png external-command.docbook getting-started.docbook kcontrolcenter-printmanager-jobcontrol-2.png kdeprint-jobviewer.png cupsserverconfiguration14_browsingrelay.png Makefile.in cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration7_miscellanious.png cupsserverconfiguration5_HTTP.png cupsaddprinterwizard1.png cups-config.docbook add-printer-wiz.docbook cupsserverconfiguration9_networkclients.png cupsserverconfig_browse_relay_add_button.png cupsserverconfiguration_resourceadminauthorization.png kprinter_with_kcron_developer_special.png cupsserverconfiguration8_networkgeneral.png rlpr.docbook cupsserverconfiguration1_welcome.png cupsserverconfiguration15c_resourceallprinters_defineaccess.png lpd.docbook cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfiguration3_logging.png cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration6_encryption.png kprinter-kivio.png kcron_to_be_printed.png theory.docbook Makefile.am extensions.docbook 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) kprinter-kivio.png lpr-bsd.docbook ps-boxes.png index.docbook getting-started.docbook theory.docbook lpd.docbook cupsserverconfiguration10_browsinggeneral.png kcron_to_be_printed.png kdeprint-jobviewer.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration7_miscellanious.png cupsserverconfig_browse_relay_add_button.png cupsserverconfiguration11_browsingconnections.png rlpr.docbook steinbruch_scaled.png kcontrol-icon.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsserverconfiguration9_networkclients.png kprinter-as-netscape-printcommand.png cupsserverconfiguration3_logging.png cr32-action-wizard.png tech-overview.docbook lprng.docbook kprinter.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png external-command.docbook extensions.docbook cupsserverconfiguration15c_resourceallprinters_defineaccess.png cupsserverconfiguration8_networkgeneral.png cupsserverconfiguration6_encryption.png cupsserverconfiguration_resourceadminaccessmasks.png final-word.docbook cupsserverconfiguration12_browsingtimeouts.png cupsaddprinterwizard4_networkscan_config.png cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration14_browsingrelay.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration_securityoverview.png kprinter_called_from_run_command.png cupsserverconfiguration2_general.png cupsserverconfiguration4_directories.png cups-config.docbook cupsaddprinterwizard3_networkscan.png add-printer-wiz.docbook cupsserverconfiguration5_HTTP.png cupsoptions.docbook cupsserverconfiguration1_welcome.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png highlights.docbook cupsaddprinterwizard1.png cupsaddprinterwizard3_networkscan_results.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfiguration_resourceadminauthorization.png kprinter_with_kcron_developer_special.png 
++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
+@@ -740,20 +743,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdeprint
+-	@for base in kprinter-kivio.png lpr-bsd.docbook ps-boxes.png index.docbook getting-started.docbook theory.docbook lpd.docbook cupsserverconfiguration10_browsinggeneral.png kcron_to_be_printed.png kdeprint-jobviewer.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration7_miscellanious.png cupsserverconfig_browse_relay_add_button.png cupsserverconfiguration11_browsingconnections.png rlpr.docbook steinbruch_scaled.png kcontrol-icon.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsserverconfiguration9_networkclients.png kprinter-as-netscape-printcommand.png cupsserverconfiguration3_logging.png cr32-action-wizard.png tech-overview.docbook lprng.docbook kprinter.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png external-command.docbook extensions.docbook cupsserverconfiguration15c_resourceallprinters_defineaccess.png cupsserverconfiguration8_networkgeneral.png cupsserverconfiguration6_encryption.png cupsserverconfiguration_resourceadminaccessmasks.png final-word.docbook cupsserverconfiguration12_browsingtimeouts.png cupsaddprinterwizard4_networkscan_config.png cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration14_browsingrelay.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration_securityoverview.png kprinter_called_from_run_command.png cupsserverconfiguration2_general.png cupsserverconfiguration4_directories.png cups-config.docbook cupsaddprinterwizard3_networkscan.png add-printer-wiz.docbook cupsserverconfiguration5_HTTP.png cupsoptions.docbook cupsserverconfiguration1_welcome.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png highlights.docbook cupsaddprinterwizard1.png cupsaddprinterwizard3_networkscan_results.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfiguration_resourceadminauthorization.png kprinter_with_kcron_developer_special.png ; 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 kprinter-kivio.png lpr-bsd.docbook ps-boxes.png index.docbook getting-started.docbook theory.docbook lpd.docbook cupsserverconfiguration10_browsinggeneral.png kcron_to_be_printed.png kdeprint-jobviewer.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration7_miscellanious.png cupsserverconfig_browse_relay_add_button.png cupsserverconfiguration11_browsingconnections.png rlpr.docbook steinbruch_scaled.png kcontrol-icon.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsserverconfiguration9_networkclients.png kprinter-as-netscape-printcommand.png cupsserverconfiguration3_logging.png cr32-action-wizard.png tech-overview.docbook lprng.docbook kprinter.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png external-command.docbook extensions.docbook cupsserverconfiguration15c_resourceallprinters_defineaccess.png cupsserverconfiguration8_networkgeneral.png cupsserverconfiguration6_encryption.png cupsserverconfiguration_resourceadminaccessmasks.png final-word.docbook cupsserverconfiguration12_browsingtimeouts.png cupsaddprinterwizard4_networkscan_config.png cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration14_browsingrelay.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration_securityoverview.png kprinter_called_from_run_command.png cupsserverconfiguration2_general.png cupsserverconfiguration4_directories.png cups-config.docbook cupsaddprinterwizard3_networkscan.png add-printer-wiz.docbook cupsserverconfiguration5_HTTP.png cupsoptions.docbook cupsserverconfiguration1_welcome.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png highlights.docbook cupsaddprinterwizard1.png cupsaddprinterwizard3_networkscan_results.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfiguration_resourceadminauthorization.png kprinter_with_kcron_developer_special.png ; 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 kprinter-kivio.png lpr-bsd.docbook ps-boxes.png index.docbook getting-started.docbook theory.docbook lpd.docbook cupsserverconfiguration10_browsinggeneral.png kcron_to_be_printed.png kdeprint-jobviewer.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration7_miscellanious.png cupsserverconfig_browse_relay_add_button.png cupsserverconfiguration11_browsingconnections.png rlpr.docbook steinbruch_scaled.png kcontrol-icon.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsserverconfiguration9_networkclients.png kprinter-as-netscape-printcommand.png cupsserverconfiguration3_logging.png cr32-action-wizard.png tech-overview.docbook lprng.docbook kprinter.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png external-command.docbook extensions.docbook cupsserverconfiguration15c_resourceallprinters_defineaccess.png cupsserverconfiguration8_networkgeneral.png cupsserverconfiguration6_encryption.png cupsserverconfiguration_resourceadminaccessmasks.png final-word.docbook cupsserverconfiguration12_browsingtimeouts.png cupsaddprinterwizard4_networkscan_config.png cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration14_browsingrelay.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration_securityoverview.png kprinter_called_from_run_command.png cupsserverconfiguration2_general.png cupsserverconfiguration4_directories.png cups-config.docbook cupsaddprinterwizard3_networkscan.png add-printer-wiz.docbook cupsserverconfiguration5_HTTP.png cupsoptions.docbook cupsserverconfiguration1_welcome.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png highlights.docbook cupsaddprinterwizard1.png cupsaddprinterwizard3_networkscan_results.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfiguration_resourceadminauthorization.png kprinter_with_kcron_developer_special.png ; 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.2.orig/doc/kdesu/Makefile.in kdebase-3.4.2/doc/kdesu/Makefile.in
+--- kdebase-3.4.2.orig/doc/kdesu/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/doc/kdesu/Makefile.in	2005-07-26 19:06:29.358270256 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10907,7 +11841,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -10916,7 +11850,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10928,10 +11862,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kdm/Makefile.in kdebase-3.4.2/doc/kdm/Makefile.in
+--- kdebase-3.4.2.orig/doc/kdm/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/doc/kdm/Makefile.in	2005-07-26 19:06:29.376267520 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10941,7 +11875,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -526,7 +529,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -10950,7 +11884,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -564,9 +567,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10962,10 +11896,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kfind/Makefile.in kdebase-3.4.2/doc/kfind/Makefile.in
+--- kdebase-3.4.2.orig/doc/kfind/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/doc/kfind/Makefile.in	2005-07-26 19:06:29.395264632 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10975,7 +11909,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -10984,7 +11918,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10996,10 +11930,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/khelpcenter/Makefile.in kdebase-3.4.2/doc/khelpcenter/Makefile.in
+--- kdebase-3.4.2.orig/doc/khelpcenter/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/doc/khelpcenter/Makefile.in	2005-07-26 19:06:29.455255512 +0000
+@@ -252,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11009,7 +11943,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -543,7 +546,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -11018,7 +11952,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -581,9 +584,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11030,10 +11964,43 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -880,7 +883,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) index.docbook lines2.png bgtable.png pointers.png whatiskde.docbook khelpcenter.png shadow1.png kdelogo2.png support.docbook lines.png konq.css background.png help.docbook welcome.docbook contact.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
+@@ -907,20 +910,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter
+-	@for base in index.docbook lines2.png bgtable.png pointers.png whatiskde.docbook khelpcenter.png shadow1.png kdelogo2.png support.docbook lines.png konq.css background.png help.docbook welcome.docbook contact.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 index.docbook lines2.png bgtable.png pointers.png whatiskde.docbook khelpcenter.png shadow1.png kdelogo2.png support.docbook lines.png konq.css background.png help.docbook welcome.docbook contact.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 index.docbook lines2.png bgtable.png pointers.png whatiskde.docbook khelpcenter.png shadow1.png kdelogo2.png support.docbook lines.png konq.css background.png help.docbook welcome.docbook contact.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.2.orig/doc/kicker/Makefile.in kdebase-3.4.2/doc/kicker/Makefile.in
+--- kdebase-3.4.2.orig/doc/kicker/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/doc/kicker/Makefile.in	2005-07-26 19:06:29.475252472 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11043,7 +12010,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -11052,7 +12019,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11064,10 +12031,47 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -710,10 +713,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) quickbrowser_icon.png bookmarks_icon.png recent_docs_icon.png desktop_icon.png index.docbook printsys_icon.png taskbar_group.png k_menu_icon.png terminals_icon.png screenshot_left.png screenshot_right.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
+@@ -740,20 +743,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kicker
+-	@for base in quickbrowser_icon.png bookmarks_icon.png recent_docs_icon.png desktop_icon.png index.docbook printsys_icon.png taskbar_group.png k_menu_icon.png terminals_icon.png screenshot_left.png screenshot_right.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 quickbrowser_icon.png bookmarks_icon.png recent_docs_icon.png desktop_icon.png index.docbook printsys_icon.png taskbar_group.png k_menu_icon.png terminals_icon.png screenshot_left.png screenshot_right.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 quickbrowser_icon.png bookmarks_icon.png recent_docs_icon.png desktop_icon.png index.docbook printsys_icon.png taskbar_group.png k_menu_icon.png terminals_icon.png screenshot_left.png screenshot_right.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.2.orig/doc/kinfocenter/devices/Makefile.in kdebase-3.4.2/doc/kinfocenter/devices/Makefile.in
+--- kdebase-3.4.2.orig/doc/kinfocenter/devices/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/doc/kinfocenter/devices/Makefile.in	2005-07-26 19:06:29.516246240 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11077,7 +12081,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -11086,7 +12090,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11098,10 +12102,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kinfocenter/dma/Makefile.in kdebase-3.4.2/doc/kinfocenter/dma/Makefile.in
+--- kdebase-3.4.2.orig/doc/kinfocenter/dma/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/doc/kinfocenter/dma/Makefile.in	2005-07-26 19:06:29.534243504 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11111,7 +12115,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -11120,7 +12124,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11132,10 +12136,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kinfocenter/interrupts/Makefile.in kdebase-3.4.2/doc/kinfocenter/interrupts/Makefile.in
+--- kdebase-3.4.2.orig/doc/kinfocenter/interrupts/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/doc/kinfocenter/interrupts/Makefile.in	2005-07-26 19:06:29.552240768 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11145,7 +12149,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -11154,7 +12158,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11166,10 +12170,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kinfocenter/ioports/Makefile.in kdebase-3.4.2/doc/kinfocenter/ioports/Makefile.in
+--- kdebase-3.4.2.orig/doc/kinfocenter/ioports/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/doc/kinfocenter/ioports/Makefile.in	2005-07-26 19:06:29.570238032 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11179,7 +12183,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -11188,7 +12192,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11200,10 +12204,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kinfocenter/Makefile.in kdebase-3.4.2/doc/kinfocenter/Makefile.in
+--- kdebase-3.4.2.orig/doc/kinfocenter/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/doc/kinfocenter/Makefile.in	2005-07-26 19:06:29.498248976 +0000
+@@ -252,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11213,7 +12217,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -543,7 +546,7 @@
+@@ -536,7 +539,7 @@
+ xdg_menudir = @xdg_menudir@
+ #>- SUBDIRS = $(AUTODIRS)
+ #>+ 1
+-SUBDIRS =. processor interrupts devices samba protocols opengl sound usb pcmcia partitions nics xserver ioports scsi dma memory pci
++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
+@@ -544,7 +547,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -11222,7 +12235,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -581,9 +584,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11234,10 +12247,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kinfocenter/memory/Makefile.in kdebase-3.4.2/doc/kinfocenter/memory/Makefile.in
+--- kdebase-3.4.2.orig/doc/kinfocenter/memory/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/doc/kinfocenter/memory/Makefile.in	2005-07-26 19:06:29.588235296 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11247,7 +12260,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -11256,7 +12269,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11268,10 +12281,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kinfocenter/nics/Makefile.in kdebase-3.4.2/doc/kinfocenter/nics/Makefile.in
+--- kdebase-3.4.2.orig/doc/kinfocenter/nics/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/doc/kinfocenter/nics/Makefile.in	2005-07-26 19:06:29.607232408 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11281,7 +12294,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -11290,7 +12303,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11302,10 +12315,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kinfocenter/opengl/Makefile.in kdebase-3.4.2/doc/kinfocenter/opengl/Makefile.in
+--- kdebase-3.4.2.orig/doc/kinfocenter/opengl/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/doc/kinfocenter/opengl/Makefile.in	2005-07-26 19:06:29.625229672 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11315,7 +12328,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -11324,7 +12337,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11336,10 +12349,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kinfocenter/partitions/Makefile.in kdebase-3.4.2/doc/kinfocenter/partitions/Makefile.in
+--- kdebase-3.4.2.orig/doc/kinfocenter/partitions/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/doc/kinfocenter/partitions/Makefile.in	2005-07-26 19:06:29.643226936 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11349,7 +12362,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -11358,7 +12371,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11370,10 +12383,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kinfocenter/pci/Makefile.in kdebase-3.4.2/doc/kinfocenter/pci/Makefile.in
+--- kdebase-3.4.2.orig/doc/kinfocenter/pci/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/doc/kinfocenter/pci/Makefile.in	2005-07-26 19:06:29.661224200 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11383,7 +12396,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -11392,7 +12405,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11404,10 +12417,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kinfocenter/pcmcia/Makefile.in kdebase-3.4.2/doc/kinfocenter/pcmcia/Makefile.in
+--- kdebase-3.4.2.orig/doc/kinfocenter/pcmcia/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/doc/kinfocenter/pcmcia/Makefile.in	2005-07-26 19:06:29.679221464 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11417,7 +12430,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -11426,7 +12439,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11438,10 +12451,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kinfocenter/processor/Makefile.in kdebase-3.4.2/doc/kinfocenter/processor/Makefile.in
+--- kdebase-3.4.2.orig/doc/kinfocenter/processor/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/doc/kinfocenter/processor/Makefile.in	2005-07-26 19:06:29.696218880 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11451,7 +12464,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -11460,7 +12473,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11472,10 +12485,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kinfocenter/protocols/Makefile.in kdebase-3.4.2/doc/kinfocenter/protocols/Makefile.in
+--- kdebase-3.4.2.orig/doc/kinfocenter/protocols/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/doc/kinfocenter/protocols/Makefile.in	2005-07-26 19:06:29.714216144 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11485,7 +12498,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -11494,7 +12507,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11506,10 +12519,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kinfocenter/samba/Makefile.in kdebase-3.4.2/doc/kinfocenter/samba/Makefile.in
+--- kdebase-3.4.2.orig/doc/kinfocenter/samba/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/doc/kinfocenter/samba/Makefile.in	2005-07-26 19:06:29.732213408 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11519,7 +12532,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -11528,7 +12541,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11540,10 +12553,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kinfocenter/scsi/Makefile.in kdebase-3.4.2/doc/kinfocenter/scsi/Makefile.in
+--- kdebase-3.4.2.orig/doc/kinfocenter/scsi/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/doc/kinfocenter/scsi/Makefile.in	2005-07-26 19:06:29.750210672 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11553,7 +12566,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -11562,7 +12575,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11574,10 +12587,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kinfocenter/sound/Makefile.in kdebase-3.4.2/doc/kinfocenter/sound/Makefile.in
+--- kdebase-3.4.2.orig/doc/kinfocenter/sound/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/doc/kinfocenter/sound/Makefile.in	2005-07-26 19:06:29.767208088 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11587,7 +12600,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -11596,7 +12609,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11608,10 +12621,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kinfocenter/usb/Makefile.in kdebase-3.4.2/doc/kinfocenter/usb/Makefile.in
+--- kdebase-3.4.2.orig/doc/kinfocenter/usb/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/doc/kinfocenter/usb/Makefile.in	2005-07-26 19:06:29.785205352 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11621,7 +12634,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -11630,7 +12643,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11642,10 +12655,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kinfocenter/xserver/Makefile.in kdebase-3.4.2/doc/kinfocenter/xserver/Makefile.in
+--- kdebase-3.4.2.orig/doc/kinfocenter/xserver/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/doc/kinfocenter/xserver/Makefile.in	2005-07-26 19:06:29.803202616 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11655,7 +12668,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -11664,7 +12677,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11676,10 +12689,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kioslave/Makefile.in kdebase-3.4.2/doc/kioslave/Makefile.in
+--- kdebase-3.4.2.orig/doc/kioslave/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/doc/kioslave/Makefile.in	2005-07-26 19:06:29.826199120 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11689,7 +12702,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -11698,7 +12711,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11710,10 +12723,47 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -710,10 +713,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 sftp.docbook thumbnail.docbook pop3.docbook index.docbook floppy.docbook print.docbook telnet.docbook http.docbook nfs.docbook gopher.docbook nntp.docbook mac.docbook news.docbook https.docbook Makefile.in man.docbook rlogin.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 
++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) thumbnail.docbook https.docbook pop3s.docbook mrml.docbook index.docbook webdav.docbook imaps.docbook floppy.docbook gzip.docbook nntp.docbook http.docbook ldap.docbook pop3.docbook gopher.docbook mailto.docbook nfs.docbook fish.docbook ftp.docbook rlogin.docbook info.docbook webdavs.docbook rlan.docbook mac.docbook cgi.docbook bzip.docbook data.docbook lan.docbook finger.docbook man.docbook news.docbook sftp.docbook file.docbook smb.docbook smtp.docbook bzip2.docbook imap.docbook tar.docbook help.docbook telnet.docbook print.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
+@@ -740,20 +743,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kioslave
+-	@for base in thumbnail.docbook https.docbook pop3s.docbook mrml.docbook index.docbook webdav.docbook imaps.docbook floppy.docbook gzip.docbook nntp.docbook http.docbook ldap.docbook pop3.docbook gopher.docbook mailto.docbook nfs.docbook fish.docbook ftp.docbook rlogin.docbook info.docbook webdavs.docbook rlan.docbook mac.docbook cgi.docbook bzip.docbook data.docbook lan.docbook finger.docbook man.docbook news.docbook sftp.docbook file.docbook smb.docbook smtp.docbook bzip2.docbook imap.docbook tar.docbook help.docbook telnet.docbook print.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 thumbnail.docbook https.docbook pop3s.docbook mrml.docbook index.docbook webdav.docbook imaps.docbook floppy.docbook gzip.docbook nntp.docbook http.docbook ldap.docbook pop3.docbook gopher.docbook mailto.docbook nfs.docbook fish.docbook ftp.docbook rlogin.docbook info.docbook webdavs.docbook rlan.docbook mac.docbook cgi.docbook bzip.docbook data.docbook lan.docbook finger.docbook man.docbook news.docbook sftp.docbook file.docbook smb.docbook smtp.docbook bzip2.docbook imap.docbook tar.docbook help.docbook telnet.docbook print.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 thumbnail.docbook https.docbook pop3s.docbook mrml.docbook index.docbook webdav.docbook imaps.docbook floppy.docbook gzip.docbook nntp.docbook http.docbook ldap.docbook pop3.docbook gopher.docbook mailto.docbook nfs.docbook fish.docbook ftp.docbook rlogin.docbook info.docbook webdavs.docbook rlan.docbook mac.docbook cgi.docbook bzip.docbook data.docbook lan.docbook finger.docbook man.docbook news.docbook sftp.docbook file.docbook smb.docbook smtp.docbook bzip2.docbook imap.docbook tar.docbook help.docbook telnet.docbook print.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.2.orig/doc/klipper/Makefile.in kdebase-3.4.2/doc/klipper/Makefile.in
+--- kdebase-3.4.2.orig/doc/klipper/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/doc/klipper/Makefile.in	2005-07-26 19:06:29.844196384 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11723,7 +12773,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -11732,7 +12782,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11744,10 +12794,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kmenuedit/Makefile.in kdebase-3.4.2/doc/kmenuedit/Makefile.in
+--- kdebase-3.4.2.orig/doc/kmenuedit/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/doc/kmenuedit/Makefile.in	2005-07-26 19:06:29.864193344 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11757,7 +12807,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -11766,7 +12816,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11778,10 +12828,43 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -713,7 +716,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_new_submenu.png i_k_button.png i_new_item.png index.docbook i_copy.png i_cut.png icon_sets.png i_paste.png i_delete.png 
++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
+@@ -740,20 +743,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmenuedit
+-	@for base in i_new_submenu.png i_k_button.png i_new_item.png index.docbook i_copy.png i_cut.png icon_sets.png i_paste.png i_delete.png ; 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_new_submenu.png i_k_button.png i_new_item.png index.docbook i_copy.png i_cut.png icon_sets.png i_paste.png i_delete.png ; 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_new_submenu.png i_k_button.png i_new_item.png index.docbook i_copy.png i_cut.png icon_sets.png i_paste.png i_delete.png ; 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.2.orig/doc/knetattach/Makefile.in kdebase-3.4.2/doc/knetattach/Makefile.in
+--- kdebase-3.4.2.orig/doc/knetattach/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/doc/knetattach/Makefile.in	2005-07-26 19:06:29.898188176 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11791,7 +12874,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -11800,7 +12883,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11812,10 +12895,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/konqueror/Makefile.in kdebase-3.4.2/doc/konqueror/Makefile.in
+--- kdebase-3.4.2.orig/doc/konqueror/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/doc/konqueror/Makefile.in	2005-07-26 19:06:29.919184984 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11825,7 +12908,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -526,7 +529,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -11834,7 +12917,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -564,9 +567,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11846,10 +12929,47 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -711,10 +714,10 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-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 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) filemanager.docbook shortcut1.png commands.docbook shortcut2.png dirtree.png basics.docbook path-complete.docbook config.docbook dragdrop.png index.docbook faq.docbook sidebar.docbook save-settings.docbook introduction.docbook plugins.docbook browser.docbook konqorg.png bookmarks.docbook credits.docbook man-kbookmarkmerger.1.docbook cmndline.png parts.png 
++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
+@@ -741,20 +744,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konqueror
+-	@for base in filemanager.docbook shortcut1.png commands.docbook shortcut2.png dirtree.png basics.docbook path-complete.docbook config.docbook dragdrop.png index.docbook faq.docbook sidebar.docbook save-settings.docbook introduction.docbook plugins.docbook browser.docbook konqorg.png bookmarks.docbook credits.docbook man-kbookmarkmerger.1.docbook cmndline.png parts.png ; 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 filemanager.docbook shortcut1.png commands.docbook shortcut2.png dirtree.png basics.docbook path-complete.docbook config.docbook dragdrop.png index.docbook faq.docbook sidebar.docbook save-settings.docbook introduction.docbook plugins.docbook browser.docbook konqorg.png bookmarks.docbook credits.docbook man-kbookmarkmerger.1.docbook cmndline.png parts.png ; 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 filemanager.docbook shortcut1.png commands.docbook shortcut2.png dirtree.png basics.docbook path-complete.docbook config.docbook dragdrop.png index.docbook faq.docbook sidebar.docbook save-settings.docbook introduction.docbook plugins.docbook browser.docbook konqorg.png bookmarks.docbook credits.docbook man-kbookmarkmerger.1.docbook cmndline.png parts.png ; 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.2.orig/doc/konsole/Makefile.in kdebase-3.4.2/doc/konsole/Makefile.in
+--- kdebase-3.4.2.orig/doc/konsole/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/doc/konsole/Makefile.in	2005-07-26 19:06:29.937182248 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11859,7 +12979,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -11868,7 +12988,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11880,10 +13000,43 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -713,7 +716,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
+@@ -740,20 +743,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.2.orig/doc/kpager/Makefile.in kdebase-3.4.2/doc/kpager/Makefile.in
+--- kdebase-3.4.2.orig/doc/kpager/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/doc/kpager/Makefile.in	2005-07-26 19:06:29.955179512 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11893,7 +13046,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -11902,7 +13055,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11914,10 +13067,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/ksplashml/Makefile.in kdebase-3.4.2/doc/ksplashml/Makefile.in
+--- kdebase-3.4.2.orig/doc/ksplashml/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/doc/ksplashml/Makefile.in	2005-07-26 19:06:29.978176016 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11927,7 +13080,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -11936,7 +13089,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11948,10 +13101,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/ksysguard/Makefile.in kdebase-3.4.2/doc/ksysguard/Makefile.in
+--- kdebase-3.4.2.orig/doc/ksysguard/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/doc/ksysguard/Makefile.in	2005-07-26 19:06:29.996173280 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11961,7 +13114,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -11970,7 +13123,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11982,10 +13135,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kwrite/Makefile.in kdebase-3.4.2/doc/kwrite/Makefile.in
+--- kdebase-3.4.2.orig/doc/kwrite/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/doc/kwrite/Makefile.in	2005-07-26 19:06:30.014170544 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11995,7 +13148,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -12004,7 +13157,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12016,10 +13169,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/kxkb/Makefile.in kdebase-3.4.2/doc/kxkb/Makefile.in
+--- kdebase-3.4.2.orig/doc/kxkb/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/doc/kxkb/Makefile.in	2005-07-26 19:06:30.032167808 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12029,7 +13182,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -12038,7 +13191,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12050,10 +13203,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/Makefile.in kdebase-3.4.2/doc/Makefile.in
+--- kdebase-3.4.2.orig/doc/Makefile.in	2005-07-20 21:08:03.000000000 +0000
++++ kdebase-3.4.2/doc/Makefile.in	2005-07-26 19:06:28.324427424 +0000
+@@ -252,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12063,7 +13216,14 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -543,7 +546,7 @@
+@@ -538,13 +541,13 @@
+ KDE_DOCS = AUTO
+ #>- SUBDIRS = $(AUTODIRS)
+ #>+ 1
+-SUBDIRS =. kdeprint kdebugdialog kappfinder kate kmenuedit konqueror knetattach quickstart kfind kcontrol userguide ksplashml kxkb kdcop glossary khelpcenter kwrite klipper kinfocenter faq visualdict kicker kpager konsole kdm kdesu ksysguard kioslave
++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
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -12072,7 +13232,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -581,9 +584,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12084,10 +13244,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/quickstart/Makefile.in kdebase-3.4.2/doc/quickstart/Makefile.in
+--- kdebase-3.4.2.orig/doc/quickstart/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/doc/quickstart/Makefile.in	2005-07-26 19:06:30.049165224 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12097,7 +13257,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -12106,7 +13266,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12118,10 +13278,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/doc/userguide/Makefile.in kdebase-3.4.2/doc/userguide/Makefile.in
+--- kdebase-3.4.2.orig/doc/userguide/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/doc/userguide/Makefile.in	2005-07-26 19:06:30.077160968 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12131,7 +13291,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -12140,7 +13300,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12152,10 +13312,47 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -710,10 +713,10 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=kde-as-root.docbook rip.png konq-simple.png browser-fine-tuning.docbook accessibility.docbook your-kde-account.docbook knode-mail-account.png programs-controlling.docbook kcontrol.png kaboodle-icon.png a-window.png pdf-files.docbook juk-icon.png amarok-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 where-next.docbook amarok.png oggfolder.png removable-disks.docbook 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 playing-movies.docbook file-sharing.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 kde-for-admins.docbook usenet.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 printer-setup.docbook kppp-dialer-tab.png 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) konq-sidebar.png desktop.png troubleshooting-no-open.docbook screen-captures.docbook switching-sessions.docbook amarok-icon.png kmousetool.png panel-and-desktop.docbook index.docbook shared-sessions.docbook kppp-wizard.png net-connection-setup.docbook playing-music.docbook kopete.png kmag.png standard-menu-entries.docbook internet-shortcuts.docbook creating-graphics.docbook kde-office.docbook control-center.docbook kde-for-admins.docbook playing-movies.docbook glossary.docbook file-sharing.docbook pdf-files.docbook kde-edutainment.docbook titlebar-menu.png printer-setup.docbook open-file-dialog.png kppp-dialer-tab.png networking-with-windows.docbook programs-controlling.docbook migrator-dictionary.docbook getting-help.docbook services.png noatun-icon.png a-window.png base-kde-applications.docbook printing-from-apps.docbook knode-start.png browser-fine-tuning.docbook konsole-intro.docbook usenet.docbook email.docbook noatun.png kmouth.png amarok.png juk-icon.png credits-and-license.docbook juk.png rip.png under-the-hood.docbook kde-as-root.docbook removable-disks.docbook accessibility.docbook your-kde-account.docbook playing-audiocds.docbook kaboodle-icon.png konq-simple.png programs-and-documents.docbook font-installation.docbook windows-how-to.docbook messaging-intro.docbook burning-cds.docbook oggfolder.png groupware-kontact.docbook knode-mail-account.png ripsettings.png kaboodle.png where-next.docbook troubleshooting-network-x.docbook the-filemanager.docbook kmouth2.png knode-identity.png kmouth3.png kcontrol.png 
++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
+@@ -740,20 +743,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide
+-	@for base in konq-sidebar.png desktop.png troubleshooting-no-open.docbook screen-captures.docbook switching-sessions.docbook amarok-icon.png kmousetool.png panel-and-desktop.docbook index.docbook shared-sessions.docbook kppp-wizard.png net-connection-setup.docbook playing-music.docbook kopete.png kmag.png standard-menu-entries.docbook internet-shortcuts.docbook creating-graphics.docbook kde-office.docbook control-center.docbook kde-for-admins.docbook playing-movies.docbook glossary.docbook file-sharing.docbook pdf-files.docbook kde-edutainment.docbook titlebar-menu.png printer-setup.docbook open-file-dialog.png kppp-dialer-tab.png networking-with-windows.docbook programs-controlling.docbook migrator-dictionary.docbook getting-help.docbook services.png noatun-icon.png a-window.png base-kde-applications.docbook printing-from-apps.docbook knode-start.png browser-fine-tuning.docbook konsole-intro.docbook usenet.docbook email.docbook noatun.png kmouth.png amarok.png juk-icon.png credits-and-license.docbook juk.png rip.png under-the-hood.docbook kde-as-root.docbook removable-disks.docbook accessibility.docbook your-kde-account.docbook playing-audiocds.docbook kaboodle-icon.png konq-simple.png programs-and-documents.docbook font-installation.docbook windows-how-to.docbook messaging-intro.docbook burning-cds.docbook oggfolder.png groupware-kontact.docbook knode-mail-account.png ripsettings.png kaboodle.png where-next.docbook troubleshooting-network-x.docbook the-filemanager.docbook kmouth2.png knode-identity.png kmouth3.png kcontrol.png ; 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 konq-sidebar.png desktop.png troubleshooting-no-open.docbook screen-captures.docbook switching-sessions.docbook amarok-icon.png kmousetool.png panel-and-desktop.docbook index.docbook shared-sessions.docbook kppp-wizard.png net-connection-setup.docbook playing-music.docbook kopete.png kmag.png standard-menu-entries.docbook internet-shortcuts.docbook creating-graphics.docbook kde-office.docbook control-center.docbook kde-for-admins.docbook playing-movies.docbook glossary.docbook file-sharing.docbook pdf-files.docbook kde-edutainment.docbook titlebar-menu.png printer-setup.docbook open-file-dialog.png kppp-dialer-tab.png networking-with-windows.docbook programs-controlling.docbook migrator-dictionary.docbook getting-help.docbook services.png noatun-icon.png a-window.png base-kde-applications.docbook printing-from-apps.docbook knode-start.png browser-fine-tuning.docbook konsole-intro.docbook usenet.docbook email.docbook noatun.png kmouth.png amarok.png juk-icon.png credits-and-license.docbook juk.png rip.png under-the-hood.docbook kde-as-root.docbook removable-disks.docbook accessibility.docbook your-kde-account.docbook playing-audiocds.docbook kaboodle-icon.png konq-simple.png programs-and-documents.docbook font-installation.docbook windows-how-to.docbook messaging-intro.docbook burning-cds.docbook oggfolder.png groupware-kontact.docbook knode-mail-account.png ripsettings.png kaboodle.png where-next.docbook troubleshooting-network-x.docbook the-filemanager.docbook kmouth2.png knode-identity.png kmouth3.png kcontrol.png ; 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 konq-sidebar.png desktop.png troubleshooting-no-open.docbook screen-captures.docbook switching-sessions.docbook amarok-icon.png kmousetool.png panel-and-desktop.docbook index.docbook shared-sessions.docbook kppp-wizard.png net-connection-setup.docbook playing-music.docbook kopete.png kmag.png standard-menu-entries.docbook internet-shortcuts.docbook creating-graphics.docbook kde-office.docbook control-center.docbook kde-for-admins.docbook playing-movies.docbook glossary.docbook file-sharing.docbook pdf-files.docbook kde-edutainment.docbook titlebar-menu.png printer-setup.docbook open-file-dialog.png kppp-dialer-tab.png networking-with-windows.docbook programs-controlling.docbook migrator-dictionary.docbook getting-help.docbook services.png noatun-icon.png a-window.png base-kde-applications.docbook printing-from-apps.docbook knode-start.png browser-fine-tuning.docbook konsole-intro.docbook usenet.docbook email.docbook noatun.png kmouth.png amarok.png juk-icon.png credits-and-license.docbook juk.png rip.png under-the-hood.docbook kde-as-root.docbook removable-disks.docbook accessibility.docbook your-kde-account.docbook playing-audiocds.docbook kaboodle-icon.png konq-simple.png programs-and-documents.docbook font-installation.docbook windows-how-to.docbook messaging-intro.docbook burning-cds.docbook oggfolder.png groupware-kontact.docbook knode-mail-account.png ripsettings.png kaboodle.png where-next.docbook troubleshooting-network-x.docbook the-filemanager.docbook kmouth2.png knode-identity.png kmouth3.png kcontrol.png ; 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.2.orig/doc/visualdict/Makefile.in kdebase-3.4.2/doc/visualdict/Makefile.in
+--- kdebase-3.4.2.orig/doc/visualdict/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/doc/visualdict/Makefile.in	2005-07-26 19:06:30.097157928 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12165,7 +13362,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -12174,7 +13371,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12186,10 +13383,47 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -710,10 +713,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 pict16.png pict20.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 pict10.png pict20.png pict11.png pict12.png pict13.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png pict1.png pict2.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
+@@ -740,20 +743,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/visualdict
+-	@for base in index.docbook pict10.png pict20.png pict11.png pict12.png pict13.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png pict1.png pict2.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 pict10.png pict20.png pict11.png pict12.png pict13.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png pict1.png pict2.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 pict10.png pict20.png pict11.png pict12.png pict13.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png pict1.png pict2.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.2.orig/drkonqi/debuggers/Makefile.in kdebase-3.4.2/drkonqi/debuggers/Makefile.in
+--- kdebase-3.4.2.orig/drkonqi/debuggers/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/drkonqi/debuggers/Makefile.in	2005-07-26 19:06:30.197142728 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12199,7 +13433,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -535,7 +538,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -12208,7 +13442,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -573,9 +576,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12220,10 +13454,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/drkonqi/Makefile.in kdebase-3.4.2/drkonqi/Makefile.in
+--- kdebase-3.4.2.orig/drkonqi/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/drkonqi/Makefile.in	2005-07-26 19:06:30.181145160 +0000
+@@ -301,6 +301,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12233,7 +13467,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -604,7 +607,7 @@
+@@ -605,7 +608,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -12242,7 +13476,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -642,9 +645,9 @@
+@@ -643,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12254,10 +13488,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/drkonqi/pics/Makefile.in kdebase-3.4.2/drkonqi/pics/Makefile.in
+--- kdebase-3.4.2.orig/drkonqi/pics/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/drkonqi/pics/Makefile.in	2005-07-26 19:06:30.213140296 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12267,7 +13501,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -535,7 +538,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -12276,7 +13510,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -573,9 +576,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12288,10 +13522,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/drkonqi/presets/Makefile.in kdebase-3.4.2/drkonqi/presets/Makefile.in
+--- kdebase-3.4.2.orig/drkonqi/presets/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/drkonqi/presets/Makefile.in	2005-07-26 19:06:30.229137864 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12301,7 +13535,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -535,7 +538,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -12310,7 +13544,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -573,9 +576,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12322,10 +13556,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kappfinder/apps/Development/Makefile.in kdebase-3.4.2/kappfinder/apps/Development/Makefile.in
+--- kdebase-3.4.2.orig/kappfinder/apps/Development/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/kappfinder/apps/Development/Makefile.in	2005-07-26 19:06:30.315124792 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12335,7 +13569,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -537,7 +540,7 @@
+@@ -538,7 +541,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -12344,7 +13578,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -575,9 +578,9 @@
+@@ -576,9 +579,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12356,10 +13590,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kappfinder/apps/Editors/Makefile.in kdebase-3.4.2/kappfinder/apps/Editors/Makefile.in
+--- kdebase-3.4.2.orig/kappfinder/apps/Editors/Makefile.in	2005-07-20 21:08:06.000000000 +0000
++++ kdebase-3.4.2/kappfinder/apps/Editors/Makefile.in	2005-07-26 19:06:30.345120232 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12369,7 +13603,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -538,7 +541,7 @@
+@@ -539,7 +542,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -12378,7 +13612,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -576,9 +579,9 @@
+@@ -577,9 +580,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12390,10 +13624,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kappfinder/apps/Games/Arcade/Makefile.in kdebase-3.4.2/kappfinder/apps/Games/Arcade/Makefile.in
+--- kdebase-3.4.2.orig/kappfinder/apps/Games/Arcade/Makefile.in	2005-07-20 21:08:06.000000000 +0000
++++ kdebase-3.4.2/kappfinder/apps/Games/Arcade/Makefile.in	2005-07-26 19:06:30.388113696 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12403,7 +13637,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -540,7 +543,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -12412,7 +13646,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -578,9 +581,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12424,10 +13658,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kappfinder/apps/Games/Board/Makefile.in kdebase-3.4.2/kappfinder/apps/Games/Board/Makefile.in
+--- kdebase-3.4.2.orig/kappfinder/apps/Games/Board/Makefile.in	2005-07-20 21:08:06.000000000 +0000
++++ kdebase-3.4.2/kappfinder/apps/Games/Board/Makefile.in	2005-07-26 19:06:30.453103816 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12437,7 +13671,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -538,7 +541,7 @@
+@@ -539,7 +542,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -12446,7 +13680,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -576,9 +579,9 @@
+@@ -577,9 +580,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12458,10 +13692,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kappfinder/apps/Games/Card/Makefile.in kdebase-3.4.2/kappfinder/apps/Games/Card/Makefile.in
+--- kdebase-3.4.2.orig/kappfinder/apps/Games/Card/Makefile.in	2005-07-20 21:08:06.000000000 +0000
++++ kdebase-3.4.2/kappfinder/apps/Games/Card/Makefile.in	2005-07-26 19:06:30.489098344 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12471,7 +13705,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -536,7 +539,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -12480,7 +13714,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -574,9 +577,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12492,10 +13726,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kappfinder/apps/Games/Emulators/Makefile.in kdebase-3.4.2/kappfinder/apps/Games/Emulators/Makefile.in
+--- kdebase-3.4.2.orig/kappfinder/apps/Games/Emulators/Makefile.in	2005-07-20 21:08:06.000000000 +0000
++++ kdebase-3.4.2/kappfinder/apps/Games/Emulators/Makefile.in	2005-07-26 19:06:30.524093024 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12505,7 +13739,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -536,7 +539,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -12514,7 +13748,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -574,9 +577,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12526,10 +13760,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kappfinder/apps/Games/Makefile.in kdebase-3.4.2/kappfinder/apps/Games/Makefile.in
+--- kdebase-3.4.2.orig/kappfinder/apps/Games/Makefile.in	2005-07-20 21:08:06.000000000 +0000
++++ kdebase-3.4.2/kappfinder/apps/Games/Makefile.in	2005-07-26 19:06:30.542090288 +0000
+@@ -262,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12539,7 +13773,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -554,7 +557,7 @@
+@@ -555,7 +558,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -12548,7 +13782,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +595,9 @@
+@@ -593,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12560,10 +13794,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kappfinder/apps/Games/Roguelikes/Makefile.in kdebase-3.4.2/kappfinder/apps/Games/Roguelikes/Makefile.in
+--- kdebase-3.4.2.orig/kappfinder/apps/Games/Roguelikes/Makefile.in	2005-07-20 21:08:06.000000000 +0000
++++ kdebase-3.4.2/kappfinder/apps/Games/Roguelikes/Makefile.in	2005-07-26 19:06:30.558087856 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12573,7 +13807,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -537,7 +540,7 @@
+@@ -538,7 +541,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -12582,7 +13816,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -575,9 +578,9 @@
+@@ -576,9 +579,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12594,10 +13828,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kappfinder/apps/Games/TacticStrategy/Makefile.in kdebase-3.4.2/kappfinder/apps/Games/TacticStrategy/Makefile.in
+--- kdebase-3.4.2.orig/kappfinder/apps/Games/TacticStrategy/Makefile.in	2005-07-20 21:08:06.000000000 +0000
++++ kdebase-3.4.2/kappfinder/apps/Games/TacticStrategy/Makefile.in	2005-07-26 19:06:30.575085272 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12607,7 +13841,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -536,7 +539,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -12616,7 +13850,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -574,9 +577,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12628,10 +13862,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kappfinder/apps/Graphics/Makefile.in kdebase-3.4.2/kappfinder/apps/Graphics/Makefile.in
+--- kdebase-3.4.2.orig/kappfinder/apps/Graphics/Makefile.in	2005-07-20 21:08:06.000000000 +0000
++++ kdebase-3.4.2/kappfinder/apps/Graphics/Makefile.in	2005-07-26 19:06:30.592082688 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12641,7 +13875,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -542,7 +545,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -12650,7 +13884,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -580,9 +583,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12662,10 +13896,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kappfinder/apps/Internet/Makefile.in kdebase-3.4.2/kappfinder/apps/Internet/Makefile.in
+--- kdebase-3.4.2.orig/kappfinder/apps/Internet/Makefile.in	2005-07-20 21:08:06.000000000 +0000
++++ kdebase-3.4.2/kappfinder/apps/Internet/Makefile.in	2005-07-26 19:06:30.613079496 +0000
+@@ -262,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12675,7 +13909,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -563,7 +566,7 @@
+@@ -564,7 +567,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -12684,7 +13918,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -601,9 +604,9 @@
+@@ -602,9 +605,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12696,10 +13930,19 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -913,7 +916,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 Netscapemessenger.desktop mozilla-firefox.desktop Gabber.desktop mozilla.desktop ickle.desktop gnometalk.desktop netscape6.desktop gtelnet.desktop xftp.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.2.orig/kappfinder/apps/Internet/Terminal/Makefile.in kdebase-3.4.2/kappfinder/apps/Internet/Terminal/Makefile.in
+--- kdebase-3.4.2.orig/kappfinder/apps/Internet/Terminal/Makefile.in	2005-07-20 21:08:06.000000000 +0000
++++ kdebase-3.4.2/kappfinder/apps/Internet/Terminal/Makefile.in	2005-07-26 19:06:30.630076912 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12709,7 +13952,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -538,7 +541,7 @@
+@@ -539,7 +542,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -12718,7 +13961,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -576,9 +579,9 @@
+@@ -577,9 +580,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12730,10 +13973,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kappfinder/apps/Makefile.in kdebase-3.4.2/kappfinder/apps/Makefile.in
+--- kdebase-3.4.2.orig/kappfinder/apps/Makefile.in	2005-07-20 21:08:06.000000000 +0000
++++ kdebase-3.4.2/kappfinder/apps/Makefile.in	2005-07-26 19:06:30.648074176 +0000
+@@ -252,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12743,7 +13986,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -542,7 +545,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -12752,7 +13995,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -580,9 +583,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12764,10 +14007,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kappfinder/apps/Multimedia/Makefile.in kdebase-3.4.2/kappfinder/apps/Multimedia/Makefile.in
+--- kdebase-3.4.2.orig/kappfinder/apps/Multimedia/Makefile.in	2005-07-20 21:08:06.000000000 +0000
++++ kdebase-3.4.2/kappfinder/apps/Multimedia/Makefile.in	2005-07-26 19:06:30.666071440 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12777,7 +14020,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -561,7 +564,7 @@
+@@ -562,7 +565,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -12786,7 +14029,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -599,9 +602,9 @@
+@@ -600,9 +603,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12798,10 +14041,19 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -764,7 +767,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 Aumix.desktop xawtv.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.2.orig/kappfinder/apps/Office/Makefile.in kdebase-3.4.2/kappfinder/apps/Office/Makefile.in
+--- kdebase-3.4.2.orig/kappfinder/apps/Office/Makefile.in	2005-07-20 21:08:06.000000000 +0000
++++ kdebase-3.4.2/kappfinder/apps/Office/Makefile.in	2005-07-26 19:06:30.686068400 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12811,7 +14063,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -542,7 +545,7 @@
+@@ -543,7 +546,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -12820,7 +14072,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -580,9 +583,9 @@
+@@ -581,9 +584,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12832,10 +14084,19 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -743,7 +746,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 mrproject.desktop scribus.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.2.orig/kappfinder/apps/System/Makefile.in kdebase-3.4.2/kappfinder/apps/System/Makefile.in
+--- kdebase-3.4.2.orig/kappfinder/apps/System/Makefile.in	2005-07-20 21:08:06.000000000 +0000
++++ kdebase-3.4.2/kappfinder/apps/System/Makefile.in	2005-07-26 19:06:30.704065664 +0000
+@@ -262,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12845,7 +14106,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -554,7 +557,7 @@
+@@ -555,7 +558,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -12854,7 +14115,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +595,9 @@
+@@ -593,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12866,10 +14127,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kappfinder/apps/System/Terminal/Makefile.in kdebase-3.4.2/kappfinder/apps/System/Terminal/Makefile.in
+--- kdebase-3.4.2.orig/kappfinder/apps/System/Terminal/Makefile.in	2005-07-20 21:08:06.000000000 +0000
++++ kdebase-3.4.2/kappfinder/apps/System/Terminal/Makefile.in	2005-07-26 19:06:30.720063232 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12879,7 +14140,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -536,7 +539,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -12888,7 +14149,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -574,9 +577,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12900,10 +14161,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kappfinder/apps/Toys/Makefile.in kdebase-3.4.2/kappfinder/apps/Toys/Makefile.in
+--- kdebase-3.4.2.orig/kappfinder/apps/Toys/Makefile.in	2005-07-20 21:08:06.000000000 +0000
++++ kdebase-3.4.2/kappfinder/apps/Toys/Makefile.in	2005-07-26 19:06:30.736060800 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12913,7 +14174,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -536,7 +539,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -12922,7 +14183,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -574,9 +577,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12934,10 +14195,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kappfinder/apps/Utilities/Makefile.in kdebase-3.4.2/kappfinder/apps/Utilities/Makefile.in
+--- kdebase-3.4.2.orig/kappfinder/apps/Utilities/Makefile.in	2005-07-20 21:08:06.000000000 +0000
++++ kdebase-3.4.2/kappfinder/apps/Utilities/Makefile.in	2005-07-26 19:06:30.754058064 +0000
+@@ -262,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12947,7 +14208,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -554,7 +557,7 @@
+@@ -555,7 +558,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -12956,7 +14217,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +595,9 @@
+@@ -593,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12968,10 +14229,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kappfinder/apps/Utilities/xutils/Makefile.in kdebase-3.4.2/kappfinder/apps/Utilities/xutils/Makefile.in
+--- kdebase-3.4.2.orig/kappfinder/apps/Utilities/xutils/Makefile.in	2005-07-20 21:08:06.000000000 +0000
++++ kdebase-3.4.2/kappfinder/apps/Utilities/xutils/Makefile.in	2005-07-26 19:06:30.771055480 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12981,7 +14242,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -538,7 +541,7 @@
+@@ -539,7 +542,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -12990,7 +14251,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -576,9 +579,9 @@
+@@ -577,9 +580,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13002,10 +14263,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kappfinder/Makefile.in kdebase-3.4.2/kappfinder/Makefile.in
+--- kdebase-3.4.2.orig/kappfinder/Makefile.in	2005-07-20 21:08:05.000000000 +0000
++++ kdebase-3.4.2/kappfinder/Makefile.in	2005-07-26 19:06:30.296127680 +0000
+@@ -311,6 +311,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13015,7 +14276,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -609,7 +612,7 @@
+@@ -610,7 +613,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13024,7 +14285,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -647,9 +650,9 @@
+@@ -648,9 +651,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13036,10 +14297,40 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -1078,23 +1081,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/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kappfinder.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/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/64x64/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr64-app-kappfinder.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/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/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/32x32/apps/kappfinder.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kappfinder.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kappfinder.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kappfinder.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kappfinder.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nru kdebase-3.4.2.orig/kate/app/Makefile.in kdebase-3.4.2/kate/app/Makefile.in
+--- kdebase-3.4.2.orig/kate/app/Makefile.in	2005-07-20 21:08:06.000000000 +0000
++++ kdebase-3.4.2/kate/app/Makefile.in	2005-07-26 19:06:30.962026448 +0000
+@@ -334,6 +334,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13049,7 +14340,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -663,7 +666,7 @@
+@@ -664,7 +667,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13058,7 +14349,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -701,9 +704,9 @@
+@@ -702,9 +705,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13070,10 +14361,53 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -1133,18 +1136,18 @@
+ mocs: katedocmanager.moc
+ 
+ #>+ 3
+-kateprojecttreeview.moc: $(srcdir)/kateprojecttreeview.h
+-	$(MOC) $(srcdir)/kateprojecttreeview.h -o kateprojecttreeview.moc
++kategrepdialog.moc: $(srcdir)/kategrepdialog.h
++	$(MOC) $(srcdir)/kategrepdialog.h -o kategrepdialog.moc
+ 
+ #>+ 2
+-mocs: kateprojecttreeview.moc
++mocs: kategrepdialog.moc
+ 
+ #>+ 3
+-kategrepdialog.moc: $(srcdir)/kategrepdialog.h
+-	$(MOC) $(srcdir)/kategrepdialog.h -o kategrepdialog.moc
++kateprojecttreeview.moc: $(srcdir)/kateprojecttreeview.h
++	$(MOC) $(srcdir)/kateprojecttreeview.h -o kateprojecttreeview.moc
+ 
+ #>+ 2
+-mocs: kategrepdialog.moc
++mocs: kateprojecttreeview.moc
+ 
+ #>+ 3
+ kateprojectlist.moc: $(srcdir)/kateprojectlist.h
+@@ -1297,7 +1300,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  katesavemodifieddialog.moc kateconfigdialog.moc kateconsole.moc katemainwindow.moc katedocmanager.moc kateprojecttreeview.moc kategrepdialog.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
++	-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 Makefile.am katesavemodifieddialog.h kateprojectlist.h kategrepdialog.h 
+@@ -1355,7 +1358,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 katemainwindow.moc kateconsole.moc katedocmanager.moc kateprojectlist.moc kategrepdialog.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.2.orig/kate/data/Makefile.in kdebase-3.4.2/kate/data/Makefile.in
+--- kdebase-3.4.2.orig/kate/data/Makefile.in	2005-07-20 21:08:06.000000000 +0000
++++ kdebase-3.4.2/kate/data/Makefile.in	2005-07-26 19:06:30.981023560 +0000
+@@ -264,6 +264,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13083,7 +14417,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -567,7 +570,7 @@
+@@ -568,7 +571,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -13092,7 +14426,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -605,9 +608,9 @@
+@@ -606,9 +609,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13104,10 +14438,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-katescriptsSCRIPTS: $(katescripts_SCRIPTS)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kate/interfaces/Makefile.in kdebase-3.4.2/kate/interfaces/Makefile.in
+--- kdebase-3.4.2.orig/kate/interfaces/Makefile.in	2005-07-20 21:08:06.000000000 +0000
++++ kdebase-3.4.2/kate/interfaces/Makefile.in	2005-07-26 19:06:31.046013680 +0000
+@@ -289,6 +289,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13117,7 +14451,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -591,7 +594,7 @@
+@@ -592,7 +595,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13126,7 +14460,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -629,9 +632,9 @@
+@@ -630,9 +633,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13138,10 +14472,53 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-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 @@
+@@ -898,18 +901,18 @@
+ 	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub projectiface.kidl
+ 
+ #>+ 3
+-documentmanager.moc: $(srcdir)/documentmanager.h
+-	$(MOC) $(srcdir)/documentmanager.h -o documentmanager.moc
++plugin.moc: $(srcdir)/plugin.h
++	$(MOC) $(srcdir)/plugin.h -o plugin.moc
+ 
+ #>+ 2
+-mocs: documentmanager.moc
++mocs: plugin.moc
+ 
+ #>+ 3
+-plugin.moc: $(srcdir)/plugin.h
+-	$(MOC) $(srcdir)/plugin.h -o plugin.moc
++documentmanager.moc: $(srcdir)/documentmanager.h
++	$(MOC) $(srcdir)/documentmanager.h -o documentmanager.moc
+ 
+ #>+ 2
+-mocs: plugin.moc
++mocs: documentmanager.moc
+ 
+ #>+ 3
+ project.moc: $(srcdir)/project.h
+@@ -969,7 +972,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  documentmanager.moc plugin.moc project.moc pluginconfiginterfaceextension.moc application.moc pluginmanager.moc projectmanager.moc mainwindow.moc toolviewmanager.moc viewmanager.moc
++	-rm -f  plugin.moc documentmanager.moc project.moc pluginconfiginterfaceextension.moc application.moc pluginmanager.moc projectmanager.moc mainwindow.moc toolviewmanager.moc viewmanager.moc
+ 
+ #>+ 2
+ KDE_DIST=projectiface.h Makefile.in Makefile.am 
+@@ -1021,7 +1024,7 @@
+ 
+ 
+ #>+ 11
+-libkateinterfacesprivate_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/application.cpp $(srcdir)/mainwindow.cpp $(srcdir)/documentmanager.cpp $(srcdir)/viewmanager.cpp $(srcdir)/toolviewmanager.cpp $(srcdir)/pluginmanager.cpp $(srcdir)/plugin.cpp $(srcdir)/pluginconfiginterface.cpp $(srcdir)/pluginconfiginterfaceextension.cpp $(srcdir)/project.cpp $(srcdir)/projectmanager.cpp projectiface_skel.cpp  plugin.moc documentmanager.moc pluginconfiginterfaceextension.moc project.moc application.moc pluginmanager.moc projectmanager.moc mainwindow.moc toolviewmanager.moc viewmanager.moc
++libkateinterfacesprivate_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/application.cpp $(srcdir)/mainwindow.cpp $(srcdir)/documentmanager.cpp $(srcdir)/viewmanager.cpp $(srcdir)/toolviewmanager.cpp $(srcdir)/pluginmanager.cpp $(srcdir)/plugin.cpp $(srcdir)/pluginconfiginterface.cpp $(srcdir)/pluginconfiginterfaceextension.cpp $(srcdir)/project.cpp $(srcdir)/projectmanager.cpp projectiface_skel.cpp  documentmanager.moc plugin.moc pluginconfiginterfaceextension.moc project.moc application.moc pluginmanager.moc projectmanager.moc mainwindow.moc toolviewmanager.moc viewmanager.moc
+ 	@echo 'creating libkateinterfacesprivate_la.all_cpp.cpp ...'; \
+ 	rm -f libkateinterfacesprivate_la.all_cpp.files libkateinterfacesprivate_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libkateinterfacesprivate_la.all_cpp.final; \
+diff -Nru kdebase-3.4.2.orig/kate/Makefile.in kdebase-3.4.2/kate/Makefile.in
+--- kdebase-3.4.2.orig/kate/Makefile.in	2005-07-20 21:08:06.000000000 +0000
++++ kdebase-3.4.2/kate/Makefile.in	2005-07-26 19:06:30.791052440 +0000
+@@ -254,6 +254,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13151,7 +14528,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -542,7 +545,7 @@
+@@ -543,7 +546,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -13160,7 +14537,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -580,9 +583,9 @@
+@@ -581,9 +584,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13172,10 +14549,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kate/pics/actions/Makefile.in kdebase-3.4.2/kate/pics/actions/Makefile.in
+--- kdebase-3.4.2.orig/kate/pics/actions/Makefile.in	2005-07-20 21:08:06.000000000 +0000
++++ kdebase-3.4.2/kate/pics/actions/Makefile.in	2005-07-26 19:06:31.095006232 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13185,7 +14562,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -13194,7 +14571,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13206,10 +14583,88 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -708,51 +711,51 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=cr32-action-highlighting.png lo16-action-unindent.png lo16-action-null.png lo16-action-curfiledir.png lo16-action-indent.png lo22-action-unindent.png cr16-action-modonhd.png lo16-action-modmod.png cr16-action-null.png lo16-action-modified.png cr16-action-curfiledir.png cr16-action-modmod.png Makefile.in cr16-action-modified.png lo16-action-modonhd.png lo22-action-indent.png cr16-action-highlighting.png Makefile.am 
++KDE_DIST=cr32-action-highlighting.png lo16-action-unindent.png lo16-action-null.png lo16-action-curfiledir.png lo16-action-indent.png lo22-action-unindent.png cr16-action-modonhd.png lo16-action-modmod.png cr16-action-null.png lo16-action-modified.png cr16-action-modmod.png cr16-action-curfiledir.png Makefile.in cr16-action-modified.png lo22-action-indent.png lo16-action-modonhd.png cr16-action-highlighting.png Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+ 
+ #>+ 40
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-modmod.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modmod.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-null.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/null.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-modified.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modified.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions
+-	$(INSTALL_DATA) $(srcdir)/lo16-action-null.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/null.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-curfiledir.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/curfiledir.png
+-	$(mkinstalldirs) $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions
+-	$(INSTALL_DATA) $(srcdir)/lo22-action-indent.png $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/indent.png
+ 	$(INSTALL_DATA) $(srcdir)/lo16-action-modmod.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modmod.png
+-	$(INSTALL_DATA) $(srcdir)/lo16-action-modified.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modified.png
+ 	$(INSTALL_DATA) $(srcdir)/lo16-action-indent.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/indent.png
+-	$(INSTALL_DATA) $(srcdir)/lo22-action-unindent.png $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/unindent.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-modonhd.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modonhd.png
+-	$(INSTALL_DATA) $(srcdir)/lo16-action-curfiledir.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/curfiledir.png
+-	$(INSTALL_DATA) $(srcdir)/lo16-action-unindent.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/unindent.png
+-	$(INSTALL_DATA) $(srcdir)/lo16-action-modonhd.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modonhd.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-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)/lo16-action-modonhd.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modonhd.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/modified.png
+ 	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modmod.png
++	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modonhd.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)/crystalsvg/16x16/actions/modified.png
+ 	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/null.png
+-	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/curfiledir.png
+-	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/indent.png
+-	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modmod.png
+-	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modified.png
+-	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/indent.png
+-	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/unindent.png
+-	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modonhd.png
+ 	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/curfiledir.png
+-	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/unindent.png
+-	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modonhd.png
+-	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/32x32/actions/highlighting.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
+ force-reedit:
+diff -Nru kdebase-3.4.2.orig/kate/pics/Makefile.in kdebase-3.4.2/kate/pics/Makefile.in
+--- kdebase-3.4.2.orig/kate/pics/Makefile.in	2005-07-20 21:08:06.000000000 +0000
++++ kdebase-3.4.2/kate/pics/Makefile.in	2005-07-26 19:06:31.071009880 +0000
+@@ -252,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13219,7 +14674,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -540,7 +543,7 @@
+@@ -541,7 +544,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -13228,7 +14683,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -578,9 +581,9 @@
+@@ -579,9 +582,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13240,10 +14695,63 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -879,38 +882,38 @@
+ 
+ #>+ 34
+ install-kde-icons:
+-	$(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/128x128/apps
++	$(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-kwrite.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/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-kate.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kate.png
+-	$(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)/cr64-app-kwrite.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kwrite.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-kwrite.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/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)/cr48-app-kwrite.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kwrite.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
++	$(INSTALL_DATA) $(srcdir)/cr64-app-kate.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kate.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
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kate.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kate.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kwrite2.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kwrite.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwrite.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kate.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kate.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/128x128/apps/kwrite.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kate.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kwrite.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/32x32/apps/kate.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwrite.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kate.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nru kdebase-3.4.2.orig/kate/plugins/defaultproject/Makefile.in kdebase-3.4.2/kate/plugins/defaultproject/Makefile.in
+--- kdebase-3.4.2.orig/kate/plugins/defaultproject/Makefile.in	2005-07-20 21:08:06.000000000 +0000
++++ kdebase-3.4.2/kate/plugins/defaultproject/Makefile.in	2005-07-26 19:06:31.161996048 +0000
+@@ -283,6 +283,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13253,7 +14761,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -584,7 +587,7 @@
+@@ -585,7 +588,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13262,7 +14770,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -622,9 +625,9 @@
+@@ -623,9 +626,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13274,10 +14782,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kate/plugins/Makefile.in kdebase-3.4.2/kate/plugins/Makefile.in
+--- kdebase-3.4.2.orig/kate/plugins/Makefile.in	2005-07-20 21:08:06.000000000 +0000
++++ kdebase-3.4.2/kate/plugins/Makefile.in	2005-07-26 19:06:31.114003344 +0000
+@@ -252,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13287,7 +14795,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -540,7 +543,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -13296,7 +14804,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -578,9 +581,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13308,10 +14816,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kate/utils/Makefile.in kdebase-3.4.2/kate/utils/Makefile.in
+--- kdebase-3.4.2.orig/kate/utils/Makefile.in	2005-07-20 21:08:06.000000000 +0000
++++ kdebase-3.4.2/kate/utils/Makefile.in	2005-07-26 19:06:31.800898920 +0000
+@@ -288,6 +288,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13321,7 +14829,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -586,7 +589,7 @@
+@@ -587,7 +590,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13330,7 +14838,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -624,9 +627,9 @@
+@@ -625,9 +628,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13342,10 +14850,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcheckpass/Makefile.in kdebase-3.4.2/kcheckpass/Makefile.in
+--- kdebase-3.4.2.orig/kcheckpass/Makefile.in	2005-07-20 21:08:06.000000000 +0000
++++ kdebase-3.4.2/kcheckpass/Makefile.in	2005-07-26 19:06:31.824895272 +0000
+@@ -274,6 +274,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13355,7 +14863,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -571,7 +574,7 @@
+@@ -572,7 +575,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -13364,7 +14872,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -609,9 +612,9 @@
+@@ -610,9 +613,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13376,10 +14884,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcminit/Makefile.in kdebase-3.4.2/kcminit/Makefile.in
+--- kdebase-3.4.2.orig/kcminit/Makefile.in	2005-07-20 21:08:06.000000000 +0000
++++ kdebase-3.4.2/kcminit/Makefile.in	2005-07-26 19:06:31.858890104 +0000
+@@ -313,6 +313,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13389,7 +14897,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -611,7 +614,7 @@
+@@ -612,7 +615,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13398,7 +14906,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -649,9 +652,9 @@
+@@ -650,9 +653,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13410,10 +14918,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/access/Makefile.in kdebase-3.4.2/kcontrol/access/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/access/Makefile.in	2005-07-20 21:08:06.000000000 +0000
++++ kdebase-3.4.2/kcontrol/access/Makefile.in	2005-07-26 19:06:32.029864112 +0000
+@@ -310,6 +310,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13423,7 +14931,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -618,7 +621,7 @@
+@@ -619,7 +622,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13432,7 +14940,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -656,9 +659,9 @@
+@@ -657,9 +660,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13444,10 +14952,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/accessibility/Makefile.in kdebase-3.4.2/kcontrol/accessibility/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/accessibility/Makefile.in	2005-07-20 21:08:06.000000000 +0000
++++ kdebase-3.4.2/kcontrol/accessibility/Makefile.in	2005-07-26 19:06:32.077856816 +0000
+@@ -287,6 +287,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13457,7 +14965,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -586,7 +589,7 @@
+@@ -587,7 +590,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13466,7 +14974,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -624,9 +627,9 @@
+@@ -625,9 +628,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13478,10 +14986,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/arts/Makefile.in kdebase-3.4.2/kcontrol/arts/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/arts/Makefile.in	2005-07-20 21:08:06.000000000 +0000
++++ kdebase-3.4.2/kcontrol/arts/Makefile.in	2005-07-26 19:06:32.128849064 +0000
+@@ -284,6 +284,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13491,7 +14999,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -582,7 +585,7 @@
+@@ -583,7 +586,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13500,7 +15008,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -620,9 +623,9 @@
+@@ -621,9 +624,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13512,10 +15020,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/background/Makefile.in kdebase-3.4.2/kcontrol/background/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/background/Makefile.in	2005-07-20 21:08:06.000000000 +0000
++++ kdebase-3.4.2/kcontrol/background/Makefile.in	2005-07-26 19:06:32.603776864 +0000
+@@ -319,6 +319,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13525,7 +15033,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -628,7 +631,7 @@
+@@ -629,7 +632,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13534,7 +15042,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -666,9 +669,9 @@
+@@ -667,9 +670,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13546,10 +15054,54 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -1086,18 +1089,18 @@
+ 
+ 
+ #>+ 3
+-bgrender.moc: $(srcdir)/bgrender.h
+-	$(MOC) $(srcdir)/bgrender.h -o bgrender.moc
++bgwallpaper.moc: $(srcdir)/bgwallpaper.h
++	$(MOC) $(srcdir)/bgwallpaper.h -o bgwallpaper.moc
+ 
+ #>+ 2
+-mocs: bgrender.moc
++mocs: bgwallpaper.moc
+ 
+ #>+ 3
+-bgwallpaper.moc: $(srcdir)/bgwallpaper.h
+-	$(MOC) $(srcdir)/bgwallpaper.h -o bgwallpaper.moc
++bgrender.moc: $(srcdir)/bgrender.h
++	$(MOC) $(srcdir)/bgrender.h -o bgrender.moc
+ 
+ #>+ 2
+-mocs: bgwallpaper.moc
++mocs: bgrender.moc
+ 
+ #>+ 3
+ bgadvanced.moc: $(srcdir)/bgadvanced.h
+@@ -1129,7 +1132,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  bgrender.moc bgwallpaper.moc bgadvanced.moc bgmonitor.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 
+@@ -1252,8 +1255,8 @@
+ $(srcdir)/bgmonitor.cpp: bgdialog_ui.h bgwallpaper_ui.h bgadvanced_ui.h 
+ bgdialog.lo: bgdialog.moc 
+ nmcheck: 
+-bgrender.lo: bgrender.moc 
+ bgwallpaper.o: bgwallpaper.moc 
++bgrender.lo: bgrender.moc 
+ nmcheck-am: nmcheck
+ bgrender.o: bgrender.moc 
+ 
+diff -Nru kdebase-3.4.2.orig/kcontrol/background/pics/Makefile.in kdebase-3.4.2/kcontrol/background/pics/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/background/pics/Makefile.in	2005-07-20 21:08:06.000000000 +0000
++++ kdebase-3.4.2/kcontrol/background/pics/Makefile.in	2005-07-26 19:06:32.625773520 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13559,7 +15111,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -536,7 +539,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -13568,7 +15120,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -574,9 +577,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13580,10 +15132,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/bell/Makefile.in kdebase-3.4.2/kcontrol/bell/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/bell/Makefile.in	2005-07-20 21:08:06.000000000 +0000
++++ kdebase-3.4.2/kcontrol/bell/Makefile.in	2005-07-26 19:06:32.672766376 +0000
+@@ -280,6 +280,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13593,7 +15145,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -576,7 +579,7 @@
+@@ -577,7 +580,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13602,7 +15154,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -614,9 +617,9 @@
+@@ -615,9 +618,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13614,10 +15166,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/clock/Makefile.in kdebase-3.4.2/kcontrol/clock/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/clock/Makefile.in	2005-07-20 21:08:06.000000000 +0000
++++ kdebase-3.4.2/kcontrol/clock/Makefile.in	2005-07-26 19:06:32.722758776 +0000
+@@ -284,6 +284,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13627,7 +15179,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -580,7 +583,7 @@
+@@ -581,7 +584,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13636,7 +15188,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -618,9 +621,9 @@
+@@ -619,9 +622,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13648,10 +15200,60 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -912,18 +915,18 @@
+ 
+ 
+ #>+ 3
+-dtime.moc: $(srcdir)/dtime.h
+-	$(MOC) $(srcdir)/dtime.h -o dtime.moc
++tzone.moc: $(srcdir)/tzone.h
++	$(MOC) $(srcdir)/tzone.h -o tzone.moc
+ 
+ #>+ 2
+-mocs: dtime.moc
++mocs: tzone.moc
+ 
+ #>+ 3
+-tzone.moc: $(srcdir)/tzone.h
+-	$(MOC) $(srcdir)/tzone.h -o tzone.moc
++dtime.moc: $(srcdir)/dtime.h
++	$(MOC) $(srcdir)/dtime.h -o dtime.moc
+ 
+ #>+ 2
+-mocs: tzone.moc
++mocs: dtime.moc
+ 
+ #>+ 3
+ main.moc: $(srcdir)/main.h
+@@ -934,7 +937,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  dtime.moc tzone.moc main.moc
++	-rm -f  tzone.moc dtime.moc main.moc
+ 
+ #>+ 2
+ KDE_DIST=clock.desktop dtime.h main.h Makefile.in tzone.h Makefile.am 
+@@ -985,7 +988,7 @@
+ 
+ 
+ #>+ 11
+-kcm_clock_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dtime.cpp $(srcdir)/tzone.cpp $(srcdir)/main.cpp  tzone.moc dtime.moc main.moc
++kcm_clock_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dtime.cpp $(srcdir)/tzone.cpp $(srcdir)/main.cpp  dtime.moc tzone.moc main.moc
+ 	@echo 'creating kcm_clock_la.all_cpp.cpp ...'; \
+ 	rm -f kcm_clock_la.all_cpp.files kcm_clock_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kcm_clock_la.all_cpp.final; \
+@@ -1031,5 +1034,5 @@
+ nmcheck-am: nmcheck
+ dtime.lo: dtime.moc 
+ main.o: main.moc 
+-dtime.o: dtime.moc 
+ tzone.o: tzone.moc 
++dtime.o: dtime.moc 
+diff -Nru kdebase-3.4.2.orig/kcontrol/colors/Makefile.in kdebase-3.4.2/kcontrol/colors/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/colors/Makefile.in	2005-07-20 21:08:06.000000000 +0000
++++ kdebase-3.4.2/kcontrol/colors/Makefile.in	2005-07-26 19:06:32.769751632 +0000
+@@ -288,6 +288,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13661,7 +15263,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -586,7 +589,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13670,7 +15272,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -624,9 +627,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13682,10 +15284,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/componentchooser/componentservices/Makefile.in kdebase-3.4.2/kcontrol/componentchooser/componentservices/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/componentchooser/componentservices/Makefile.in	2005-07-20 21:08:06.000000000 +0000
++++ kdebase-3.4.2/kcontrol/componentchooser/componentservices/Makefile.in	2005-07-26 19:06:32.853738864 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13695,7 +15297,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -535,7 +538,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -13704,7 +15306,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -573,9 +576,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13716,10 +15318,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/componentchooser/Makefile.in kdebase-3.4.2/kcontrol/componentchooser/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/componentchooser/Makefile.in	2005-07-20 21:08:06.000000000 +0000
++++ kdebase-3.4.2/kcontrol/componentchooser/Makefile.in	2005-07-26 19:06:32.836741448 +0000
+@@ -301,6 +301,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13729,7 +15331,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -600,7 +603,7 @@
+@@ -601,7 +604,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13738,7 +15340,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -638,9 +641,9 @@
+@@ -639,9 +642,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13750,10 +15352,19 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -1053,7 +1056,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.2.orig/kcontrol/crypto/Makefile.in kdebase-3.4.2/kcontrol/crypto/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/crypto/Makefile.in	2005-07-20 21:08:07.000000000 +0000
++++ kdebase-3.4.2/kcontrol/crypto/Makefile.in	2005-07-26 19:06:33.014714392 +0000
+@@ -288,6 +288,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13763,7 +15374,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -586,7 +589,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13772,7 +15383,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -624,9 +627,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13784,10 +15395,53 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -918,18 +921,18 @@
+ 
+ 
+ #>+ 3
+-crypto.moc: $(srcdir)/crypto.h
+-	$(MOC) $(srcdir)/crypto.h -o crypto.moc
++kdatetimedlg.moc: $(srcdir)/kdatetimedlg.h
++	$(MOC) $(srcdir)/kdatetimedlg.h -o kdatetimedlg.moc
+ 
+ #>+ 2
+-mocs: crypto.moc
++mocs: kdatetimedlg.moc
+ 
+ #>+ 3
+-kdatetimedlg.moc: $(srcdir)/kdatetimedlg.h
+-	$(MOC) $(srcdir)/kdatetimedlg.h -o kdatetimedlg.moc
++crypto.moc: $(srcdir)/crypto.h
++	$(MOC) $(srcdir)/crypto.h -o crypto.moc
+ 
+ #>+ 2
+-mocs: kdatetimedlg.moc
++mocs: crypto.moc
+ 
+ #>+ 3
+ certexport.moc: $(srcdir)/certexport.h
+@@ -940,7 +943,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  crypto.moc kdatetimedlg.moc certexport.moc
++	-rm -f  kdatetimedlg.moc crypto.moc certexport.moc
+ 
+ #>+ 2
+ KDE_DIST=certgen.ui crypto.desktop configure.in.in Makefile.in Makefile.am 
+@@ -991,7 +994,7 @@
+ 
+ 
+ #>+ 11
+-kcm_crypto_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/crypto.cpp $(srcdir)/certexport.cpp $(srcdir)/kdatetimedlg.cpp  kdatetimedlg.moc crypto.moc certexport.moc
++kcm_crypto_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/crypto.cpp $(srcdir)/certexport.cpp $(srcdir)/kdatetimedlg.cpp  crypto.moc kdatetimedlg.moc certexport.moc
+ 	@echo 'creating kcm_crypto_la.all_cpp.cpp ...'; \
+ 	rm -f kcm_crypto_la.all_cpp.files kcm_crypto_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kcm_crypto_la.all_cpp.final; \
+diff -Nru kdebase-3.4.2.orig/kcontrol/css/Makefile.in kdebase-3.4.2/kcontrol/css/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/css/Makefile.in	2005-07-20 21:08:07.000000000 +0000
++++ kdebase-3.4.2/kcontrol/css/Makefile.in	2005-07-26 19:06:33.072705576 +0000
+@@ -285,6 +285,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13797,7 +15451,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -586,7 +589,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13806,7 +15460,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -624,9 +627,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13818,10 +15472,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/display/Makefile.in kdebase-3.4.2/kcontrol/display/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/display/Makefile.in	2005-07-20 21:08:07.000000000 +0000
++++ kdebase-3.4.2/kcontrol/display/Makefile.in	2005-07-26 19:06:33.113699344 +0000
+@@ -284,6 +284,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13831,7 +15485,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -581,7 +584,7 @@
+@@ -582,7 +585,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13840,7 +15494,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -619,9 +622,9 @@
+@@ -620,9 +623,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13852,10 +15506,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/dnssd/Makefile.in kdebase-3.4.2/kcontrol/dnssd/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/dnssd/Makefile.in	2005-07-20 21:08:07.000000000 +0000
++++ kdebase-3.4.2/kcontrol/dnssd/Makefile.in	2005-07-26 19:06:33.145694480 +0000
+@@ -293,6 +293,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13865,7 +15519,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -591,7 +594,7 @@
+@@ -592,7 +595,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13874,7 +15528,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -629,9 +632,9 @@
+@@ -630,9 +633,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13886,10 +15540,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/ebrowsing/Makefile.in kdebase-3.4.2/kcontrol/ebrowsing/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/ebrowsing/Makefile.in	2005-07-20 21:08:07.000000000 +0000
++++ kdebase-3.4.2/kcontrol/ebrowsing/Makefile.in	2005-07-26 19:06:33.216683688 +0000
+@@ -298,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13899,7 +15553,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -595,7 +598,7 @@
+@@ -596,7 +599,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13908,7 +15562,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -633,9 +636,9 @@
+@@ -634,9 +637,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13920,10 +15574,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/ebrowsing/plugins/ikws/Makefile.in kdebase-3.4.2/kcontrol/ebrowsing/plugins/ikws/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/ebrowsing/plugins/ikws/Makefile.in	2005-07-20 21:08:07.000000000 +0000
++++ kdebase-3.4.2/kcontrol/ebrowsing/plugins/ikws/Makefile.in	2005-07-26 19:06:33.292672136 +0000
+@@ -319,6 +319,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13933,7 +15587,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -634,7 +637,7 @@
+@@ -635,7 +638,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13942,7 +15596,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -672,9 +675,9 @@
+@@ -673,9 +676,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13954,10 +15608,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.in kdebase-3.4.2/kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.in	2005-07-20 21:08:07.000000000 +0000
++++ kdebase-3.4.2/kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.in	2005-07-26 19:06:33.316668488 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13967,7 +15621,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -619,7 +622,7 @@
+@@ -620,7 +623,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -13976,7 +15630,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -657,9 +660,9 @@
+@@ -658,9 +661,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13988,10 +15642,19 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -820,7 +823,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=kde.desktop leo.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 en2fr.desktop acronym.desktop google.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 cpan.desktop en2it.desktop google_advanced.desktop netcraft.desktop hotbot.desktop freshmeat.desktop alexa.desktop pgpkeys.desktop thesaurus.desktop php.desktop nl-telephone.desktop feedster.desktop foldoc.desktop en2de.desktop google_news.desktop dbug.desktop qt.desktop rfc.desktop Makefile.in rae.desktop citeseer.desktop backports.desktop ctan.desktop fr2en.desktop metacrawler.desktop excite.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 
++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.2.orig/kcontrol/ebrowsing/plugins/localdomain/Makefile.in kdebase-3.4.2/kcontrol/ebrowsing/plugins/localdomain/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/ebrowsing/plugins/localdomain/Makefile.in	2005-07-20 21:08:07.000000000 +0000
++++ kdebase-3.4.2/kcontrol/ebrowsing/plugins/localdomain/Makefile.in	2005-07-26 19:06:33.368660584 +0000
+@@ -307,6 +307,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14001,7 +15664,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -607,7 +610,7 @@
+@@ -608,7 +611,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -14010,7 +15673,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -645,9 +648,9 @@
+@@ -646,9 +649,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14022,10 +15685,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/ebrowsing/plugins/Makefile.in kdebase-3.4.2/kcontrol/ebrowsing/plugins/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/ebrowsing/plugins/Makefile.in	2005-07-20 21:08:07.000000000 +0000
++++ kdebase-3.4.2/kcontrol/ebrowsing/plugins/Makefile.in	2005-07-26 19:06:33.234680952 +0000
+@@ -252,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14035,7 +15698,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -540,7 +543,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -14044,7 +15707,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -578,9 +581,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14056,10 +15719,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/ebrowsing/plugins/shorturi/Makefile.in kdebase-3.4.2/kcontrol/ebrowsing/plugins/shorturi/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/ebrowsing/plugins/shorturi/Makefile.in	2005-07-20 21:08:07.000000000 +0000
++++ kdebase-3.4.2/kcontrol/ebrowsing/plugins/shorturi/Makefile.in	2005-07-26 19:06:33.429651312 +0000
+@@ -286,6 +286,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14069,7 +15732,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -586,7 +589,7 @@
+@@ -587,7 +590,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14078,7 +15741,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -624,9 +627,9 @@
+@@ -625,9 +628,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14090,10 +15753,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/energy/Makefile.in kdebase-3.4.2/kcontrol/energy/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/energy/Makefile.in	2005-07-20 21:08:08.000000000 +0000
++++ kdebase-3.4.2/kcontrol/energy/Makefile.in	2005-07-26 19:06:33.491641888 +0000
+@@ -299,6 +299,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14103,7 +15766,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -598,7 +601,7 @@
+@@ -599,7 +602,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14112,7 +15775,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -636,9 +639,9 @@
+@@ -637,9 +640,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14124,10 +15787,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/energy/pics/Makefile.in kdebase-3.4.2/kcontrol/energy/pics/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/energy/pics/Makefile.in	2005-07-20 21:08:08.000000000 +0000
++++ kdebase-3.4.2/kcontrol/energy/pics/Makefile.in	2005-07-26 19:06:33.508639304 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14137,7 +15800,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -536,7 +539,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -14146,7 +15809,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -574,9 +577,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14158,10 +15821,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/filetypes/Makefile.in kdebase-3.4.2/kcontrol/filetypes/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/filetypes/Makefile.in	2005-07-20 21:08:08.000000000 +0000
++++ kdebase-3.4.2/kcontrol/filetypes/Makefile.in	2005-07-26 19:06:33.634620152 +0000
+@@ -307,6 +307,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14171,7 +15834,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -615,7 +618,7 @@
+@@ -616,7 +619,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14180,7 +15843,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -653,9 +656,9 @@
+@@ -654,9 +657,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14192,10 +15855,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/fonts/Makefile.in kdebase-3.4.2/kcontrol/fonts/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/fonts/Makefile.in	2005-07-20 21:08:08.000000000 +0000
++++ kdebase-3.4.2/kcontrol/fonts/Makefile.in	2005-07-26 19:06:33.681613008 +0000
+@@ -291,6 +291,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14205,7 +15868,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -592,7 +595,7 @@
+@@ -593,7 +596,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14214,7 +15877,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -630,9 +633,9 @@
+@@ -631,9 +634,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14226,10 +15889,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/icons/Makefile.in kdebase-3.4.2/kcontrol/icons/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/icons/Makefile.in	2005-07-20 21:08:08.000000000 +0000
++++ kdebase-3.4.2/kcontrol/icons/Makefile.in	2005-07-26 19:06:33.732605256 +0000
+@@ -293,6 +293,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14239,7 +15902,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -593,7 +596,7 @@
+@@ -594,7 +597,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14248,7 +15911,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -631,9 +634,9 @@
+@@ -632,9 +635,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14260,10 +15923,53 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -944,18 +947,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
+@@ -966,7 +969,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 
+@@ -1017,7 +1020,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.2.orig/kcontrol/info/Makefile.in kdebase-3.4.2/kcontrol/info/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/info/Makefile.in	2005-07-20 21:08:08.000000000 +0000
++++ kdebase-3.4.2/kcontrol/info/Makefile.in	2005-07-26 19:06:33.818592184 +0000
+@@ -288,6 +288,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14273,7 +15979,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -588,7 +591,7 @@
+@@ -589,7 +592,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14282,7 +15988,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -626,9 +629,9 @@
+@@ -627,9 +630,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14294,10 +16000,19 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -931,7 +934,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 ioports.desktop memory_solaris.cpp info_openbsd.cpp info_sgi.cpp sound.desktop memory_netbsd.cpp memory_sgi.cpp info_fbsd.cpp info_hpux.cpp info.h memory_tru64.cpp devices.desktop 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 
++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.2.orig/kcontrol/input/core/Makefile.in kdebase-3.4.2/kcontrol/input/core/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/input/core/Makefile.in	2005-07-20 21:08:08.000000000 +0000
++++ kdebase-3.4.2/kcontrol/input/core/Makefile.in	2005-07-26 19:06:33.943573184 +0000
+@@ -271,6 +271,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14307,7 +16022,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -563,7 +566,7 @@
+@@ -564,7 +567,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14316,7 +16031,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -601,9 +604,9 @@
+@@ -602,9 +605,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14328,10 +16043,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/input/Makefile.in kdebase-3.4.2/kcontrol/input/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/input/Makefile.in	2005-07-20 21:08:08.000000000 +0000
++++ kdebase-3.4.2/kcontrol/input/Makefile.in	2005-07-26 19:06:33.902579416 +0000
+@@ -304,6 +304,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14341,7 +16056,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -612,7 +615,7 @@
+@@ -613,7 +616,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14350,7 +16065,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -650,9 +653,9 @@
+@@ -651,9 +654,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14362,10 +16077,19 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -1092,7 +1095,7 @@
+ 	-rm -f  logitechmouse.moc mouse.moc
+ 
+ #>+ 2
+-KDE_DIST=consoleUserPerms mouse.desktop configure.in.bot mouse.h logitechmouse.h cursor_large.bdf logitechmouse.usermap cursor_small_white.pcf.gz kmousedlg.ui logitechmouse_base.ui configure.in.in cursor_large_white.pcf.gz Makefile.in cursor_large_black.pcf.gz Makefile.am 
++KDE_DIST=mouse.desktop consoleUserPerms configure.in.bot mouse.h logitechmouse.h cursor_large.bdf logitechmouse.usermap cursor_small_white.pcf.gz kmousedlg.ui logitechmouse_base.ui configure.in.in cursor_large_white.pcf.gz Makefile.in cursor_large_black.pcf.gz Makefile.am 
+ 
+ #>+ 5
+ clean-ui:
+diff -Nru kdebase-3.4.2.orig/kcontrol/input/pics/Makefile.in kdebase-3.4.2/kcontrol/input/pics/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/input/pics/Makefile.in	2005-07-20 21:08:08.000000000 +0000
++++ kdebase-3.4.2/kcontrol/input/pics/Makefile.in	2005-07-26 19:06:33.959570752 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14375,7 +16099,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -535,7 +538,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -14384,7 +16108,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -573,9 +576,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14396,10 +16120,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/input/xcursor/Makefile.in kdebase-3.4.2/kcontrol/input/xcursor/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/input/xcursor/Makefile.in	2005-07-20 21:08:08.000000000 +0000
++++ kdebase-3.4.2/kcontrol/input/xcursor/Makefile.in	2005-07-26 19:06:34.009563152 +0000
+@@ -274,6 +274,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14409,7 +16133,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -566,7 +569,7 @@
+@@ -567,7 +570,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14418,7 +16142,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -604,9 +607,9 @@
+@@ -605,9 +608,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14430,10 +16154,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/ioslaveinfo/Makefile.in kdebase-3.4.2/kcontrol/ioslaveinfo/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/ioslaveinfo/Makefile.in	2005-07-20 21:08:08.000000000 +0000
++++ kdebase-3.4.2/kcontrol/ioslaveinfo/Makefile.in	2005-07-26 19:06:34.057555856 +0000
+@@ -281,6 +281,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14443,7 +16167,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -577,7 +580,7 @@
+@@ -578,7 +581,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14452,7 +16176,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -615,9 +618,9 @@
+@@ -616,9 +619,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14464,10 +16188,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/joystick/Makefile.in kdebase-3.4.2/kcontrol/joystick/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/joystick/Makefile.in	2005-07-20 21:08:08.000000000 +0000
++++ kdebase-3.4.2/kcontrol/joystick/Makefile.in	2005-07-26 19:06:34.103548864 +0000
+@@ -289,6 +289,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14477,7 +16201,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -588,7 +591,7 @@
+@@ -589,7 +592,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14486,7 +16210,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -626,9 +629,9 @@
+@@ -627,9 +630,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14498,10 +16222,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/kcontrol/about/Makefile.in kdebase-3.4.2/kcontrol/kcontrol/about/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/kcontrol/about/Makefile.in	2005-07-20 21:08:08.000000000 +0000
++++ kdebase-3.4.2/kcontrol/kcontrol/about/Makefile.in	2005-07-26 19:06:34.210532600 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14511,7 +16235,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -538,7 +541,7 @@
+@@ -539,7 +542,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -14520,7 +16244,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -576,9 +579,9 @@
+@@ -577,9 +580,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14532,10 +16256,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/kcontrol/Makefile.in kdebase-3.4.2/kcontrol/kcontrol/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/kcontrol/Makefile.in	2005-07-20 21:08:08.000000000 +0000
++++ kdebase-3.4.2/kcontrol/kcontrol/Makefile.in	2005-07-26 19:06:34.193535184 +0000
+@@ -337,6 +337,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14545,7 +16269,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -654,7 +657,7 @@
+@@ -655,7 +658,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14554,7 +16278,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -692,9 +695,9 @@
+@@ -693,9 +696,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14566,10 +16290,93 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -1240,6 +1243,13 @@
+ mocs: indexwidget.moc
+ 
+ #>+ 3
++moduleiconview.moc: $(srcdir)/moduleiconview.h
++	$(MOC) $(srcdir)/moduleiconview.h -o moduleiconview.moc
++
++#>+ 2
++mocs: moduleiconview.moc
++
++#>+ 3
+ dockcontainer.moc: $(srcdir)/dockcontainer.h
+ 	$(MOC) $(srcdir)/dockcontainer.h -o dockcontainer.moc
+ 
+@@ -1254,13 +1264,6 @@
+ mocs: aboutwidget.moc
+ 
+ #>+ 3
+-moduleiconview.moc: $(srcdir)/moduleiconview.h
+-	$(MOC) $(srcdir)/moduleiconview.h -o moduleiconview.moc
+-
+-#>+ 2
+-mocs: moduleiconview.moc
+-
+-#>+ 3
+ proxywidget.moc: $(srcdir)/proxywidget.h
+ 	$(MOC) $(srcdir)/proxywidget.h -o proxywidget.moc
+ 
+@@ -1332,10 +1335,10 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  indexwidget.moc dockcontainer.moc aboutwidget.moc moduleiconview.moc proxywidget.moc helpwidget.moc quickhelp.moc main.moc modules.moc moduletreeview.moc toplevel.moc modulemenu.moc moduleIface.moc searchwidget.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.cpp modulemenu.h kinfocenterui.rc kinfocenter.desktop moduletreeview.h Makefile.in moduleiconview.h version.h cr128-app-kcontrol.png indexwidget.h 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:
+@@ -1347,23 +1350,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/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/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/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/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/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/32x32/apps/kcontrol.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/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/128x128/apps/kcontrol.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcontrol.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcontrol.png
+ 
+ #>+ 15
+ force-reedit:
+@@ -1404,7 +1407,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 moduleiconview.moc aboutwidget.moc dockcontainer.moc proxywidget.moc helpwidget.moc quickhelp.moc main.moc modules.moc moduletreeview.moc toplevel.moc searchwidget.moc moduleIface.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.2.orig/kcontrol/kded/Makefile.in kdebase-3.4.2/kcontrol/kded/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/kded/Makefile.in	2005-07-20 21:08:08.000000000 +0000
++++ kdebase-3.4.2/kcontrol/kded/Makefile.in	2005-07-26 19:06:34.270523480 +0000
+@@ -281,6 +281,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14579,7 +16386,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -577,7 +580,7 @@
+@@ -578,7 +581,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14588,7 +16395,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -615,9 +618,9 @@
+@@ -616,9 +619,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14600,10 +16407,19 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -918,7 +921,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.2.orig/kcontrol/kdm/Makefile.in kdebase-3.4.2/kcontrol/kdm/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/kdm/Makefile.in	2005-07-20 21:08:08.000000000 +0000
++++ kdebase-3.4.2/kcontrol/kdm/Makefile.in	2005-07-26 19:06:34.339512992 +0000
+@@ -290,6 +290,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14613,7 +16429,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -591,7 +594,7 @@
+@@ -592,7 +595,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14622,7 +16438,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -629,9 +632,9 @@
+@@ -630,9 +633,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14634,10 +16450,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/keys/Makefile.in kdebase-3.4.2/kcontrol/keys/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/keys/Makefile.in	2005-07-20 21:08:08.000000000 +0000
++++ kdebase-3.4.2/kcontrol/keys/Makefile.in	2005-07-26 19:06:34.438497944 +0000
+@@ -292,6 +292,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14647,7 +16463,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -593,7 +596,7 @@
+@@ -594,7 +597,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14656,7 +16472,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -631,9 +634,9 @@
+@@ -632,9 +635,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14668,10 +16484,53 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -1001,18 +1004,18 @@
+ mocs: treeview.moc
+ 
+ #>+ 3
+-modifiers.moc: $(srcdir)/modifiers.h
+-	$(MOC) $(srcdir)/modifiers.h -o modifiers.moc
++shortcuts.moc: $(srcdir)/shortcuts.h
++	$(MOC) $(srcdir)/shortcuts.h -o shortcuts.moc
+ 
+ #>+ 2
+-mocs: modifiers.moc
++mocs: shortcuts.moc
+ 
+ #>+ 3
+-shortcuts.moc: $(srcdir)/shortcuts.h
+-	$(MOC) $(srcdir)/shortcuts.h -o shortcuts.moc
++modifiers.moc: $(srcdir)/modifiers.h
++	$(MOC) $(srcdir)/modifiers.h -o modifiers.moc
+ 
+ #>+ 2
+-mocs: shortcuts.moc
++mocs: modifiers.moc
+ 
+ #>+ 3
+ keyconfig.moc: $(srcdir)/keyconfig.h
+@@ -1030,7 +1033,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  commandShortcuts.moc treeview.moc modifiers.moc shortcuts.moc keyconfig.moc main.moc
++	-rm -f  commandShortcuts.moc treeview.moc shortcuts.moc modifiers.moc keyconfig.moc main.moc
+ 
+ #>+ 2
+ KDE_DIST=keys.desktop commandShortcuts.h kaccelaction.h treeview.h win3.kksrc main.h kde4.kksrc shortcuts.h win4.kksrc mac4.kksrc khotkeys.h modifiers.h keyconfig.h keyconfig.cpp wm3.kksrc convertShortcuts.pl unix3.kksrc Makefile.in kde3.kksrc kaccel.upd Makefile.am 
+@@ -1081,7 +1084,7 @@
+ 
+ 
+ #>+ 11
+-kcm_keys_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/shortcuts.cpp $(srcdir)/modifiers.cpp $(srcdir)/main.cpp $(srcdir)/khotkeys.cpp $(srcdir)/treeview.cpp $(srcdir)/commandShortcuts.cpp  commandShortcuts.moc treeview.moc shortcuts.moc modifiers.moc main.moc
++kcm_keys_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/shortcuts.cpp $(srcdir)/modifiers.cpp $(srcdir)/main.cpp $(srcdir)/khotkeys.cpp $(srcdir)/treeview.cpp $(srcdir)/commandShortcuts.cpp  commandShortcuts.moc treeview.moc modifiers.moc shortcuts.moc main.moc
+ 	@echo 'creating kcm_keys_la.all_cpp.cpp ...'; \
+ 	rm -f kcm_keys_la.all_cpp.files kcm_keys_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kcm_keys_la.all_cpp.final; \
+diff -Nru kdebase-3.4.2.orig/kcontrol/kfontinst/kcmfontinst/Makefile.in kdebase-3.4.2/kcontrol/kfontinst/kcmfontinst/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/kfontinst/kcmfontinst/Makefile.in	2005-07-20 21:08:08.000000000 +0000
++++ kdebase-3.4.2/kcontrol/kfontinst/kcmfontinst/Makefile.in	2005-07-26 19:06:34.529484112 +0000
+@@ -291,6 +291,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14681,7 +16540,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -599,7 +602,7 @@
+@@ -600,7 +603,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14690,7 +16549,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -637,9 +640,9 @@
+@@ -638,9 +641,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14702,10 +16561,30 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -960,16 +963,16 @@
+ 
+ #>+ 13
+ install-kde-icons:
+-	$(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/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
+diff -Nru kdebase-3.4.2.orig/kcontrol/kfontinst/kfile-plugin/Makefile.in kdebase-3.4.2/kcontrol/kfontinst/kfile-plugin/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/kfontinst/kfile-plugin/Makefile.in	2005-07-20 21:08:08.000000000 +0000
++++ kdebase-3.4.2/kcontrol/kfontinst/kfile-plugin/Makefile.in	2005-07-26 19:06:34.556480008 +0000
+@@ -285,6 +285,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14715,7 +16594,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -581,7 +584,7 @@
+@@ -582,7 +585,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14724,7 +16603,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -619,9 +622,9 @@
+@@ -620,9 +623,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14736,10 +16615,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/kfontinst/kfontinst/Makefile.in kdebase-3.4.2/kcontrol/kfontinst/kfontinst/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/kfontinst/kfontinst/Makefile.in	2005-07-20 21:08:08.000000000 +0000
++++ kdebase-3.4.2/kcontrol/kfontinst/kfontinst/Makefile.in	2005-07-26 19:06:34.581476208 +0000
+@@ -293,6 +293,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14749,7 +16628,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -599,7 +602,7 @@
+@@ -600,7 +603,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -14758,7 +16637,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -637,9 +640,9 @@
+@@ -638,9 +641,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14770,10 +16649,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/kfontinst/kio/Makefile.in kdebase-3.4.2/kcontrol/kfontinst/kio/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/kfontinst/kio/Makefile.in	2005-07-20 21:08:08.000000000 +0000
++++ kdebase-3.4.2/kcontrol/kfontinst/kio/Makefile.in	2005-07-26 19:06:34.609471952 +0000
+@@ -289,6 +289,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14783,7 +16662,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -596,7 +599,7 @@
+@@ -597,7 +600,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14792,7 +16671,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -634,9 +637,9 @@
+@@ -635,9 +638,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14804,10 +16683,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/kfontinst/lib/Makefile.in kdebase-3.4.2/kcontrol/kfontinst/lib/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/kfontinst/lib/Makefile.in	2005-07-20 21:08:09.000000000 +0000
++++ kdebase-3.4.2/kcontrol/kfontinst/lib/Makefile.in	2005-07-26 19:06:34.634468152 +0000
+@@ -285,6 +285,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14817,7 +16696,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -587,7 +590,7 @@
+@@ -588,7 +591,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14826,7 +16705,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -625,9 +628,9 @@
+@@ -626,9 +629,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14838,10 +16717,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/kfontinst/Makefile.in kdebase-3.4.2/kcontrol/kfontinst/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/kfontinst/Makefile.in	2005-07-20 21:08:08.000000000 +0000
++++ kdebase-3.4.2/kcontrol/kfontinst/Makefile.in	2005-07-26 19:06:34.465493840 +0000
+@@ -264,6 +264,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14851,7 +16730,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -556,7 +559,7 @@
+@@ -557,7 +560,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -14860,7 +16739,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -594,9 +597,9 @@
+@@ -595,9 +598,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14872,10 +16751,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/kfontinst/thumbnail/Makefile.in kdebase-3.4.2/kcontrol/kfontinst/thumbnail/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/kfontinst/thumbnail/Makefile.in	2005-07-20 21:08:09.000000000 +0000
++++ kdebase-3.4.2/kcontrol/kfontinst/thumbnail/Makefile.in	2005-07-26 19:06:34.661464048 +0000
+@@ -286,6 +286,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14885,7 +16764,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -582,7 +585,7 @@
+@@ -583,7 +586,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14894,7 +16773,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -620,9 +623,9 @@
+@@ -621,9 +624,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14906,10 +16785,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/kfontinst/viewpart/Makefile.in kdebase-3.4.2/kcontrol/kfontinst/viewpart/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/kfontinst/viewpart/Makefile.in	2005-07-20 21:08:09.000000000 +0000
++++ kdebase-3.4.2/kcontrol/kfontinst/viewpart/Makefile.in	2005-07-26 19:06:34.700458120 +0000
+@@ -302,6 +302,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14919,7 +16798,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -603,7 +606,7 @@
+@@ -604,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14928,7 +16807,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -641,9 +644,9 @@
+@@ -642,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14940,10 +16819,70 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -1004,11 +1007,11 @@
+ 
+ 
+ #>+ 3
+-FontViewPart.moc: $(srcdir)/FontViewPart.h
+-	$(MOC) $(srcdir)/FontViewPart.h -o FontViewPart.moc
++FontViewerApp.moc: $(srcdir)/FontViewerApp.h
++	$(MOC) $(srcdir)/FontViewerApp.h -o FontViewerApp.moc
+ 
+ #>+ 2
+-mocs: FontViewPart.moc
++mocs: FontViewerApp.moc
+ 
+ #>+ 3
+ FontViewPartFactory.moc: $(srcdir)/FontViewPartFactory.h
+@@ -1018,11 +1021,11 @@
+ mocs: FontViewPartFactory.moc
+ 
+ #>+ 3
+-FontViewerApp.moc: $(srcdir)/FontViewerApp.h
+-	$(MOC) $(srcdir)/FontViewerApp.h -o FontViewerApp.moc
++FontViewPart.moc: $(srcdir)/FontViewPart.h
++	$(MOC) $(srcdir)/FontViewPart.h -o FontViewPart.moc
+ 
+ #>+ 2
+-mocs: FontViewerApp.moc
++mocs: FontViewPart.moc
+ 
+ #>+ 3
+ FontPreview.moc: $(srcdir)/FontPreview.h
+@@ -1033,7 +1036,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  FontViewPart.moc FontViewPartFactory.moc FontViewerApp.moc FontPreview.moc
++	-rm -f  FontViewerApp.moc FontViewPartFactory.moc FontViewPart.moc FontPreview.moc
+ 
+ #>+ 2
+ KDE_DIST=kfontviewui.rc kfontviewpart.desktop kfontview.desktop Makefile.in Makefile.am kfontviewpart.rc 
+@@ -1084,7 +1087,7 @@
+ 
+ 
+ #>+ 11
+-libkfontviewpart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/FontViewPart.cpp $(srcdir)/FontViewPartFactory.cpp $(srcdir)/FontPreview.cpp  FontViewPartFactory.moc FontViewPart.moc FontPreview.moc
++libkfontviewpart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/FontViewPart.cpp $(srcdir)/FontViewPartFactory.cpp $(srcdir)/FontPreview.cpp  FontViewPart.moc FontViewPartFactory.moc FontPreview.moc
+ 	@echo 'creating libkfontviewpart_la.all_cpp.cpp ...'; \
+ 	rm -f libkfontviewpart_la.all_cpp.files libkfontviewpart_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libkfontviewpart_la.all_cpp.final; \
+@@ -1128,9 +1131,9 @@
+ FontPreview.lo: FontPreview.moc 
+ FontPreview.o: FontPreview.moc 
+ nmcheck-am: nmcheck
+-FontViewPart.o: FontViewPart.moc 
+ FontViewPartFactory.lo: FontViewPartFactory.moc 
++FontViewPart.o: FontViewPart.moc 
+ FontViewPart.lo: FontViewPart.moc 
+-FontViewPartFactory.o: FontViewPartFactory.moc 
+ FontViewerApp.lo: FontViewerApp.moc 
++FontViewPartFactory.o: FontViewPartFactory.moc 
+ FontViewerApp.o: FontViewerApp.moc 
+diff -Nru kdebase-3.4.2.orig/kcontrol/kicker/Makefile.in kdebase-3.4.2/kcontrol/kicker/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/kicker/Makefile.in	2005-07-20 21:08:09.000000000 +0000
++++ kdebase-3.4.2/kcontrol/kicker/Makefile.in	2005-07-26 19:06:34.790444440 +0000
+@@ -293,6 +293,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14953,7 +16892,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -604,7 +607,7 @@
+@@ -605,7 +608,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14962,7 +16901,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -642,9 +645,9 @@
+@@ -643,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14974,10 +16913,48 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -978,18 +981,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
+@@ -1035,10 +1038,10 @@
+ 
+ #>+ 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 lookandfeeltab_kcm.cpp uninstall.desktop Makefile.am 
++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 
+ 
+ #>+ 4
+ clean-idl:
+diff -Nru kdebase-3.4.2.orig/kcontrol/kio/Makefile.in kdebase-3.4.2/kcontrol/kio/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/kio/Makefile.in	2005-07-20 21:08:09.000000000 +0000
++++ kdebase-3.4.2/kcontrol/kio/Makefile.in	2005-07-26 19:06:34.963418144 +0000
+@@ -313,6 +313,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14987,7 +16964,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -634,7 +637,7 @@
+@@ -635,7 +638,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14996,7 +16973,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -672,9 +675,9 @@
+@@ -673,9 +676,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15008,10 +16985,57 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -1161,18 +1164,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
+@@ -1246,10 +1249,10 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  uagentproviderdlg.moc smbrodlg.moc socks.moc kmanualproxydlg.moc kproxydlg.moc useragentdlg.moc main.moc kcookiesmain.moc kcookiespolicies.moc kcookiesmanagement.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 kio_ftprc.kcfg kioslave.kcfg socksbase.ui netpref.h main.h smbrodlg.h cache.desktop kio_ftprc.kcfgc cookies.desktop kenvvarproxydlg.h ksaveioconfig.h uagentproviderdlg_ui.ui cache_ui.ui useragentdlg_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 
++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:
+@@ -1311,7 +1314,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 kcookiesmanagement.moc kcookiespolicies.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.2.orig/kcontrol/kio/uasproviders/Makefile.in kdebase-3.4.2/kcontrol/kio/uasproviders/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/kio/uasproviders/Makefile.in	2005-07-20 21:08:09.000000000 +0000
++++ kdebase-3.4.2/kcontrol/kio/uasproviders/Makefile.in	2005-07-26 19:06:34.982415256 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15021,7 +17045,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -543,7 +546,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15030,7 +17054,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -581,9 +584,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15042,10 +17066,19 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -744,7 +747,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 Makefile.am mozoncurrent12.desktop 
++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.2.orig/kcontrol/knotify/Makefile.in kdebase-3.4.2/kcontrol/knotify/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/knotify/Makefile.in	2005-07-20 21:08:09.000000000 +0000
++++ kdebase-3.4.2/kcontrol/knotify/Makefile.in	2005-07-26 19:06:35.032407656 +0000
+@@ -302,6 +302,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15055,7 +17088,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -604,7 +607,7 @@
+@@ -605,7 +608,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15064,7 +17097,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -642,9 +645,9 @@
+@@ -643,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15076,10 +17109,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/knotify/sounds/Makefile.in kdebase-3.4.2/kcontrol/knotify/sounds/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/knotify/sounds/Makefile.in	2005-07-20 21:08:09.000000000 +0000
++++ kdebase-3.4.2/kcontrol/knotify/sounds/Makefile.in	2005-07-26 19:06:35.055404160 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15089,7 +17122,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -644,7 +647,7 @@
+@@ -645,7 +648,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15098,7 +17131,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -682,9 +685,9 @@
+@@ -683,9 +686,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15110,10 +17143,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/konq/Makefile.in kdebase-3.4.2/kcontrol/konq/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/konq/Makefile.in	2005-07-20 21:08:10.000000000 +0000
++++ kdebase-3.4.2/kcontrol/konq/Makefile.in	2005-07-26 19:06:35.135392000 +0000
+@@ -292,6 +292,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15123,7 +17156,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -604,7 +607,7 @@
+@@ -605,7 +608,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15132,7 +17165,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -642,9 +645,9 @@
+@@ -643,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15144,10 +17177,19 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -1039,7 +1042,7 @@
+ 	-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 Makefile.am desktop.desktop 
++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:
+diff -Nru kdebase-3.4.2.orig/kcontrol/konqhtml/Makefile.in kdebase-3.4.2/kcontrol/konqhtml/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/konqhtml/Makefile.in	2005-07-20 21:08:11.000000000 +0000
++++ kdebase-3.4.2/kcontrol/konqhtml/Makefile.in	2005-07-26 19:06:35.231377408 +0000
+@@ -289,6 +289,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15157,7 +17199,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -597,7 +600,7 @@
+@@ -598,7 +601,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15166,7 +17208,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -635,9 +638,9 @@
+@@ -636,9 +639,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15178,10 +17220,53 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -1008,25 +1011,25 @@
+ 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 javaopts.h khttpoptdlg.h jspolicies.h domainlistview.h khtml_behavior.desktop khtml_fonts.desktop Makefile.in uninstall.desktop Makefile.am 
++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 
+ 
+ #>+ 5
+ clean-ui:
+@@ -1080,7 +1083,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.2.orig/kcontrol/konsole/Makefile.in kdebase-3.4.2/kcontrol/konsole/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/konsole/Makefile.in	2005-07-20 21:08:11.000000000 +0000
++++ kdebase-3.4.2/kcontrol/konsole/Makefile.in	2005-07-26 19:06:35.281369808 +0000
+@@ -289,6 +289,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15191,7 +17276,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -592,7 +595,7 @@
+@@ -593,7 +596,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15200,7 +17285,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -630,9 +633,9 @@
+@@ -631,9 +634,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15212,10 +17297,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/krdb/ad/Makefile.in kdebase-3.4.2/kcontrol/krdb/ad/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/krdb/ad/Makefile.in	2005-07-20 21:08:11.000000000 +0000
++++ kdebase-3.4.2/kcontrol/krdb/ad/Makefile.in	2005-07-26 19:06:35.330362360 +0000
+@@ -250,6 +250,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15225,7 +17310,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -545,7 +548,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15234,7 +17319,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -583,9 +586,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15246,10 +17331,19 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binSCRIPTS: $(bin_SCRIPTS)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -766,7 +769,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-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 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.2.orig/kcontrol/krdb/kcs/Makefile.in kdebase-3.4.2/kcontrol/krdb/kcs/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/krdb/kcs/Makefile.in	2005-07-20 21:08:11.000000000 +0000
++++ kdebase-3.4.2/kcontrol/krdb/kcs/Makefile.in	2005-07-26 19:06:35.348359624 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15259,7 +17353,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -542,7 +545,7 @@
+@@ -543,7 +546,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15268,7 +17362,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -580,9 +583,9 @@
+@@ -581,9 +584,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15280,10 +17374,19 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -745,7 +748,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 Windows95.kcsrc CDE.kcsrc YellowOnBlue.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.2.orig/kcontrol/krdb/Makefile.in kdebase-3.4.2/kcontrol/krdb/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/krdb/Makefile.in	2005-07-20 21:08:11.000000000 +0000
++++ kdebase-3.4.2/kcontrol/krdb/Makefile.in	2005-07-26 19:06:35.307365856 +0000
+@@ -293,6 +293,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15293,7 +17396,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -590,7 +593,7 @@
+@@ -591,7 +594,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15302,7 +17405,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -628,9 +631,9 @@
+@@ -629,9 +632,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15314,10 +17417,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/krdb/pics/Makefile.in kdebase-3.4.2/kcontrol/krdb/pics/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/krdb/pics/Makefile.in	2005-07-20 21:08:11.000000000 +0000
++++ kdebase-3.4.2/kcontrol/krdb/pics/Makefile.in	2005-07-26 19:06:35.000000000 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15327,7 +17430,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -536,7 +539,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15336,7 +17439,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -574,9 +577,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15348,10 +17451,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/krdb/themes/HighContrastDark/Makefile.in kdebase-3.4.2/kcontrol/krdb/themes/HighContrastDark/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/krdb/themes/HighContrastDark/Makefile.in	2005-07-20 21:08:11.000000000 +0000
++++ kdebase-3.4.2/kcontrol/krdb/themes/HighContrastDark/Makefile.in	2005-07-26 19:06:35.000000000 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15361,7 +17464,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -536,7 +539,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15370,7 +17473,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -574,9 +577,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15382,10 +17485,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/krdb/themes/HighContrastDark-big/Makefile.in kdebase-3.4.2/kcontrol/krdb/themes/HighContrastDark-big/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/krdb/themes/HighContrastDark-big/Makefile.in	2005-07-20 21:08:11.000000000 +0000
++++ kdebase-3.4.2/kcontrol/krdb/themes/HighContrastDark-big/Makefile.in	2005-07-26 19:06:35.000000000 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15395,7 +17498,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -536,7 +539,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15404,7 +17507,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -574,9 +577,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15416,10 +17519,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/krdb/themes/HighContrastLight/Makefile.in kdebase-3.4.2/kcontrol/krdb/themes/HighContrastLight/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/krdb/themes/HighContrastLight/Makefile.in	2005-07-20 21:08:11.000000000 +0000
++++ kdebase-3.4.2/kcontrol/krdb/themes/HighContrastLight/Makefile.in	2005-07-26 19:06:35.000000000 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15429,7 +17532,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -536,7 +539,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15438,7 +17541,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -574,9 +577,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15450,10 +17553,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/krdb/themes/HighContrastLight-big/Makefile.in kdebase-3.4.2/kcontrol/krdb/themes/HighContrastLight-big/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/krdb/themes/HighContrastLight-big/Makefile.in	2005-07-20 21:08:11.000000000 +0000
++++ kdebase-3.4.2/kcontrol/krdb/themes/HighContrastLight-big/Makefile.in	2005-07-26 19:06:35.000000000 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15463,7 +17566,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -536,7 +539,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15472,7 +17575,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -574,9 +577,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15484,10 +17587,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/krdb/themes/KDE_Classic/Makefile.in kdebase-3.4.2/kcontrol/krdb/themes/KDE_Classic/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/krdb/themes/KDE_Classic/Makefile.in	2005-07-20 21:08:11.000000000 +0000
++++ kdebase-3.4.2/kcontrol/krdb/themes/KDE_Classic/Makefile.in	2005-07-26 19:06:35.000000000 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15497,7 +17600,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -536,7 +539,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15506,7 +17609,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -574,9 +577,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15518,10 +17621,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/krdb/themes/Keramik/Makefile.in kdebase-3.4.2/kcontrol/krdb/themes/Keramik/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/krdb/themes/Keramik/Makefile.in	2005-07-20 21:08:11.000000000 +0000
++++ kdebase-3.4.2/kcontrol/krdb/themes/Keramik/Makefile.in	2005-07-26 19:06:35.000000000 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15531,7 +17634,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -536,7 +539,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15540,7 +17643,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -574,9 +577,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15552,10 +17655,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/krdb/themes/Makefile.in kdebase-3.4.2/kcontrol/krdb/themes/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/krdb/themes/Makefile.in	2005-07-20 21:08:11.000000000 +0000
++++ kdebase-3.4.2/kcontrol/krdb/themes/Makefile.in	2005-07-26 19:06:35.000000000 +0000
+@@ -252,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15565,7 +17668,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -543,7 +546,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -15574,7 +17677,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -581,9 +584,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15586,10 +17689,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/krdb/themes/Plastik/Makefile.in kdebase-3.4.2/kcontrol/krdb/themes/Plastik/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/krdb/themes/Plastik/Makefile.in	2005-07-20 21:08:11.000000000 +0000
++++ kdebase-3.4.2/kcontrol/krdb/themes/Plastik/Makefile.in	2005-07-26 19:06:35.000000000 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15599,7 +17702,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -536,7 +539,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15608,7 +17711,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -574,9 +577,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15620,10 +17723,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/krdb/themes/Platinum/Makefile.in kdebase-3.4.2/kcontrol/krdb/themes/Platinum/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/krdb/themes/Platinum/Makefile.in	2005-07-20 21:08:11.000000000 +0000
++++ kdebase-3.4.2/kcontrol/krdb/themes/Platinum/Makefile.in	2005-07-26 19:06:35.000000000 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15633,7 +17736,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -536,7 +539,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15642,7 +17745,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -574,9 +577,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15654,10 +17757,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/krdb/themes/Redmond/Makefile.in kdebase-3.4.2/kcontrol/krdb/themes/Redmond/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/krdb/themes/Redmond/Makefile.in	2005-07-20 21:08:11.000000000 +0000
++++ kdebase-3.4.2/kcontrol/krdb/themes/Redmond/Makefile.in	2005-07-26 19:06:35.000000000 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15667,7 +17770,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -536,7 +539,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15676,7 +17779,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -574,9 +577,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15688,10 +17791,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/krdb/themes/Sunshine/Makefile.in kdebase-3.4.2/kcontrol/krdb/themes/Sunshine/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/krdb/themes/Sunshine/Makefile.in	2005-07-20 21:08:11.000000000 +0000
++++ kdebase-3.4.2/kcontrol/krdb/themes/Sunshine/Makefile.in	2005-07-26 19:06:35.000000000 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15701,7 +17804,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -536,7 +539,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15710,7 +17813,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -574,9 +577,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15722,10 +17825,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/krdb/themes/YellowOnBlue/Makefile.in kdebase-3.4.2/kcontrol/krdb/themes/YellowOnBlue/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/krdb/themes/YellowOnBlue/Makefile.in	2005-07-20 21:08:11.000000000 +0000
++++ kdebase-3.4.2/kcontrol/krdb/themes/YellowOnBlue/Makefile.in	2005-07-26 19:06:35.000000000 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15735,7 +17838,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -536,7 +539,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15744,7 +17847,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -574,9 +577,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15756,10 +17859,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/krdb/themes/YellowOnBlue-big/Makefile.in kdebase-3.4.2/kcontrol/krdb/themes/YellowOnBlue-big/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/krdb/themes/YellowOnBlue-big/Makefile.in	2005-07-20 21:08:11.000000000 +0000
++++ kdebase-3.4.2/kcontrol/krdb/themes/YellowOnBlue-big/Makefile.in	2005-07-26 19:06:35.000000000 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15769,7 +17872,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -536,7 +539,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15778,7 +17881,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -574,9 +577,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15790,10 +17893,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/kthememanager/Makefile.in kdebase-3.4.2/kcontrol/kthememanager/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/kthememanager/Makefile.in	2005-07-20 21:08:11.000000000 +0000
++++ kdebase-3.4.2/kcontrol/kthememanager/Makefile.in	2005-07-26 19:06:35.000000000 +0000
+@@ -293,6 +293,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15803,7 +17906,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -595,7 +598,7 @@
+@@ -596,7 +599,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15812,7 +17915,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -633,9 +636,9 @@
+@@ -634,9 +637,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15824,10 +17927,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/launch/Makefile.in kdebase-3.4.2/kcontrol/launch/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/launch/Makefile.in	2005-07-20 21:08:11.000000000 +0000
++++ kdebase-3.4.2/kcontrol/launch/Makefile.in	2005-07-26 19:06:35.000000000 +0000
+@@ -284,6 +284,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15837,7 +17940,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -579,7 +582,7 @@
+@@ -580,7 +583,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15846,7 +17949,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -617,9 +620,9 @@
+@@ -618,9 +621,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15858,10 +17961,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/locale/default/Makefile.in kdebase-3.4.2/kcontrol/locale/default/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/locale/default/Makefile.in	2005-07-20 21:08:11.000000000 +0000
++++ kdebase-3.4.2/kcontrol/locale/default/Makefile.in	2005-07-26 19:06:35.000000000 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15871,7 +17974,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -535,7 +538,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15880,7 +17983,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -573,9 +576,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15892,10 +17995,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/locale/Makefile.in kdebase-3.4.2/kcontrol/locale/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/locale/Makefile.in	2005-07-20 21:08:11.000000000 +0000
++++ kdebase-3.4.2/kcontrol/locale/Makefile.in	2005-07-26 19:06:35.000000000 +0000
+@@ -307,6 +307,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15905,7 +18008,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -605,7 +608,7 @@
+@@ -606,7 +609,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15914,7 +18017,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -643,9 +646,9 @@
+@@ -644,9 +647,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15926,10 +18029,58 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -1065,11 +1068,11 @@
+ mocs: klocalesample.moc
+ 
+ #>+ 3
+-localeother.moc: $(srcdir)/localeother.h
+-	$(MOC) $(srcdir)/localeother.h -o localeother.moc
++toplevel.moc: $(srcdir)/toplevel.h
++	$(MOC) $(srcdir)/toplevel.h -o toplevel.moc
+ 
+ #>+ 2
+-mocs: localeother.moc
++mocs: toplevel.moc
+ 
+ #>+ 3
+ localemon.moc: $(srcdir)/localemon.h
+@@ -1079,11 +1082,11 @@
+ mocs: localemon.moc
+ 
+ #>+ 3
+-toplevel.moc: $(srcdir)/toplevel.h
+-	$(MOC) $(srcdir)/toplevel.h -o toplevel.moc
++localeother.moc: $(srcdir)/localeother.h
++	$(MOC) $(srcdir)/localeother.h -o localeother.moc
+ 
+ #>+ 2
+-mocs: toplevel.moc
++mocs: localeother.moc
+ 
+ #>+ 3
+ kcmlocale.moc: $(srcdir)/kcmlocale.h
+@@ -1101,7 +1104,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  localetime.moc klocalesample.moc localeother.moc localemon.moc toplevel.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 
+@@ -1152,7 +1155,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 toplevel.moc localemon.moc localeother.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.2.orig/kcontrol/locale/pics/Makefile.in kdebase-3.4.2/kcontrol/locale/pics/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/locale/pics/Makefile.in	2005-07-20 21:08:11.000000000 +0000
++++ kdebase-3.4.2/kcontrol/locale/pics/Makefile.in	2005-07-26 19:06:35.000000000 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15939,7 +18090,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -535,7 +538,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15948,7 +18099,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -573,9 +576,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15960,10 +18111,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/Makefile.in kdebase-3.4.2/kcontrol/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/Makefile.in	2005-07-20 21:08:06.000000000 +0000
++++ kdebase-3.4.2/kcontrol/Makefile.in	2005-07-26 19:06:31.000000000 +0000
+@@ -258,6 +258,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15973,7 +18124,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -563,7 +566,7 @@
+@@ -564,7 +567,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -15982,7 +18133,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -601,9 +604,9 @@
+@@ -602,9 +605,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15994,10 +18145,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/nics/Makefile.in kdebase-3.4.2/kcontrol/nics/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/nics/Makefile.in	2005-07-20 21:08:11.000000000 +0000
++++ kdebase-3.4.2/kcontrol/nics/Makefile.in	2005-07-26 19:06:35.000000000 +0000
+@@ -281,6 +281,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16007,7 +18158,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -577,7 +580,7 @@
+@@ -578,7 +581,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16016,7 +18167,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -615,9 +618,9 @@
+@@ -616,9 +619,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16028,10 +18179,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/performance/Makefile.in kdebase-3.4.2/kcontrol/performance/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/performance/Makefile.in	2005-07-20 21:08:11.000000000 +0000
++++ kdebase-3.4.2/kcontrol/performance/Makefile.in	2005-07-26 19:06:35.000000000 +0000
+@@ -290,6 +290,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16041,7 +18192,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -592,7 +595,7 @@
+@@ -593,7 +596,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16050,7 +18201,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -630,9 +633,9 @@
+@@ -631,9 +634,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16062,10 +18213,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/pics/Makefile.in kdebase-3.4.2/kcontrol/pics/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/pics/Makefile.in	2005-07-20 21:08:11.000000000 +0000
++++ kdebase-3.4.2/kcontrol/pics/Makefile.in	2005-07-26 19:06:36.000000000 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16075,7 +18226,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -523,7 +526,7 @@
+@@ -524,7 +527,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -16084,7 +18235,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -561,9 +564,9 @@
+@@ -562,9 +565,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16096,10 +18247,1034 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -707,548 +710,548 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=cr48-app-stylesheet.png cr32-app-input_devices_settings.png cr64-app-kcmx.png cr22-app-arts.png cr64-app-locale.png cr48-app-kcmx.png cr16-app-kcmmemory.png cr32-app-background.png cr128-app-kcmpartitions.png cr48-app-input_devices_settings.png crsc-app-samba.svgz cr32-app-cache.png cr64-app-proxy.png cr22-app-kscreensaver.png cr48-app-multimedia.png cr22-app-hwinfo.png cr32-app-kcmx.png cr48-app-date.png cr48-app-bell.png cr32-app-style.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 cr64-app-hwinfo.png cr48-app-key_bindings.png cr22-app-energy.png cr128-app-fonts.png cr16-app-iconthemes.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 cr48-app-colors.png cr64-app-kcmpci.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 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 cr32-app-keyboard_layout.png cr22-app-kcmx.png cr128-app-kcmdf.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 cr32-app-kcmprocessor.png cr64-app-kcmmemory.png cr128-app-help_index.png cr22-app-cache.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 cr32-app-kcmkwm.png cr48-app-access.png cr22-app-bell.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 cr22-app-kcmkwm.png cr32-app-kscreensaver.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 cr48-app-kthememgr.png cr128-app-bell.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 cr64-app-energy_star.png cr16-app-hwinfo.png cr64-app-background.png cr22-app-kthememgr.png cr32-app-kcmpartitions.png cr22-app-background.png cr128-app-kcmmemory.png cr22-app-date.png cr32-app-arts.png cr16-app-bell.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 crsc-app-kcmkwm.svgz cr32-app-kcmkicker.png 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 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 cr64-app-bell.png cr128-app-date.png crsc-app-arts.svgz cr128-app-multimedia.png cr16-app-cookie.png cr64-app-kdmconfig.png cr64-app-kcmdf.png cr22-app-access.png cr48-app-samba.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 cr48-app-background.png cr128-app-personal.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 cr22-app-fonts.png cr16-app-kthememgr.png cr32-app-iconthemes.png cr22-app-colors.png cr16-app-filetypes.png cr16-app-kcmdevices.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/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-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/background.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)/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
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cache.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpci.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/arts.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bell.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
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-fonts.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/fonts.svgz
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy_star.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/proxy.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kscreensaver.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/looknfeel.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-locale.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/locale.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/personal.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kthememgr.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdf.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/personal.png
++	$(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-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-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdevices.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/colors.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/hwinfo.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/colors.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/looknfeel.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmx.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/agent.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/enhanced_browsing.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmprocessor.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmprocessor.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/background.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-input_devices_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/input_devices_settings.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy_star.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/stylesheet.png
++	$(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)/cr128-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/arts.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fonts.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-kcmdevices.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmdevices.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/locale.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)/cr128-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/proxy.png
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/access.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/bell.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/date.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cookie.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-access.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/access.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/colors.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-kcmx.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmx.svgz
++	$(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-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/hwinfo.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/multimedia.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmkwm.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/iconthemes.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kdmconfig.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kdmconfig.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdf.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/key_bindings.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmdevices.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/icons.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/looknfeel.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)/cr128-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpci.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)/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-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/help_index.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)/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)/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)/cr16-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/locale.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/access.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/filetypes.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/filetypes.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cookie.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/arts.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)/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)/cr32-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kscreensaver.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/help_index.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/bell.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/samba.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/multimedia.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkwm.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/enhanced_browsing.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/key_bindings.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/hwinfo.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clock.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmdrkonqi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdrkonqi.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)/cr64-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/style.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/iconthemes.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/background.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)/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)/cr16-app-kcmprocessor.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmprocessor.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kthememgr.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/samba.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/usb.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/stylesheet.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdmconfig.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/style.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-bell.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/bell.svgz
++	$(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)/cr48-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard_layout.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/bell.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/access.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cache.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/personal.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/filetypes.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cookie.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/proxy.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/personal.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/date.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/key_bindings.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/help_index.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmsystem.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmsystem.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/hwinfo.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/hwinfo.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmkwm.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/multimedia.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-date.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/date.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/filetypes.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cache.png
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpartitions.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmmemory.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/personal.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)/cr128-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/samba.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-samba.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/samba.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdevices.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/background.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmsystem.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsystem.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/proxy.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy_star.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpartitions.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-filetypes.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/filetypes.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/fonts.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/locale.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/locale.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/stylesheet.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/agent.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/access.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/access.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/date.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdmconfig.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-background.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/background.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cookie.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cookie.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-stylesheet.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/stylesheet.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/arts.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bell.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/hwinfo.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/help_index.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/personal.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/knotify.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/personal.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkwm.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-cache.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/cache.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkwm.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/cache.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/fonts.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/enhanced_browsing.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kscreensaver.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmx.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkicker.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/key_bindings.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/filetypes.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmemory.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpartitions.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmsystem.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsystem.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmidi.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-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdevices.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmopengl.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmopengl.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/locale.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdmconfig.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/filetypes.png
+ 	$(INSTALL_DATA) $(srcdir)/cr128-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/access.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmemory.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/proxy.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)/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)/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)/cr128-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy_star.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/icons.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/date.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/fonts.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmkwm.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/multimedia.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-hwinfo.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hwinfo.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscreensaver.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy_star.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knotify.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/help_index.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/filetypes.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdf.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/iconthemes.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmscsi.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard_layout.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)/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)/cr48-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/usb.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmx.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/colors.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)/cr64-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/key_bindings.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/icons.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmidi.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmdevices.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/stylesheet.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/background.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-kcmkwm.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmkwm.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/samba.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmsound.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsound.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmsound.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsound.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkicker.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-colors.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/colors.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/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)/cr16-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/usb.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clock.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)/cr32-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard_layout.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)/cr32-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/arts.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpci.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/samba.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmidi.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bell.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/energy.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmscsi.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscreensaver.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-arts.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/arts.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/keyboard.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/style.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)/cr32-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cache.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmx.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-hwinfo.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hwinfo.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)/cr48-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/icons.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/background.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-input_devices_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/input_devices_settings.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdevices.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpartitions.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)/cr22-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/stylesheet.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmmemory.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/agent.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cache.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmscsi.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkicker.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/help_index.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpci.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/arts.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/looknfeel.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/date.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fonts.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/samba.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kscreensaver.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpartitions.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)/cr32-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/iconthemes.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/key_bindings.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/colors.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/style.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-energy.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/energy.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/background.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/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)/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/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/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/32x32/apps/looknfeel.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kthememgr.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cache.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpci.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/arts.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bell.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/fonts.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy_star.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/proxy.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kscreensaver.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/looknfeel.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/locale.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/personal.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kthememgr.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdf.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/personal.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/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/128x128/apps/kcmdevices.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/colors.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/hwinfo.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/colors.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/looknfeel.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmx.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/agent.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/enhanced_browsing.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmprocessor.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/background.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/input_devices_settings.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy_star.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/stylesheet.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/128x128/apps/arts.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fonts.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmdevices.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/locale.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/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/128x128/apps/proxy.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/access.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/bell.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/date.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cookie.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/access.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/colors.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmx.svgz
++	-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/hwinfo.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/multimedia.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmkwm.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/iconthemes.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kdmconfig.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kdmconfig.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdf.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/key_bindings.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmdevices.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/icons.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/looknfeel.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kthememgr.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpci.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/stylesheet.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/locale.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/access.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/filetypes.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/filetypes.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cookie.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/arts.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/32x32/apps/kscreensaver.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/help_index.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/bell.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/samba.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/multimedia.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkwm.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/enhanced_browsing.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/key_bindings.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/hwinfo.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clock.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdrkonqi.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/looknfeel.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/style.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/iconthemes.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/background.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/16x16/apps/kcmprocessor.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kthememgr.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/samba.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/usb.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/stylesheet.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdmconfig.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/style.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/bell.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/locale.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard_layout.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/bell.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/access.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cache.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/48x48/apps/filetypes.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cookie.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/proxy.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/personal.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/date.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/key_bindings.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/help_index.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmsystem.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/hwinfo.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/hwinfo.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmkwm.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/multimedia.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/date.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/filetypes.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cache.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpartitions.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmmemory.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kthememgr.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/scalable/apps/samba.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdevices.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/background.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsystem.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/proxy.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy_star.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpartitions.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/filetypes.svgz
++	-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/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/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/22x22/apps/locale.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/locale.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/stylesheet.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/agent.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/access.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/access.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/16x16/apps/kdmconfig.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/background.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cookie.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/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/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/keyboard_layout.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/arts.svgz
++	-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/scalable/apps/stylesheet.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/arts.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/128x128/apps/kscreensaver.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/hwinfo.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/help_index.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/personal.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/knotify.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/personal.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkwm.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/32x32/apps/kcmkwm.png
++	-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/48x48/apps/keyboard.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/personal.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/16x16/apps/fonts.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/enhanced_browsing.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kscreensaver.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmx.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkicker.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/key_bindings.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/filetypes.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmemory.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpartitions.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsystem.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmidi.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/kcmdevices.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmopengl.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/locale.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdmconfig.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/128x128/apps/access.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmemory.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/proxy.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/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/16x16/apps/multimedia.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/enhanced_browsing.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy_star.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/icons.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/date.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/fonts.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmkwm.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/multimedia.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hwinfo.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscreensaver.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy_star.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knotify.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/help_index.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/filetypes.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdf.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/iconthemes.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmscsi.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard_layout.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/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/48x48/apps/usb.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmx.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/colors.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/64x64/apps/key_bindings.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/icons.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmidi.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmdevices.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/stylesheet.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/background.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmkwm.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/samba.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsound.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsound.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkicker.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/colors.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/knotify.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/input_devices_settings.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/usb.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clock.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/32x32/apps/keyboard_layout.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/32x32/apps/arts.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpci.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/samba.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmidi.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bell.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/energy.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmscsi.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscreensaver.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/arts.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/keyboard.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/style.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/32x32/apps/cache.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmx.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hwinfo.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/48x48/apps/icons.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/background.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/input_devices_settings.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdevices.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpartitions.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/64x64/apps/knotify.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/stylesheet.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmmemory.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/agent.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cache.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmscsi.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkicker.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/help_index.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpci.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/arts.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/looknfeel.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/date.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fonts.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/samba.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kscreensaver.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpartitions.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/32x32/apps/iconthemes.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/key_bindings.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/colors.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/style.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/energy.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/background.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/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/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.2.orig/kcontrol/privacy/Makefile.in kdebase-3.4.2/kcontrol/privacy/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/privacy/Makefile.in	2005-07-20 21:08:11.000000000 +0000
++++ kdebase-3.4.2/kcontrol/privacy/Makefile.in	2005-07-26 19:06:36.000000000 +0000
+@@ -287,6 +287,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16109,7 +19284,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -586,7 +589,7 @@
+@@ -587,7 +590,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16118,7 +19293,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -624,9 +627,9 @@
+@@ -625,9 +628,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16130,10 +19305,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/randr/Makefile.in kdebase-3.4.2/kcontrol/randr/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/randr/Makefile.in	2005-07-20 21:08:11.000000000 +0000
++++ kdebase-3.4.2/kcontrol/randr/Makefile.in	2005-07-26 19:06:36.000000000 +0000
+@@ -334,6 +334,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16143,7 +19318,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -651,7 +654,7 @@
+@@ -652,7 +655,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16152,7 +19327,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -689,9 +692,9 @@
+@@ -690,9 +693,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16164,10 +19339,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/samba/Makefile.in kdebase-3.4.2/kcontrol/samba/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/samba/Makefile.in	2005-07-20 21:08:12.000000000 +0000
++++ kdebase-3.4.2/kcontrol/samba/Makefile.in	2005-07-26 19:06:36.000000000 +0000
+@@ -286,6 +286,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16177,7 +19352,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -582,7 +585,7 @@
+@@ -583,7 +586,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16186,7 +19361,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -620,9 +623,9 @@
+@@ -621,9 +624,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16198,10 +19373,30 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/screensaver/Makefile.in kdebase-3.4.2/kcontrol/screensaver/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/screensaver/Makefile.in	2005-07-20 21:08:12.000000000 +0000
++++ kdebase-3.4.2/kcontrol/screensaver/Makefile.in	2005-07-26 19:06:36.000000000 +0000
+@@ -65,15 +65,14 @@
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+ kcm_screensaver_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1)
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am_kcm_screensaver_la_OBJECTS = scrnsave.lo testwin.lo saverlist.lo \
+-	saverconfig.lo advanceddialog.lo
++	saverconfig.lo advanceddialog.lo kswidget.lo
+ #>- kcm_screensaver_la_OBJECTS = $(am_kcm_screensaver_la_OBJECTS)
+-#>+ 6
++#>+ 5
+ kcm_screensaver_la_final_OBJECTS = kcm_screensaver_la.all_cpp.lo 
+ kcm_screensaver_la_nofinal_OBJECTS = scrnsave.lo testwin.lo saverlist.lo \
+-	saverconfig.lo advanceddialog.lo advanceddialogimpl.lo\
+-kssmonitor.moc.lo 
++	saverconfig.lo advanceddialog.lo kswidget.lo advanceddialogimpl.lo
+ @KDE_USE_FINAL_FALSE at kcm_screensaver_la_OBJECTS = $(kcm_screensaver_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE at kcm_screensaver_la_OBJECTS = $(kcm_screensaver_la_final_OBJECTS)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+@@ -291,6 +290,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16211,7 +19406,31 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -590,7 +593,7 @@
+@@ -573,15 +575,18 @@
+ xdg_appsdir = @xdg_appsdir@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+-AM_CPPFLAGS = $(all_includes)
++AM_CPPFLAGS = $(GLINC) $(all_includes)
+ kde_module_LTLIBRARIES = kcm_screensaver.la
+-#>- kcm_screensaver_la_SOURCES = advanceddialogimpl.ui scrnsave.cpp testwin.cpp saverlist.cpp saverconfig.cpp advanceddialog.cpp 
+-#>+ 1
+-kcm_screensaver_la_SOURCES= scrnsave.cpp testwin.cpp saverlist.cpp saverconfig.cpp advanceddialog.cpp  advanceddialogimpl.cpp
++#>- kcm_screensaver_la_SOURCES = advanceddialogimpl.ui scrnsave.cpp testwin.cpp saverlist.cpp \
++#>-         saverconfig.cpp advanceddialog.cpp kswidget.cpp
++#>+ 2
++kcm_screensaver_la_SOURCES= scrnsave.cpp testwin.cpp saverlist.cpp \
++        saverconfig.cpp advanceddialog.cpp kswidget.cpp advanceddialogimpl.cpp
++
+ #>- kcm_screensaver_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
+ #>+ 1
+ kcm_screensaver_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined $(KDE_NO_UNDEFINED)
+-kcm_screensaver_la_LIBADD = $(LIB_KSYCOCA) $(DPMSLIB)
++kcm_screensaver_la_LIBADD = $(LIB_KSYCOCA) $(DPMSLIB) $(GLLIB)
+ #>- METASOURCES = AUTO
+ noinst_HEADERS = scrnsave.h
+ xdg_apps_DATA = screensaver.desktop
+@@ -591,7 +596,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16220,7 +19439,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -628,9 +631,9 @@
+@@ -629,9 +634,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16232,10 +19451,82 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -673,6 +678,7 @@
+ 	-rm -f *.tab.c
+ 
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/advanceddialog.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kswidget.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/saverconfig.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/saverlist.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/scrnsave.Plo at am__quote@
+@@ -947,18 +953,18 @@
+ mocs: scrnsave.moc
+ 
+ #>+ 3
+-kssmonitor.moc.cpp: $(srcdir)/kssmonitor.h
+-	$(MOC) $(srcdir)/kssmonitor.h -o kssmonitor.moc.cpp
++kswidget.moc: $(srcdir)/kswidget.h
++	$(MOC) $(srcdir)/kswidget.h -o kswidget.moc
+ 
+ #>+ 2
+-mocs: kssmonitor.moc.cpp
++mocs: kswidget.moc
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  testwin.moc advanceddialog.moc scrnsave.moc kssmonitor.moc.cpp
++	-rm -f  testwin.moc advanceddialog.moc scrnsave.moc kswidget.moc
+ 
+ #>+ 2
+-KDE_DIST=category_list saverconfig.h Makefile.in testwin.h advanceddialogimpl.ui kssmonitor.h advanceddialog.h saverlist.h screensaver.desktop Makefile.am 
++KDE_DIST=category_list saverconfig.h Makefile.in testwin.h advanceddialogimpl.ui configure.in.in kssmonitor.h advanceddialog.h saverlist.h kswidget.h screensaver.desktop Makefile.am 
+ 
+ #>+ 4
+ clean-ui:
+@@ -1011,11 +1017,11 @@
+ 
+ 
+ #>+ 11
+-kcm_screensaver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/scrnsave.cpp $(srcdir)/testwin.cpp $(srcdir)/saverlist.cpp $(srcdir)/saverconfig.cpp $(srcdir)/advanceddialog.cpp advanceddialogimpl.cpp kssmonitor.moc.cpp  testwin.moc advanceddialog.moc advanceddialogimpl.moc scrnsave.moc
++kcm_screensaver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/scrnsave.cpp $(srcdir)/testwin.cpp $(srcdir)/saverlist.cpp $(srcdir)/saverconfig.cpp $(srcdir)/advanceddialog.cpp $(srcdir)/kswidget.cpp advanceddialogimpl.cpp  testwin.moc advanceddialog.moc advanceddialogimpl.moc scrnsave.moc kswidget.moc
+ 	@echo 'creating kcm_screensaver_la.all_cpp.cpp ...'; \
+ 	rm -f kcm_screensaver_la.all_cpp.files kcm_screensaver_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kcm_screensaver_la.all_cpp.final; \
+-	for file in scrnsave.cpp testwin.cpp saverlist.cpp saverconfig.cpp advanceddialog.cpp advanceddialogimpl.cpp kssmonitor.moc.cpp ; do \
++	for file in scrnsave.cpp testwin.cpp saverlist.cpp saverconfig.cpp advanceddialog.cpp kswidget.cpp advanceddialogimpl.cpp ; do \
+ 	  echo "#include \"$$file\"" >> kcm_screensaver_la.all_cpp.files; \
+ 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcm_screensaver_la.all_cpp.final; \
+ 	done; \
+@@ -1050,19 +1056,22 @@
+ kde-rpo-clean:
+ 	-rm -f *.rpo
+ 
+-#>+ 14
++#>+ 17
++kswidget.o: kswidget.moc 
+ $(srcdir)/saverlist.cpp: advanceddialogimpl.h 
+ testwin.lo: testwin.moc 
++kswidget.lo: kswidget.moc 
+ testwin.o: testwin.moc 
+ scrnsave.lo: scrnsave.moc 
+-$(srcdir)/saverconfig.cpp: advanceddialogimpl.h 
+ nmcheck: 
+-scrnsave.o: scrnsave.moc 
++$(srcdir)/saverconfig.cpp: advanceddialogimpl.h 
+ nmcheck-am: nmcheck
++scrnsave.o: scrnsave.moc 
+ advanceddialog.lo: advanceddialog.moc 
+ $(srcdir)/advanceddialog.cpp: advanceddialogimpl.h 
+ $(srcdir)/scrnsave.cpp: advanceddialogimpl.h 
+ $(srcdir)/testwin.cpp: advanceddialogimpl.h 
++$(srcdir)/kswidget.cpp: advanceddialogimpl.h 
+ advanceddialog.o: advanceddialog.moc 
+ 
+ #>+ 15
+diff -Nru kdebase-3.4.2.orig/kcontrol/smartcard/Makefile.in kdebase-3.4.2/kcontrol/smartcard/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/smartcard/Makefile.in	2005-07-20 21:08:12.000000000 +0000
++++ kdebase-3.4.2/kcontrol/smartcard/Makefile.in	2005-07-26 19:06:36.000000000 +0000
+@@ -287,6 +287,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16245,7 +19536,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -586,7 +589,7 @@
+@@ -587,7 +590,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16254,7 +19545,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -624,9 +627,9 @@
+@@ -625,9 +628,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16266,10 +19557,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/smserver/Makefile.in kdebase-3.4.2/kcontrol/smserver/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/smserver/Makefile.in	2005-07-20 21:08:12.000000000 +0000
++++ kdebase-3.4.2/kcontrol/smserver/Makefile.in	2005-07-26 19:06:36.000000000 +0000
+@@ -286,6 +286,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16279,7 +19570,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -586,7 +589,7 @@
+@@ -587,7 +590,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16288,7 +19579,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -624,9 +627,9 @@
+@@ -625,9 +628,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16300,10 +19591,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/spellchecking/Makefile.in kdebase-3.4.2/kcontrol/spellchecking/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/spellchecking/Makefile.in	2005-07-20 21:08:12.000000000 +0000
++++ kdebase-3.4.2/kcontrol/spellchecking/Makefile.in	2005-07-26 19:06:36.000000000 +0000
+@@ -280,6 +280,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16313,7 +19604,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -576,7 +579,7 @@
+@@ -577,7 +580,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16322,7 +19613,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -614,9 +617,9 @@
+@@ -615,9 +618,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16334,10 +19625,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/style/keramik/Makefile.in kdebase-3.4.2/kcontrol/style/keramik/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/style/keramik/Makefile.in	2005-07-20 21:08:12.000000000 +0000
++++ kdebase-3.4.2/kcontrol/style/keramik/Makefile.in	2005-07-26 19:06:36.000000000 +0000
+@@ -281,6 +281,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16347,7 +19638,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -575,7 +578,7 @@
+@@ -576,7 +579,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16356,7 +19647,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -613,9 +616,9 @@
+@@ -614,9 +617,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16368,10 +19659,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/style/Makefile.in kdebase-3.4.2/kcontrol/style/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/style/Makefile.in	2005-07-20 21:08:12.000000000 +0000
++++ kdebase-3.4.2/kcontrol/style/Makefile.in	2005-07-26 19:06:36.000000000 +0000
+@@ -303,6 +303,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16381,7 +19672,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -603,7 +606,7 @@
+@@ -604,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16390,7 +19681,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -641,9 +644,9 @@
+@@ -642,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16402,10 +19693,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/taskbar/Makefile.in kdebase-3.4.2/kcontrol/taskbar/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/taskbar/Makefile.in	2005-07-20 21:08:12.000000000 +0000
++++ kdebase-3.4.2/kcontrol/taskbar/Makefile.in	2005-07-26 19:06:36.000000000 +0000
+@@ -286,6 +286,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16415,7 +19706,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -586,7 +589,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16424,7 +19715,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -624,9 +627,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16436,10 +19727,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/usbview/Makefile.in kdebase-3.4.2/kcontrol/usbview/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/usbview/Makefile.in	2005-07-20 21:08:12.000000000 +0000
++++ kdebase-3.4.2/kcontrol/usbview/Makefile.in	2005-07-26 19:06:36.000000000 +0000
+@@ -285,6 +285,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16449,7 +19740,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -583,7 +586,7 @@
+@@ -584,7 +587,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16458,7 +19749,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -621,9 +624,9 @@
+@@ -622,9 +625,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16470,10 +19761,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/view1394/Makefile.in kdebase-3.4.2/kcontrol/view1394/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/view1394/Makefile.in	2005-07-20 21:08:12.000000000 +0000
++++ kdebase-3.4.2/kcontrol/view1394/Makefile.in	2005-07-26 19:06:36.000000000 +0000
+@@ -285,6 +285,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16483,7 +19774,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -586,7 +589,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16492,7 +19783,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -624,9 +627,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16504,10 +19795,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kcontrol/xinerama/Makefile.in kdebase-3.4.2/kcontrol/xinerama/Makefile.in
+--- kdebase-3.4.2.orig/kcontrol/xinerama/Makefile.in	2005-07-20 21:08:12.000000000 +0000
++++ kdebase-3.4.2/kcontrol/xinerama/Makefile.in	2005-07-26 19:06:38.000000000 +0000
+@@ -286,6 +286,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16517,7 +19808,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -586,7 +589,7 @@
+@@ -587,7 +590,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16526,7 +19817,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -624,9 +627,9 @@
+@@ -625,9 +628,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16538,10 +19829,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kdcop/Makefile.in kdebase-3.4.2/kdcop/Makefile.in
+--- kdebase-3.4.2.orig/kdcop/Makefile.in	2005-07-20 21:08:12.000000000 +0000
++++ kdebase-3.4.2/kdcop/Makefile.in	2005-07-26 19:06:38.288912592 +0000
+@@ -295,6 +295,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16551,7 +19842,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -591,7 +594,7 @@
+@@ -592,7 +595,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16560,7 +19851,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -629,9 +632,9 @@
+@@ -630,9 +633,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16572,10 +19863,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kdebugdialog/Makefile.in kdebase-3.4.2/kdebugdialog/Makefile.in
+--- kdebase-3.4.2.orig/kdebugdialog/Makefile.in	2005-07-20 21:08:12.000000000 +0000
++++ kdebase-3.4.2/kdebugdialog/Makefile.in	2005-07-26 19:06:38.341904536 +0000
+@@ -279,6 +279,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16585,7 +19876,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -571,7 +574,7 @@
+@@ -572,7 +575,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16594,7 +19885,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -609,9 +612,9 @@
+@@ -610,9 +613,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16606,10 +19897,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kdepasswd/kcm/Makefile.in kdebase-3.4.2/kdepasswd/kcm/Makefile.in
+--- kdebase-3.4.2.orig/kdepasswd/kcm/Makefile.in	2005-07-20 21:08:12.000000000 +0000
++++ kdebase-3.4.2/kdepasswd/kcm/Makefile.in	2005-07-26 19:06:38.861825496 +0000
+@@ -301,6 +301,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16619,7 +19910,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -605,7 +608,7 @@
+@@ -606,7 +609,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16628,7 +19919,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -643,9 +646,9 @@
+@@ -644,9 +647,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16640,10 +19931,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kdepasswd/kcm/pics/Makefile.in kdebase-3.4.2/kdepasswd/kcm/pics/Makefile.in
+--- kdebase-3.4.2.orig/kdepasswd/kcm/pics/Makefile.in	2005-07-20 21:08:12.000000000 +0000
++++ kdebase-3.4.2/kdepasswd/kcm/pics/Makefile.in	2005-07-26 19:06:38.896820176 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16653,7 +19944,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -542,7 +545,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -16662,7 +19953,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -580,9 +583,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16674,10 +19965,19 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -741,7 +744,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=Penguin.png Konqui.png Star.png Pig.png Shark.png CREDITS Daemon.png Frog.png Makefile.in Blowfish.png Butterfly.png Teddybear.png Ring.png Heart.png Elephant.png Dog.png Guitar.png Cow.png Bug.png Rabbit.png Scream.png Apple.png Splash.png Ghost.png Lion.png Turtle.png Flower.png Car.png BeachBall.png Monkey.png Makefile.am 
++KDE_DIST=Penguin.png Konqui.png Star.png Pig.png Shark.png CREDITS Daemon.png Frog.png Makefile.in Blowfish.png Butterfly.png Teddybear.png Ring.png Heart.png Elephant.png Dog.png Guitar.png Cow.png Rabbit.png Bug.png Scream.png Apple.png Splash.png Ghost.png Lion.png Turtle.png Flower.png Car.png BeachBall.png Monkey.png Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+diff -Nru kdebase-3.4.2.orig/kdepasswd/Makefile.in kdebase-3.4.2/kdepasswd/Makefile.in
+--- kdebase-3.4.2.orig/kdepasswd/Makefile.in	2005-07-20 21:08:12.000000000 +0000
++++ kdebase-3.4.2/kdepasswd/Makefile.in	2005-07-26 19:06:38.388897392 +0000
+@@ -303,6 +303,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16687,7 +19987,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -598,7 +601,7 @@
+@@ -599,7 +602,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16696,7 +19996,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -636,9 +639,9 @@
+@@ -637,9 +640,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16708,10 +20008,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kdeprint/descriptions/Makefile.in kdebase-3.4.2/kdeprint/descriptions/Makefile.in
+--- kdebase-3.4.2.orig/kdeprint/descriptions/Makefile.in	2005-07-20 21:08:12.000000000 +0000
++++ kdebase-3.4.2/kdeprint/descriptions/Makefile.in	2005-07-26 19:06:38.943813032 +0000
+@@ -267,6 +267,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16721,7 +20021,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -559,7 +562,7 @@
+@@ -560,7 +563,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16730,7 +20030,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -597,9 +600,9 @@
+@@ -598,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16742,10 +20042,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  sortthem$(EXEEXT): $(sortthem_OBJECTS) $(sortthem_DEPENDENCIES) 
  	@rm -f sortthem$(EXEEXT)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kdeprint/kdeprintfax/Makefile.in kdebase-3.4.2/kdeprint/kdeprintfax/Makefile.in
+--- kdebase-3.4.2.orig/kdeprint/kdeprintfax/Makefile.in	2005-07-20 21:08:12.000000000 +0000
++++ kdebase-3.4.2/kdeprint/kdeprintfax/Makefile.in	2005-07-26 19:06:39.071793576 +0000
+@@ -296,6 +296,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16755,7 +20055,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -598,7 +601,7 @@
+@@ -599,7 +602,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16764,7 +20064,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -636,9 +639,9 @@
+@@ -637,9 +640,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16776,10 +20076,53 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -1014,35 +1017,35 @@
+ 	-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/64x64/apps
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/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/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/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/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/64x64/apps/kdeprintfax.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/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/32x32/apps/kdeprintfax.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kdeprintfax.png
+ 	-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
+diff -Nru kdebase-3.4.2.orig/kdeprint/kdeprint_part/Makefile.in kdebase-3.4.2/kdeprint/kdeprint_part/Makefile.in
+--- kdebase-3.4.2.orig/kdeprint/kdeprint_part/Makefile.in	2005-07-20 21:08:12.000000000 +0000
++++ kdebase-3.4.2/kdeprint/kdeprint_part/Makefile.in	2005-07-26 19:06:38.982807104 +0000
+@@ -285,6 +285,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16789,7 +20132,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -590,7 +593,7 @@
+@@ -591,7 +594,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16798,7 +20141,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -628,9 +631,9 @@
+@@ -629,9 +632,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16810,10 +20153,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kdeprint/kjobviewer/Makefile.in kdebase-3.4.2/kdeprint/kjobviewer/Makefile.in
+--- kdebase-3.4.2.orig/kdeprint/kjobviewer/Makefile.in	2005-07-20 21:08:12.000000000 +0000
++++ kdebase-3.4.2/kdeprint/kjobviewer/Makefile.in	2005-07-26 19:06:39.117786584 +0000
+@@ -302,6 +302,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16823,7 +20166,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -608,7 +611,7 @@
+@@ -609,7 +612,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16832,7 +20175,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -646,9 +649,9 @@
+@@ -647,9 +650,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16844,10 +20187,52 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -1052,29 +1055,29 @@
+ 
+ #>+ 25
+ install-kde-icons:
+-	$(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/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/cr128-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/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/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/128x128/apps
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/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/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/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
+ 
+ uninstall-kde-icons:
+-	-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/128x128/apps/kjobviewer.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/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/128x128/apps/kjobviewer.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kjobviewer.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kjobviewer.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kjobviewer.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kjobviewer.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nru kdebase-3.4.2.orig/kdeprint/kprinter/Makefile.in kdebase-3.4.2/kdeprint/kprinter/Makefile.in
+--- kdebase-3.4.2.orig/kdeprint/kprinter/Makefile.in	2005-07-20 21:08:12.000000000 +0000
++++ kdebase-3.4.2/kdeprint/kprinter/Makefile.in	2005-07-26 19:06:39.165779288 +0000
+@@ -296,6 +296,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16857,7 +20242,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -598,7 +601,7 @@
+@@ -599,7 +602,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16866,7 +20251,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -636,9 +639,9 @@
+@@ -637,9 +640,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16878,10 +20263,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kdeprint/Makefile.in kdebase-3.4.2/kdeprint/Makefile.in
+--- kdebase-3.4.2.orig/kdeprint/Makefile.in	2005-07-20 21:08:12.000000000 +0000
++++ kdebase-3.4.2/kdeprint/Makefile.in	2005-07-26 19:06:38.915817288 +0000
+@@ -252,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16891,7 +20276,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -540,7 +543,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -16900,7 +20285,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -578,9 +581,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16912,10 +20297,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kdeprint/printmgr/Makefile.in kdebase-3.4.2/kdeprint/printmgr/Makefile.in
+--- kdebase-3.4.2.orig/kdeprint/printmgr/Makefile.in	2005-07-20 21:08:12.000000000 +0000
++++ kdebase-3.4.2/kdeprint/printmgr/Makefile.in	2005-07-26 19:06:39.196774576 +0000
+@@ -283,6 +283,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16925,7 +20310,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -581,7 +584,7 @@
+@@ -582,7 +585,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16934,7 +20319,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -619,9 +622,9 @@
+@@ -620,9 +623,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16946,10 +20331,61 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -920,7 +923,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:
+@@ -931,29 +934,29 @@
+ 
+ #>+ 25
+ install-kde-icons:
+-	$(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/128x128/apps
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-printmgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/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/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/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/64x64/apps
++	$(INSTALL_DATA) $(srcdir)/cr64-app-printmgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/printmgr.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/printmgr.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/printmgr.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/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/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/64x64/apps/printmgr.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nru kdebase-3.4.2.orig/kdeprint/slave/Makefile.in kdebase-3.4.2/kdeprint/slave/Makefile.in
+--- kdebase-3.4.2.orig/kdeprint/slave/Makefile.in	2005-07-20 21:08:12.000000000 +0000
++++ kdebase-3.4.2/kdeprint/slave/Makefile.in	2005-07-26 19:06:39.255765608 +0000
+@@ -298,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16959,7 +20395,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -598,7 +601,7 @@
+@@ -599,7 +602,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16968,7 +20404,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -636,9 +639,9 @@
+@@ -637,9 +640,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16980,10 +20416,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kdeprint/slave/mimetypes/Makefile.in kdebase-3.4.2/kdeprint/slave/mimetypes/Makefile.in
+--- kdebase-3.4.2.orig/kdeprint/slave/mimetypes/Makefile.in	2005-07-20 21:08:12.000000000 +0000
++++ kdebase-3.4.2/kdeprint/slave/mimetypes/Makefile.in	2005-07-26 19:06:39.273762872 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16993,7 +20429,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -537,7 +540,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17002,7 +20438,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -575,9 +578,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17014,10 +20450,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kdeprint/slave/templates/Makefile.in kdebase-3.4.2/kdeprint/slave/templates/Makefile.in
+--- kdebase-3.4.2.orig/kdeprint/slave/templates/Makefile.in	2005-07-20 21:08:12.000000000 +0000
++++ kdebase-3.4.2/kdeprint/slave/templates/Makefile.in	2005-07-26 19:06:39.291760136 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17027,7 +20463,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -563,7 +566,7 @@
+@@ -564,7 +567,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17036,7 +20472,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -601,9 +604,9 @@
+@@ -602,9 +605,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17048,10 +20484,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kdesktop/init/Makefile.in kdebase-3.4.2/kdesktop/init/Makefile.in
+--- kdebase-3.4.2.orig/kdesktop/init/Makefile.in	2005-07-20 21:08:13.000000000 +0000
++++ kdebase-3.4.2/kdesktop/init/Makefile.in	2005-07-26 19:06:39.610711648 +0000
+@@ -264,6 +264,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17061,7 +20497,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -556,7 +559,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -17070,7 +20506,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -594,9 +597,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17082,10 +20518,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kdesktop/init/Templates/Makefile.in kdebase-3.4.2/kdesktop/init/Templates/Makefile.in
+--- kdebase-3.4.2.orig/kdesktop/init/Templates/Makefile.in	2005-07-20 21:08:13.000000000 +0000
++++ kdebase-3.4.2/kdesktop/init/Templates/Makefile.in	2005-07-26 19:06:39.628708912 +0000
+@@ -247,6 +247,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17095,7 +20531,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -551,7 +554,7 @@
+@@ -552,7 +555,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17104,7 +20540,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -589,9 +592,9 @@
+@@ -590,9 +593,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17116,10 +20552,19 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -775,7 +778,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-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 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.2.orig/kdesktop/kwebdesktop/Makefile.in kdebase-3.4.2/kdesktop/kwebdesktop/Makefile.in
+--- kdebase-3.4.2.orig/kdesktop/kwebdesktop/Makefile.in	2005-07-20 21:08:13.000000000 +0000
++++ kdebase-3.4.2/kdesktop/kwebdesktop/Makefile.in	2005-07-26 19:06:39.656704656 +0000
+@@ -287,6 +287,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17129,7 +20574,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -584,7 +587,7 @@
+@@ -585,7 +588,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -17138,7 +20583,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -622,9 +625,9 @@
+@@ -623,9 +626,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17150,10 +20595,19 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kdesktop/lock/Makefile.in kdebase-3.4.2/kdesktop/lock/Makefile.in
+--- kdebase-3.4.2.orig/kdesktop/lock/Makefile.in	2005-07-20 21:08:13.000000000 +0000
++++ kdebase-3.4.2/kdesktop/lock/Makefile.in	2005-07-26 19:06:39.736692496 +0000
+@@ -68,7 +68,7 @@
+ am__DEPENDENCIES_1 =
+ kdesktop_lock_DEPENDENCIES = ../libkdesktopsettings.la \
+ 	../../kdmlib/libdmctl.la $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1)
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+@@ -282,6 +282,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17163,7 +20617,19 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -578,7 +581,7 @@
+@@ -564,9 +567,9 @@
+ xdg_appsdir = @xdg_appsdir@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+-INCLUDES = -I.. -I$(top_srcdir)/kcheckpass -I$(top_srcdir)/kdmlib $(all_includes)
++INCLUDES = -I.. -I$(top_srcdir)/kcheckpass -I$(top_srcdir)/kdmlib $(GLINC) $(all_includes)
+ kdesktop_lock_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+-kdesktop_lock_LDADD = ../libkdesktopsettings.la ../../kdmlib/libdmctl.la $(LIB_KIO) $(LIB_XF86MISC)
++kdesktop_lock_LDADD = ../libkdesktopsettings.la ../../kdmlib/libdmctl.la $(LIB_KIO) $(LIB_XF86MISC) $(GLLIB)
+ kdesktop_lock_SOURCES = lockprocess.cc lockdlg.cc autologout.cc main.cc
+ noinst_HEADERS = lockprocess.h lockdlg.h autologout.h main.h
+ #>- METASOURCES = AUTO
+@@ -579,7 +582,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -17172,7 +20638,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -616,9 +619,9 @@
+@@ -617,9 +620,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17184,10 +20650,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kdesktop/Makefile.in kdebase-3.4.2/kdesktop/Makefile.in
+--- kdebase-3.4.2.orig/kdesktop/Makefile.in	2005-07-20 21:08:13.000000000 +0000
++++ kdebase-3.4.2/kdesktop/Makefile.in	2005-07-26 19:06:39.590714688 +0000
+@@ -357,6 +357,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17197,7 +20663,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -694,7 +697,7 @@
+@@ -695,7 +698,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cc .cpp .lo .o .obj
@@ -17206,7 +20672,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -732,9 +735,9 @@
+@@ -733,9 +736,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17218,10 +20684,92 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -1429,18 +1432,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
+@@ -1464,11 +1467,11 @@
+ mocs: desktop.moc
+ 
+ #>+ 3
+-kdiconview.moc: $(srcdir)/kdiconview.h
+-	$(MOC) $(srcdir)/kdiconview.h -o kdiconview.moc
++pixmapserver.moc: $(srcdir)/pixmapserver.h
++	$(MOC) $(srcdir)/pixmapserver.h -o pixmapserver.moc
+ 
+ #>+ 2
+-mocs: kdiconview.moc
++mocs: pixmapserver.moc
+ 
+ #>+ 3
+ kcustommenu.moc: $(srcdir)/kcustommenu.h
+@@ -1478,11 +1481,11 @@
+ mocs: kcustommenu.moc
+ 
+ #>+ 3
+-pixmapserver.moc: $(srcdir)/pixmapserver.h
+-	$(MOC) $(srcdir)/pixmapserver.h -o pixmapserver.moc
++kdiconview.moc: $(srcdir)/kdiconview.h
++	$(MOC) $(srcdir)/kdiconview.h -o kdiconview.moc
+ 
+ #>+ 2
+-mocs: pixmapserver.moc
++mocs: kdiconview.moc
+ 
+ #>+ 3
+ xautolock.moc: $(srcdir)/xautolock.h
+@@ -1509,7 +1512,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  minicli.moc krootwm.moc startupid.moc lockeng.moc desktop.moc kdiconview.moc kcustommenu.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 
+@@ -1578,7 +1581,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 kdiconview.moc kcustommenu.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; \
+@@ -1590,7 +1593,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 kdiconview.moc kcustommenu.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.2.orig/kdesktop/patterns/Makefile.in kdebase-3.4.2/kdesktop/patterns/Makefile.in
+--- kdebase-3.4.2.orig/kdesktop/patterns/Makefile.in	2005-07-20 21:08:13.000000000 +0000
++++ kdebase-3.4.2/kdesktop/patterns/Makefile.in	2005-07-26 19:06:39.753689912 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17231,7 +20779,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -538,7 +541,7 @@
+@@ -539,7 +542,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17240,7 +20788,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -576,9 +579,9 @@
+@@ -577,9 +580,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17252,10 +20800,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kdesktop/pics/Makefile.in kdebase-3.4.2/kdesktop/pics/Makefile.in
+--- kdebase-3.4.2.orig/kdesktop/pics/Makefile.in	2005-07-20 21:08:13.000000000 +0000
++++ kdebase-3.4.2/kdesktop/pics/Makefile.in	2005-07-26 19:06:39.772687024 +0000
+@@ -248,6 +248,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17265,7 +20813,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -538,7 +541,7 @@
+@@ -539,7 +542,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17274,7 +20822,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -576,9 +579,9 @@
+@@ -577,9 +580,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17286,10 +20834,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kdesktop/programs/Makefile.in kdebase-3.4.2/kdesktop/programs/Makefile.in
+--- kdebase-3.4.2.orig/kdesktop/programs/Makefile.in	2005-07-20 21:08:13.000000000 +0000
++++ kdebase-3.4.2/kdesktop/programs/Makefile.in	2005-07-26 19:06:39.789684440 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17299,7 +20847,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -535,7 +538,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17308,7 +20856,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -573,9 +576,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17320,10 +20868,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kdesu/kdesu/Makefile.in kdebase-3.4.2/kdesu/kdesu/Makefile.in
+--- kdebase-3.4.2.orig/kdesu/kdesu/Makefile.in	2005-07-20 21:08:13.000000000 +0000
++++ kdebase-3.4.2/kdesu/kdesu/Makefile.in	2005-07-26 19:06:39.854674560 +0000
+@@ -278,6 +278,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17333,7 +20881,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -571,7 +574,7 @@
+@@ -572,7 +575,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -17342,7 +20890,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -609,9 +612,9 @@
+@@ -610,9 +613,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17354,10 +20902,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kdesu/kdesud/Makefile.in kdebase-3.4.2/kdesu/kdesud/Makefile.in
+--- kdebase-3.4.2.orig/kdesu/kdesud/Makefile.in	2005-07-20 21:08:13.000000000 +0000
++++ kdebase-3.4.2/kdesu/kdesud/Makefile.in	2005-07-26 19:06:39.895668328 +0000
+@@ -280,6 +280,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17367,7 +20915,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -572,7 +575,7 @@
+@@ -573,7 +576,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -17376,7 +20924,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -610,9 +613,9 @@
+@@ -611,9 +614,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17388,10 +20936,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kdesu/Makefile.in kdebase-3.4.2/kdesu/Makefile.in
+--- kdebase-3.4.2.orig/kdesu/Makefile.in	2005-07-20 21:08:13.000000000 +0000
++++ kdebase-3.4.2/kdesu/Makefile.in	2005-07-26 19:06:39.807681704 +0000
+@@ -253,6 +253,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17401,7 +20949,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -540,7 +543,7 @@
+@@ -541,7 +544,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -17410,7 +20958,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -578,9 +581,9 @@
+@@ -579,9 +582,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17422,10 +20970,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kdialog/Makefile.in kdebase-3.4.2/kdialog/Makefile.in
+--- kdebase-3.4.2.orig/kdialog/Makefile.in	2005-07-20 21:08:13.000000000 +0000
++++ kdebase-3.4.2/kdialog/Makefile.in	2005-07-26 19:06:39.944660880 +0000
+@@ -277,6 +277,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17435,7 +20983,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -572,7 +575,7 @@
+@@ -573,7 +576,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -17444,7 +20992,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -610,9 +613,9 @@
+@@ -611,9 +614,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17456,10 +21004,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kdm/backend/Makefile.in kdebase-3.4.2/kdm/backend/Makefile.in
+--- kdebase-3.4.2.orig/kdm/backend/Makefile.in	2005-07-20 21:08:13.000000000 +0000
++++ kdebase-3.4.2/kdm/backend/Makefile.in	2005-07-26 19:06:40.002652064 +0000
+@@ -292,6 +292,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17469,17 +21017,8 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -576,7 +579,7 @@
+@@ -623,7 +626,7 @@
  
- # forcibly remove thread-related defines & flags
- AUTOMAKE_OPTIONS = foreign
--LDADD = $(LIB_X11) -lXau $(LIBXDMCP) $(PASSWDLIBS) \
-+LDADD = $(LIB_X11) -lXau_pic $(LIBXDMCP) $(PASSWDLIBS) \
-     $(LIB_LIBS) $(KRB4_LIBS) $(KRB5_LIBS) $(LIBSOCKET) $(LIBRESOLV) \
-     $(LIBUCB) $(LIBUTIL) $(LIBPOSIX4)
- 
-@@ -622,7 +625,7 @@
- 
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -17487,7 +21026,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -660,9 +663,9 @@
+@@ -661,9 +664,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17499,10 +21038,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kdm/kfrontend/Makefile.in kdebase-3.4.2/kdm/kfrontend/Makefile.in
+--- kdebase-3.4.2.orig/kdm/kfrontend/Makefile.in	2005-07-20 21:08:13.000000000 +0000
++++ kdebase-3.4.2/kdm/kfrontend/Makefile.in	2005-07-26 19:06:40.128632912 +0000
+@@ -333,6 +333,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17512,7 +21051,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -616,7 +619,7 @@
+@@ -617,7 +620,7 @@
  xdg_menudir = @xdg_menudir@
  
  # use 'make GENKDMCONF_FLAGS=... install' to override
@@ -17521,7 +21060,7 @@
  SUBDIRS = themer themes pics sessions
  AM_CPPFLAGS = -I$(srcdir)/../backend -I.. -I$(top_srcdir)/kcontrol/background \
      -I$(top_srcdir)/kdmlib $(all_includes)
-@@ -671,7 +674,7 @@
+@@ -672,7 +675,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -17530,7 +21069,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -709,9 +712,9 @@
+@@ -710,9 +713,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17542,10 +21081,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kdm/kfrontend/pics/Makefile.in kdebase-3.4.2/kdm/kfrontend/pics/Makefile.in
+--- kdebase-3.4.2.orig/kdm/kfrontend/pics/Makefile.in	2005-07-20 21:08:13.000000000 +0000
++++ kdebase-3.4.2/kdm/kfrontend/pics/Makefile.in	2005-07-26 19:06:40.145630328 +0000
+@@ -247,6 +247,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17555,7 +21094,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -538,7 +541,7 @@
+@@ -539,7 +542,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17564,7 +21103,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -576,9 +579,9 @@
+@@ -577,9 +580,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17576,10 +21115,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kdm/kfrontend/sessions/Makefile.in kdebase-3.4.2/kdm/kfrontend/sessions/Makefile.in
+--- kdebase-3.4.2.orig/kdm/kfrontend/sessions/Makefile.in	2005-07-20 21:08:14.000000000 +0000
++++ kdebase-3.4.2/kdm/kfrontend/sessions/Makefile.in	2005-07-26 19:06:40.171626376 +0000
+@@ -247,6 +247,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17589,7 +21128,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -582,7 +585,7 @@
+@@ -583,7 +586,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17598,7 +21137,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -620,9 +623,9 @@
+@@ -621,9 +624,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17610,10 +21149,19 @@
  	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)/$@
-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 @@
+@@ -785,7 +788,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=9wm.desktop golem.desktop ratpoison.desktop amiwm.desktop sapphire.desktop enlightenment.desktop aewm.desktop ude.desktop cde.desktop openbox.desktop Makefile.in wm2.desktop xfce.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 
++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.2.orig/kdm/kfrontend/themer/Makefile.in kdebase-3.4.2/kdm/kfrontend/themer/Makefile.in
+--- kdebase-3.4.2.orig/kdm/kfrontend/themer/Makefile.in	2005-07-20 21:08:14.000000000 +0000
++++ kdebase-3.4.2/kdm/kfrontend/themer/Makefile.in	2005-07-26 19:06:40.229617560 +0000
+@@ -277,6 +277,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17623,7 +21171,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -578,7 +581,7 @@
+@@ -579,7 +582,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -17632,7 +21180,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -616,9 +619,9 @@
+@@ -617,9 +620,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17644,10 +21192,63 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLIBRARIES:
-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 @@
+@@ -863,18 +866,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
+@@ -885,7 +888,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 
+@@ -932,7 +935,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; \
+@@ -978,8 +981,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.2.orig/kdm/kfrontend/themes/circles/Makefile.in kdebase-3.4.2/kdm/kfrontend/themes/circles/Makefile.in
+--- kdebase-3.4.2.orig/kdm/kfrontend/themes/circles/Makefile.in	2005-07-20 21:08:14.000000000 +0000
++++ kdebase-3.4.2/kdm/kfrontend/themes/circles/Makefile.in	2005-07-26 19:06:40.265612088 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17657,7 +21258,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -543,7 +546,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17666,7 +21267,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -581,9 +584,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17678,10 +21279,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kdm/kfrontend/themes/Makefile.in kdebase-3.4.2/kdm/kfrontend/themes/Makefile.in
+--- kdebase-3.4.2.orig/kdm/kfrontend/themes/Makefile.in	2005-07-20 21:08:14.000000000 +0000
++++ kdebase-3.4.2/kdm/kfrontend/themes/Makefile.in	2005-07-26 19:06:40.248614672 +0000
+@@ -252,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17691,7 +21292,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -540,7 +543,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -17700,7 +21301,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -578,9 +581,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17712,10 +21313,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kdm/Makefile.in kdebase-3.4.2/kdm/Makefile.in
+--- kdebase-3.4.2.orig/kdm/Makefile.in	2005-07-20 21:08:13.000000000 +0000
++++ kdebase-3.4.2/kdm/Makefile.in	2005-07-26 19:06:39.964657840 +0000
+@@ -263,6 +263,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17725,7 +21326,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -556,7 +559,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -17734,7 +21335,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -594,9 +597,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17746,10 +21347,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kdmlib/Makefile.in kdebase-3.4.2/kdmlib/Makefile.in
+--- kdebase-3.4.2.orig/kdmlib/Makefile.in	2005-07-20 21:08:14.000000000 +0000
++++ kdebase-3.4.2/kdmlib/Makefile.in	2005-07-26 19:06:40.337601144 +0000
+@@ -294,6 +294,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17759,7 +21360,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -602,7 +605,7 @@
+@@ -603,7 +606,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -17768,7 +21369,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -640,9 +643,9 @@
+@@ -641,9 +644,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17780,10 +21381,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kfind/Makefile.in kdebase-3.4.2/kfind/Makefile.in
+--- kdebase-3.4.2.orig/kfind/Makefile.in	2005-07-20 21:08:14.000000000 +0000
++++ kdebase-3.4.2/kfind/Makefile.in	2005-07-26 19:06:40.471580776 +0000
+@@ -326,6 +326,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17793,7 +21394,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -638,7 +641,7 @@
+@@ -639,7 +642,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -17802,7 +21403,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -676,9 +679,9 @@
+@@ -677,9 +680,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17814,10 +21415,53 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -1173,18 +1176,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
+@@ -1218,7 +1221,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 
+@@ -1286,7 +1289,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.2.orig/kfind/pics/Makefile.in kdebase-3.4.2/kfind/pics/Makefile.in
+--- kdebase-3.4.2.orig/kfind/pics/Makefile.in	2005-07-20 21:08:14.000000000 +0000
++++ kdebase-3.4.2/kfind/pics/Makefile.in	2005-07-26 19:06:40.492577584 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17827,7 +21471,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17836,7 +21480,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17848,10 +21492,43 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -716,22 +719,22 @@
+ #>+ 19
+ install-kde-icons:
+ 	$(mkinstalldirs) $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions
+-	$(INSTALL_DATA) $(srcdir)/lo22-action-search.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/search.png
+-	$(INSTALL_DATA) $(srcdir)/lo22-action-info.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/info.png
+-	$(INSTALL_DATA) $(srcdir)/lo22-action-save.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/save.png
+-	$(INSTALL_DATA) $(srcdir)/lo22-action-archive.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/archive.png
+-	$(INSTALL_DATA) $(srcdir)/lo22-action-openfile.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/openfile.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-search.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/search.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/search.png
+-	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/info.png
+-	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/save.png
+-	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/archive.png
+-	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/openfile.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/search.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nru kdebase-3.4.2.orig/khelpcenter/htmlsearch/Makefile.in kdebase-3.4.2/khelpcenter/htmlsearch/Makefile.in
+--- kdebase-3.4.2.orig/khelpcenter/htmlsearch/Makefile.in	2005-07-20 21:08:14.000000000 +0000
++++ kdebase-3.4.2/khelpcenter/htmlsearch/Makefile.in	2005-07-26 19:06:40.722542624 +0000
+@@ -317,6 +317,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17861,7 +21538,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -630,7 +633,7 @@
+@@ -631,7 +634,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -17870,7 +21547,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -668,9 +671,9 @@
+@@ -669,9 +672,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17882,10 +21559,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/khelpcenter/Makefile.in kdebase-3.4.2/khelpcenter/Makefile.in
+--- kdebase-3.4.2.orig/khelpcenter/Makefile.in	2005-07-20 21:08:14.000000000 +0000
++++ kdebase-3.4.2/khelpcenter/Makefile.in	2005-07-26 19:06:40.664551440 +0000
+@@ -337,6 +337,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17895,7 +21572,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -676,7 +679,7 @@
+@@ -677,7 +680,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -17904,7 +21581,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -714,9 +717,9 @@
+@@ -715,9 +718,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17916,10 +21593,62 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -1289,11 +1292,11 @@
+ 	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kcmhelpcenter.kidl
+ 
+ #>+ 3
+-scrollkeepertreebuilder.moc: $(srcdir)/scrollkeepertreebuilder.h
+-	$(MOC) $(srcdir)/scrollkeepertreebuilder.h -o scrollkeepertreebuilder.moc
++history.moc: $(srcdir)/history.h
++	$(MOC) $(srcdir)/history.h -o history.moc
+ 
+ #>+ 2
+-mocs: scrollkeepertreebuilder.moc
++mocs: history.moc
+ 
+ #>+ 3
+ navigator.moc: $(srcdir)/navigator.h
+@@ -1303,11 +1306,11 @@
+ mocs: navigator.moc
+ 
+ #>+ 3
+-history.moc: $(srcdir)/history.h
+-	$(MOC) $(srcdir)/history.h -o history.moc
++scrollkeepertreebuilder.moc: $(srcdir)/scrollkeepertreebuilder.h
++	$(MOC) $(srcdir)/scrollkeepertreebuilder.h -o scrollkeepertreebuilder.moc
+ 
+ #>+ 2
+-mocs: history.moc
++mocs: scrollkeepertreebuilder.moc
+ 
+ #>+ 3
+ fontdialog.moc: $(srcdir)/fontdialog.h
+@@ -1418,10 +1421,10 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  scrollkeepertreebuilder.moc navigator.moc history.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
++	-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 application.h formatter.h prefs.kcfgc README.metadata khelpcenter.kcfg docmetainfo.h index.html.in Help.desktop navigatoritem.h khelpcenter.desktop toc.h infotree.h searchwidget.h intro.html.in kcmhelpcenter.h README.htdig version.h Makefile.am 
++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 index.html.in Help.desktop navigatoritem.h khelpcenter.desktop toc.h infotree.h searchwidget.h intro.html.in kcmhelpcenter.h README.htdig version.h Makefile.am 
+ 
+ #>+ 6
+ clean-idl:
+@@ -1481,7 +1484,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 htmlsearch.moc view.moc toc.moc searchwidget.moc searchengine.moc scrollkeepertreebuilder.moc navigator.moc history.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; \
+diff -Nru kdebase-3.4.2.orig/khelpcenter/pics/Makefile.in kdebase-3.4.2/khelpcenter/pics/Makefile.in
+--- kdebase-3.4.2.orig/khelpcenter/pics/Makefile.in	2005-07-20 21:08:14.000000000 +0000
++++ kdebase-3.4.2/khelpcenter/pics/Makefile.in	2005-07-26 19:06:40.746538976 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17929,7 +21658,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -526,7 +529,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17938,7 +21667,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -564,9 +567,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17950,10 +21679,52 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -716,29 +719,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/64x64/apps
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/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/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/cr16-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/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/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/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/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/64x64/apps/khelpcenter.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/khelpcenter.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/khelpcenter.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/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/16x16/apps/khelpcenter.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/khelpcenter.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nru kdebase-3.4.2.orig/khelpcenter/plugins/Applications/Makefile.in kdebase-3.4.2/khelpcenter/plugins/Applications/Makefile.in
+--- kdebase-3.4.2.orig/khelpcenter/plugins/Applications/Makefile.in	2005-07-20 21:08:14.000000000 +0000
++++ kdebase-3.4.2/khelpcenter/plugins/Applications/Makefile.in	2005-07-26 19:06:40.768535632 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17963,7 +21734,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -535,7 +538,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17972,7 +21743,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -573,9 +576,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17984,10 +21755,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/khelpcenter/plugins/Makefile.in kdebase-3.4.2/khelpcenter/plugins/Makefile.in
+--- kdebase-3.4.2.orig/khelpcenter/plugins/Makefile.in	2005-07-20 21:08:14.000000000 +0000
++++ kdebase-3.4.2/khelpcenter/plugins/Makefile.in	2005-07-26 19:06:40.788532592 +0000
+@@ -262,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17997,7 +21768,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -556,7 +559,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -18006,7 +21777,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -594,9 +597,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18018,10 +21789,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/khelpcenter/plugins/Manpages/Makefile.in kdebase-3.4.2/khelpcenter/plugins/Manpages/Makefile.in
+--- kdebase-3.4.2.orig/khelpcenter/plugins/Manpages/Makefile.in	2005-07-20 21:08:14.000000000 +0000
++++ kdebase-3.4.2/khelpcenter/plugins/Manpages/Makefile.in	2005-07-26 19:06:40.805530008 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18031,7 +21802,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -537,7 +540,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18040,7 +21811,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -575,9 +578,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18052,10 +21823,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/khelpcenter/plugins/Scrollkeeper/Makefile.in kdebase-3.4.2/khelpcenter/plugins/Scrollkeeper/Makefile.in
+--- kdebase-3.4.2.orig/khelpcenter/plugins/Scrollkeeper/Makefile.in	2005-07-20 21:08:14.000000000 +0000
++++ kdebase-3.4.2/khelpcenter/plugins/Scrollkeeper/Makefile.in	2005-07-26 19:06:40.822527424 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18065,7 +21836,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -535,7 +538,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18074,7 +21845,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -573,9 +576,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18086,10 +21857,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/khelpcenter/plugins/Tutorials/Makefile.in kdebase-3.4.2/khelpcenter/plugins/Tutorials/Makefile.in
+--- kdebase-3.4.2.orig/khelpcenter/plugins/Tutorials/Makefile.in	2005-07-20 21:08:14.000000000 +0000
++++ kdebase-3.4.2/khelpcenter/plugins/Tutorials/Makefile.in	2005-07-26 19:06:40.839524840 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18099,7 +21870,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -535,7 +538,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18108,7 +21879,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -573,9 +576,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18120,10 +21891,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/khelpcenter/searchhandlers/Makefile.in kdebase-3.4.2/khelpcenter/searchhandlers/Makefile.in
+--- kdebase-3.4.2.orig/khelpcenter/searchhandlers/Makefile.in	2005-07-20 21:08:14.000000000 +0000
++++ kdebase-3.4.2/khelpcenter/searchhandlers/Makefile.in	2005-07-26 19:06:40.864521040 +0000
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18133,7 +21904,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -545,7 +548,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18142,7 +21913,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -583,9 +586,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18154,10 +21925,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_binSCRIPTS: $(kde_bin_SCRIPTS)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/khotkeys/app/Makefile.in kdebase-3.4.2/khotkeys/app/Makefile.in
+--- kdebase-3.4.2.orig/khotkeys/app/Makefile.in	2005-07-20 21:08:14.000000000 +0000
++++ kdebase-3.4.2/khotkeys/app/Makefile.in	2005-07-26 19:06:40.992501584 +0000
+@@ -313,6 +313,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18167,7 +21938,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -625,7 +628,7 @@
+@@ -626,7 +629,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18176,7 +21947,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -663,9 +666,9 @@
+@@ -664,9 +667,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18188,10 +21959,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/khotkeys/data/Makefile.in kdebase-3.4.2/khotkeys/data/Makefile.in
+--- kdebase-3.4.2.orig/khotkeys/data/Makefile.in	2005-07-20 21:08:14.000000000 +0000
++++ kdebase-3.4.2/khotkeys/data/Makefile.in	2005-07-26 19:06:41.009499000 +0000
+@@ -248,6 +248,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18201,7 +21972,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -540,7 +543,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18210,7 +21981,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -578,9 +581,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18222,10 +21993,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/khotkeys/kcontrol/Makefile.in kdebase-3.4.2/khotkeys/kcontrol/Makefile.in
+--- kdebase-3.4.2.orig/khotkeys/kcontrol/Makefile.in	2005-07-20 21:08:14.000000000 +0000
++++ kdebase-3.4.2/khotkeys/kcontrol/Makefile.in	2005-07-26 19:06:41.116482736 +0000
+@@ -319,6 +319,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18235,7 +22006,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -634,7 +637,7 @@
+@@ -635,7 +638,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18244,7 +22015,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -672,9 +675,9 @@
+@@ -673,9 +676,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18256,10 +22027,127 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -1113,18 +1116,18 @@
+ mocs: gestures_settings_tab.moc
+ 
+ #>+ 3
+-action_group_tab.moc: $(srcdir)/action_group_tab.h
+-	$(MOC) $(srcdir)/action_group_tab.h -o action_group_tab.moc
++gesture_triggers_tab.moc: $(srcdir)/gesture_triggers_tab.h
++	$(MOC) $(srcdir)/gesture_triggers_tab.h -o gesture_triggers_tab.moc
+ 
+ #>+ 2
+-mocs: action_group_tab.moc
++mocs: gesture_triggers_tab.moc
+ 
+ #>+ 3
+-gesture_triggers_tab.moc: $(srcdir)/gesture_triggers_tab.h
+-	$(MOC) $(srcdir)/gesture_triggers_tab.h -o gesture_triggers_tab.moc
++action_group_tab.moc: $(srcdir)/action_group_tab.h
++	$(MOC) $(srcdir)/action_group_tab.h -o action_group_tab.moc
+ 
+ #>+ 2
+-mocs: gesture_triggers_tab.moc
++mocs: action_group_tab.moc
+ 
+ #>+ 3
+ kcmkhotkeys.moc: $(srcdir)/kcmkhotkeys.h
+@@ -1169,6 +1172,13 @@
+ 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
+ 	$(MOC) $(srcdir)/main_buttons_widget.h -o main_buttons_widget.moc
+ 
+@@ -1183,13 +1193,6 @@
+ mocs: menuentry_widget.moc
+ 
+ #>+ 3
+-gesturerecorder.moc: $(srcdir)/gesturerecorder.h
+-	$(MOC) $(srcdir)/gesturerecorder.h -o gesturerecorder.moc
+-
+-#>+ 2
+-mocs: gesturerecorder.moc
+-
+-#>+ 3
+ general_tab.moc: $(srcdir)/general_tab.h
+ 	$(MOC) $(srcdir)/general_tab.h -o general_tab.moc
+ 
+@@ -1211,13 +1214,6 @@
+ mocs: gesturerecordpage.moc
+ 
+ #>+ 3
+-command_url_widget.moc: $(srcdir)/command_url_widget.h
+-	$(MOC) $(srcdir)/command_url_widget.h -o command_url_widget.moc
+-
+-#>+ 2
+-mocs: command_url_widget.moc
+-
+-#>+ 3
+ triggers_tab.moc: $(srcdir)/triggers_tab.h
+ 	$(MOC) $(srcdir)/triggers_tab.h -o triggers_tab.moc
+ 
+@@ -1232,6 +1228,13 @@
+ mocs: windowselector.moc
+ 
+ #>+ 3
++command_url_widget.moc: $(srcdir)/command_url_widget.h
++	$(MOC) $(srcdir)/command_url_widget.h -o command_url_widget.moc
++
++#>+ 2
++mocs: command_url_widget.moc
++
++#>+ 3
+ keyboard_input_widget.moc: $(srcdir)/keyboard_input_widget.h
+ 	$(MOC) $(srcdir)/keyboard_input_widget.h -o keyboard_input_widget.moc
+ 
+@@ -1261,7 +1264,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  gesturedrawer.moc windowdef_simple_widget.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 actions_listview_widget.moc action_list_widget.moc main_buttons_widget.moc menuentry_widget.moc gesturerecorder.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
++	-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 
+@@ -1275,14 +1278,14 @@
+ 
+ #>+ 10
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/hi32-app-khotkeys.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/khotkeys.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi16-app-khotkeys.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/khotkeys.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/hi32-app-khotkeys.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/khotkeys.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/khotkeys.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/khotkeys.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/khotkeys.png
+ 
+ #>+ 15
+ force-reedit:
+@@ -1323,7 +1326,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  windowdef_simple_widget.moc gesturedrawer.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 action_list_widget.moc actions_listview_widget.moc gesturerecorder.moc menuentry_widget.moc main_buttons_widget.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
++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; \
+diff -Nru kdebase-3.4.2.orig/khotkeys/kcontrol/ui/Makefile.in kdebase-3.4.2/khotkeys/kcontrol/ui/Makefile.in
+--- kdebase-3.4.2.orig/khotkeys/kcontrol/ui/Makefile.in	2005-07-20 21:08:14.000000000 +0000
++++ kdebase-3.4.2/khotkeys/kcontrol/ui/Makefile.in	2005-07-26 19:06:41.158476352 +0000
+@@ -273,6 +273,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18269,7 +22157,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -580,7 +583,7 @@
+@@ -581,7 +584,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18278,7 +22166,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -618,9 +621,9 @@
+@@ -619,9 +622,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18290,10 +22178,19 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-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 @@
+@@ -854,7 +857,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.2.orig/khotkeys/Makefile.in kdebase-3.4.2/khotkeys/Makefile.in
+--- kdebase-3.4.2.orig/khotkeys/Makefile.in	2005-07-20 21:08:14.000000000 +0000
++++ kdebase-3.4.2/khotkeys/Makefile.in	2005-07-26 19:06:40.900515568 +0000
+@@ -263,6 +263,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18303,7 +22200,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -553,7 +556,7 @@
+@@ -554,7 +557,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -18312,7 +22209,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -591,9 +594,9 @@
+@@ -592,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18324,10 +22221,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/khotkeys/shared/Makefile.in kdebase-3.4.2/khotkeys/shared/Makefile.in
+--- kdebase-3.4.2.orig/khotkeys/shared/Makefile.in	2005-07-20 21:08:15.000000000 +0000
++++ kdebase-3.4.2/khotkeys/shared/Makefile.in	2005-07-26 19:06:41.221466776 +0000
+@@ -280,6 +280,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18337,7 +22234,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -581,7 +584,7 @@
+@@ -582,7 +585,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18346,7 +22243,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -619,9 +622,9 @@
+@@ -620,9 +623,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18358,10 +22255,49 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-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 @@
+@@ -908,22 +911,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 
+@@ -974,7 +977,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.2.orig/khotkeys/update/Makefile.in kdebase-3.4.2/khotkeys/update/Makefile.in
+--- kdebase-3.4.2.orig/khotkeys/update/Makefile.in	2005-07-20 21:08:15.000000000 +0000
++++ kdebase-3.4.2/khotkeys/update/Makefile.in	2005-07-26 19:06:41.250462368 +0000
+@@ -273,6 +273,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18371,7 +22307,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -566,7 +569,7 @@
+@@ -567,7 +570,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18380,7 +22316,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -604,9 +607,9 @@
+@@ -605,9 +608,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18392,10 +22328,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kconfPROGRAMS: $(kconf_PROGRAMS)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kicker/applets/clock/Makefile.in kdebase-3.4.2/kicker/applets/clock/Makefile.in
+--- kdebase-3.4.2.orig/kicker/applets/clock/Makefile.in	2005-07-20 21:08:15.000000000 +0000
++++ kdebase-3.4.2/kicker/applets/clock/Makefile.in	2005-07-26 19:06:41.439433640 +0000
+@@ -285,6 +285,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18405,7 +22341,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -587,7 +590,7 @@
+@@ -588,7 +591,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18414,7 +22350,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -625,9 +628,9 @@
+@@ -626,9 +629,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18426,10 +22362,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kicker/applets/launcher/Makefile.in kdebase-3.4.2/kicker/applets/launcher/Makefile.in
+--- kdebase-3.4.2.orig/kicker/applets/launcher/Makefile.in	2005-07-20 21:08:15.000000000 +0000
++++ kdebase-3.4.2/kicker/applets/launcher/Makefile.in	2005-07-26 19:06:41.500424368 +0000
+@@ -292,6 +292,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18439,7 +22375,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -592,7 +595,7 @@
+@@ -593,7 +596,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18448,7 +22384,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -630,9 +633,9 @@
+@@ -631,9 +634,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18460,10 +22396,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kicker/applets/lockout/Makefile.in kdebase-3.4.2/kicker/applets/lockout/Makefile.in
+--- kdebase-3.4.2.orig/kicker/applets/lockout/Makefile.in	2005-07-20 21:08:15.000000000 +0000
++++ kdebase-3.4.2/kicker/applets/lockout/Makefile.in	2005-07-26 19:06:41.530419808 +0000
+@@ -283,6 +283,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18473,7 +22409,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -580,7 +583,7 @@
+@@ -581,7 +584,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18482,7 +22418,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -618,9 +621,9 @@
+@@ -619,9 +622,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18494,10 +22430,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kicker/applets/Makefile.in kdebase-3.4.2/kicker/applets/Makefile.in
+--- kdebase-3.4.2.orig/kicker/applets/Makefile.in	2005-07-20 21:08:15.000000000 +0000
++++ kdebase-3.4.2/kicker/applets/Makefile.in	2005-07-26 19:06:41.313452792 +0000
+@@ -252,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18507,7 +22443,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -540,7 +543,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -18516,7 +22452,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -578,9 +581,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18528,10 +22464,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kicker/applets/media/Makefile.in kdebase-3.4.2/kicker/applets/media/Makefile.in
+--- kdebase-3.4.2.orig/kicker/applets/media/Makefile.in	2005-07-20 21:08:15.000000000 +0000
++++ kdebase-3.4.2/kicker/applets/media/Makefile.in	2005-07-26 19:06:41.564414640 +0000
+@@ -290,6 +290,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18541,7 +22477,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -587,7 +590,7 @@
+@@ -588,7 +591,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18550,7 +22486,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -625,9 +628,9 @@
+@@ -626,9 +629,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18562,10 +22498,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kicker/applets/menu/Makefile.in kdebase-3.4.2/kicker/applets/menu/Makefile.in
+--- kdebase-3.4.2.orig/kicker/applets/menu/Makefile.in	2005-07-20 21:08:15.000000000 +0000
++++ kdebase-3.4.2/kicker/applets/menu/Makefile.in	2005-07-26 19:06:41.608407952 +0000
+@@ -286,6 +286,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18575,7 +22511,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -586,7 +589,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18584,7 +22520,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -624,9 +627,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18596,10 +22532,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kicker/applets/minipager/Makefile.in kdebase-3.4.2/kicker/applets/minipager/Makefile.in
+--- kdebase-3.4.2.orig/kicker/applets/minipager/Makefile.in	2005-07-20 21:08:15.000000000 +0000
++++ kdebase-3.4.2/kicker/applets/minipager/Makefile.in	2005-07-26 19:06:41.654400960 +0000
+@@ -284,6 +284,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18609,7 +22545,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -581,7 +584,7 @@
+@@ -582,7 +585,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18618,7 +22554,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -619,9 +622,9 @@
+@@ -620,9 +623,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18630,10 +22566,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kicker/applets/naughty/Makefile.in kdebase-3.4.2/kicker/applets/naughty/Makefile.in
+--- kdebase-3.4.2.orig/kicker/applets/naughty/Makefile.in	2005-07-20 21:08:15.000000000 +0000
++++ kdebase-3.4.2/kicker/applets/naughty/Makefile.in	2005-07-26 19:06:41.689395640 +0000
+@@ -291,6 +291,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18643,7 +22579,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -598,7 +601,7 @@
+@@ -599,7 +602,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18652,7 +22588,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -636,9 +639,9 @@
+@@ -637,9 +640,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18664,10 +22600,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kicker/applets/run/Makefile.in kdebase-3.4.2/kicker/applets/run/Makefile.in
+--- kdebase-3.4.2.orig/kicker/applets/run/Makefile.in	2005-07-20 21:08:15.000000000 +0000
++++ kdebase-3.4.2/kicker/applets/run/Makefile.in	2005-07-26 19:06:41.727389864 +0000
+@@ -284,6 +284,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18677,7 +22613,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -581,7 +584,7 @@
+@@ -582,7 +585,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18686,7 +22622,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -619,9 +622,9 @@
+@@ -620,9 +623,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18698,10 +22634,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kicker/applets/swallow/Makefile.in kdebase-3.4.2/kicker/applets/swallow/Makefile.in
+--- kdebase-3.4.2.orig/kicker/applets/swallow/Makefile.in	2005-07-20 21:08:15.000000000 +0000
++++ kdebase-3.4.2/kicker/applets/swallow/Makefile.in	2005-07-26 19:06:41.761384696 +0000
+@@ -288,6 +288,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18711,7 +22647,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -586,7 +589,7 @@
+@@ -587,7 +590,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18720,7 +22656,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -624,9 +627,9 @@
+@@ -625,9 +628,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18732,10 +22668,59 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -917,22 +920,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 
+@@ -988,7 +991,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; \
+@@ -1032,8 +1035,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.2.orig/kicker/applets/systemtray/Makefile.in kdebase-3.4.2/kicker/applets/systemtray/Makefile.in
+--- kdebase-3.4.2.orig/kicker/applets/systemtray/Makefile.in	2005-07-20 21:08:15.000000000 +0000
++++ kdebase-3.4.2/kicker/applets/systemtray/Makefile.in	2005-07-26 19:06:41.793379832 +0000
+@@ -290,6 +290,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18745,7 +22730,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -589,7 +592,7 @@
+@@ -590,7 +593,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18754,7 +22739,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -627,9 +630,9 @@
+@@ -628,9 +631,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18766,10 +22751,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kicker/applets/taskbar/Makefile.in kdebase-3.4.2/kicker/applets/taskbar/Makefile.in
+--- kdebase-3.4.2.orig/kicker/applets/taskbar/Makefile.in	2005-07-20 21:08:15.000000000 +0000
++++ kdebase-3.4.2/kicker/applets/taskbar/Makefile.in	2005-07-26 19:06:41.823375272 +0000
+@@ -284,6 +284,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18779,7 +22764,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -581,7 +584,7 @@
+@@ -582,7 +585,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18788,7 +22773,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -619,9 +622,9 @@
+@@ -620,9 +623,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18800,10 +22785,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kicker/applets/trash/Makefile.in kdebase-3.4.2/kicker/applets/trash/Makefile.in
+--- kdebase-3.4.2.orig/kicker/applets/trash/Makefile.in	2005-07-20 21:08:15.000000000 +0000
++++ kdebase-3.4.2/kicker/applets/trash/Makefile.in	2005-07-26 19:06:41.870368128 +0000
+@@ -288,6 +288,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18813,7 +22798,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -587,7 +590,7 @@
+@@ -588,7 +591,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18822,7 +22807,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -625,9 +628,9 @@
+@@ -626,9 +629,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18834,10 +22819,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kicker/buttons/Makefile.in kdebase-3.4.2/kicker/buttons/Makefile.in
+--- kdebase-3.4.2.orig/kicker/buttons/Makefile.in	2005-07-20 21:08:17.000000000 +0000
++++ kdebase-3.4.2/kicker/buttons/Makefile.in	2005-07-26 19:06:41.936358096 +0000
+@@ -280,6 +280,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18847,7 +22832,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -578,7 +581,7 @@
+@@ -579,7 +582,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18856,7 +22841,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -616,9 +619,9 @@
+@@ -617,9 +620,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18868,10 +22853,68 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-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 @@
+@@ -906,11 +909,11 @@
+ mocs: servicebutton.moc
+ 
+ #>+ 3
+-kbutton.moc: $(srcdir)/kbutton.h
+-	$(MOC) $(srcdir)/kbutton.h -o kbutton.moc
++desktopbutton.moc: $(srcdir)/desktopbutton.h
++	$(MOC) $(srcdir)/desktopbutton.h -o desktopbutton.moc
+ 
+ #>+ 2
+-mocs: kbutton.moc
++mocs: desktopbutton.moc
+ 
+ #>+ 3
+ servicemenubutton.moc: $(srcdir)/servicemenubutton.h
+@@ -920,11 +923,11 @@
+ mocs: servicemenubutton.moc
+ 
+ #>+ 3
+-desktopbutton.moc: $(srcdir)/desktopbutton.h
+-	$(MOC) $(srcdir)/desktopbutton.h -o desktopbutton.moc
++kbutton.moc: $(srcdir)/kbutton.h
++	$(MOC) $(srcdir)/kbutton.h -o kbutton.moc
+ 
+ #>+ 2
+-mocs: desktopbutton.moc
++mocs: kbutton.moc
+ 
+ #>+ 3
+ nonkdeappbutton.moc: $(srcdir)/nonkdeappbutton.h
+@@ -942,7 +945,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  browserbutton.moc urlbutton.moc extensionbutton.moc windowlistbutton.moc servicebutton.moc kbutton.moc servicemenubutton.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 
+@@ -989,7 +992,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 windowlistbutton.moc extensionbutton.moc servicebutton.moc desktopbutton.moc servicemenubutton.moc kbutton.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; \
+@@ -1032,8 +1035,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.2.orig/kicker/core/Makefile.in kdebase-3.4.2/kicker/core/Makefile.in
+--- kdebase-3.4.2.orig/kicker/core/Makefile.in	2005-07-20 21:08:17.000000000 +0000
++++ kdebase-3.4.2/kicker/core/Makefile.in	2005-07-26 19:06:42.132328304 +0000
+@@ -295,6 +295,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18881,7 +22924,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -612,7 +615,7 @@
+@@ -613,7 +616,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18890,7 +22933,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -650,9 +653,9 @@
+@@ -651,9 +654,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18902,10 +22945,103 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-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 @@
+@@ -968,18 +971,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
+@@ -1017,18 +1020,18 @@
+ mocs: pluginmanager.moc
+ 
+ #>+ 3
+-container_button.moc: $(srcdir)/container_button.h
+-	$(MOC) $(srcdir)/container_button.h -o container_button.moc
++unhidetrigger.moc: $(srcdir)/unhidetrigger.h
++	$(MOC) $(srcdir)/unhidetrigger.h -o unhidetrigger.moc
+ 
+ #>+ 2
+-mocs: container_button.moc
++mocs: unhidetrigger.moc
+ 
+ #>+ 3
+-unhidetrigger.moc: $(srcdir)/unhidetrigger.h
+-	$(MOC) $(srcdir)/unhidetrigger.h -o unhidetrigger.moc
++container_button.moc: $(srcdir)/container_button.h
++	$(MOC) $(srcdir)/container_button.h -o container_button.moc
+ 
+ #>+ 2
+-mocs: unhidetrigger.moc
++mocs: container_button.moc
+ 
+ #>+ 3
+ showdesktop.moc: $(srcdir)/showdesktop.h
+@@ -1045,18 +1048,18 @@
+ mocs: extensionmanager.moc
+ 
+ #>+ 3
+-kicker.moc: $(srcdir)/kicker.h
+-	$(MOC) $(srcdir)/kicker.h -o kicker.moc
++panelextension.moc: $(srcdir)/panelextension.h
++	$(MOC) $(srcdir)/panelextension.h -o panelextension.moc
+ 
+ #>+ 2
+-mocs: kicker.moc
++mocs: panelextension.moc
+ 
+ #>+ 3
+-panelextension.moc: $(srcdir)/panelextension.h
+-	$(MOC) $(srcdir)/panelextension.h -o panelextension.moc
++kicker.moc: $(srcdir)/kicker.h
++	$(MOC) $(srcdir)/kicker.h -o kicker.moc
+ 
+ #>+ 2
+-mocs: panelextension.moc
++mocs: kicker.moc
+ 
+ #>+ 3
+ userrectsel.moc: $(srcdir)/userrectsel.h
+@@ -1067,7 +1070,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  container_extension.moc container_base.moc container_applet.moc applethandle.moc containerarea.moc menumanager.moc pluginmanager.moc container_button.moc unhidetrigger.moc showdesktop.moc extensionmanager.moc kicker.moc panelextension.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 
+@@ -1125,7 +1128,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 menumanager.moc containerarea.moc pluginmanager.moc unhidetrigger.moc container_button.moc showdesktop.moc extensionmanager.moc panelextension.moc kicker.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.2.orig/kicker/data/app_start_anim/Makefile.in kdebase-3.4.2/kicker/data/app_start_anim/Makefile.in
+--- kdebase-3.4.2.orig/kicker/data/app_start_anim/Makefile.in	2005-07-20 21:08:17.000000000 +0000
++++ kdebase-3.4.2/kicker/data/app_start_anim/Makefile.in	2005-07-26 19:06:42.167322984 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18915,7 +23051,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -536,7 +539,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18924,7 +23060,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -574,9 +577,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18936,10 +23072,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kicker/data/icons/actions/Makefile.in kdebase-3.4.2/kicker/data/icons/actions/Makefile.in
+--- kdebase-3.4.2.orig/kicker/data/icons/actions/Makefile.in	2005-07-20 21:08:17.000000000 +0000
++++ kdebase-3.4.2/kicker/data/icons/actions/Makefile.in	2005-07-26 19:06:42.224314320 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18949,7 +23085,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18958,7 +23094,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18970,10 +23106,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kicker/data/icons/Makefile.in kdebase-3.4.2/kicker/data/icons/Makefile.in
+--- kdebase-3.4.2.orig/kicker/data/icons/Makefile.in	2005-07-20 21:08:17.000000000 +0000
++++ kdebase-3.4.2/kicker/data/icons/Makefile.in	2005-07-26 19:06:42.206317056 +0000
+@@ -252,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18983,7 +23119,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -540,7 +543,7 @@
+@@ -541,7 +544,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -18992,7 +23128,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -578,9 +581,9 @@
+@@ -579,9 +582,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19004,10 +23140,80 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -879,45 +882,45 @@
+ 
+ #>+ 41
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-window_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/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
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kicker.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kdisknav.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdisknav.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmenu.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-window_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/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
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmenu.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kdisknav.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdisknav.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmenu.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
++	$(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
++	$(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
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-panel.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-window_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/window_list.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-window_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/window_list.png
+ 	$(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/scalable/apps
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-kmenu.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kmenu.svgz
++	$(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/16x16/apps/kmenu.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/window_list.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/32x32/apps/kdisknav.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kicker.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdisknav.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kmenu.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmenu.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdisknav.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmenu.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/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/16x16/apps/panel.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/window_list.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/window_list.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kmenu.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kmenu.svgz
++	-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.2.orig/kicker/data/kmenu_side/Makefile.in kdebase-3.4.2/kicker/data/kmenu_side/Makefile.in
+--- kdebase-3.4.2.orig/kicker/data/kmenu_side/Makefile.in	2005-07-20 21:08:17.000000000 +0000
++++ kdebase-3.4.2/kicker/data/kmenu_side/Makefile.in	2005-07-26 19:06:42.241311736 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19017,7 +23223,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -536,7 +539,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19026,7 +23232,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -574,9 +577,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19038,10 +23244,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kicker/data/Makefile.in kdebase-3.4.2/kicker/data/Makefile.in
+--- kdebase-3.4.2.orig/kicker/data/Makefile.in	2005-07-20 21:08:17.000000000 +0000
++++ kdebase-3.4.2/kicker/data/Makefile.in	2005-07-26 19:06:42.150325568 +0000
+@@ -252,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19051,7 +23257,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -540,7 +543,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -19060,7 +23266,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -578,9 +581,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19072,10 +23278,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kicker/data/tiles/Makefile.in kdebase-3.4.2/kicker/data/tiles/Makefile.in
+--- kdebase-3.4.2.orig/kicker/data/tiles/Makefile.in	2005-07-20 21:08:17.000000000 +0000
++++ kdebase-3.4.2/kicker/data/tiles/Makefile.in	2005-07-26 19:06:42.271307176 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19085,7 +23291,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -586,7 +589,7 @@
+@@ -587,7 +590,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19094,7 +23300,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -624,9 +627,9 @@
+@@ -625,9 +628,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19106,10 +23312,19 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -787,7 +790,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 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_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 light_pastel_normal_up.png solid_gray_normal_down.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.2.orig/kicker/data/wallpaper/Makefile.in kdebase-3.4.2/kicker/data/wallpaper/Makefile.in
+--- kdebase-3.4.2.orig/kicker/data/wallpaper/Makefile.in	2005-07-20 21:08:17.000000000 +0000
++++ kdebase-3.4.2/kicker/data/wallpaper/Makefile.in	2005-07-26 19:06:42.288304592 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19119,7 +23334,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -536,7 +539,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19128,7 +23343,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -574,9 +577,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19140,10 +23355,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kicker/extensions/dockbar/Makefile.in kdebase-3.4.2/kicker/extensions/dockbar/Makefile.in
+--- kdebase-3.4.2.orig/kicker/extensions/dockbar/Makefile.in	2005-07-20 21:08:17.000000000 +0000
++++ kdebase-3.4.2/kicker/extensions/dockbar/Makefile.in	2005-07-26 19:06:42.376291216 +0000
+@@ -289,6 +289,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19153,7 +23368,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -586,7 +589,7 @@
+@@ -587,7 +590,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19162,7 +23377,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -624,9 +627,9 @@
+@@ -625,9 +628,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19174,10 +23389,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kicker/extensions/kasbar/Makefile.in kdebase-3.4.2/kicker/extensions/kasbar/Makefile.in
+--- kdebase-3.4.2.orig/kicker/extensions/kasbar/Makefile.in	2005-07-20 21:08:17.000000000 +0000
++++ kdebase-3.4.2/kicker/extensions/kasbar/Makefile.in	2005-07-26 19:06:42.489274040 +0000
+@@ -313,6 +313,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19187,7 +23402,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -639,7 +642,7 @@
+@@ -640,7 +643,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19196,7 +23411,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -677,9 +680,9 @@
+@@ -678,9 +681,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19208,10 +23423,56 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -1087,6 +1090,13 @@
+ mocs: kasbarextension.moc
+ 
+ #>+ 3
++kasaboutdlg.moc: $(srcdir)/kasaboutdlg.h
++	$(MOC) $(srcdir)/kasaboutdlg.h -o kasaboutdlg.moc
++
++#>+ 2
++mocs: kasaboutdlg.moc
++
++#>+ 3
+ kasclockitem.moc: $(srcdir)/kasclockitem.h
+ 	$(MOC) $(srcdir)/kasclockitem.h -o kasclockitem.moc
+ 
+@@ -1101,13 +1111,6 @@
+ mocs: kasitem.moc
+ 
+ #>+ 3
+-kasaboutdlg.moc: $(srcdir)/kasaboutdlg.h
+-	$(MOC) $(srcdir)/kasaboutdlg.h -o kasaboutdlg.moc
+-
+-#>+ 2
+-mocs: kasaboutdlg.moc
+-
+-#>+ 3
+ kasresources.moc: $(srcdir)/kasresources.h
+ 	$(MOC) $(srcdir)/kasresources.h -o kasresources.moc
+ 
+@@ -1167,7 +1170,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  kasgroupitem.moc kastaskitem.moc kastasker.moc kasbarextension.moc kasclockitem.moc kasitem.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 configure.in.in docs.h kastaskpopup.h kasbarextension.desktop Makefile.am 
+@@ -1218,7 +1221,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 kasitem.moc kasclockitem.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.2.orig/kicker/extensions/Makefile.in kdebase-3.4.2/kicker/extensions/Makefile.in
+--- kdebase-3.4.2.orig/kicker/extensions/Makefile.in	2005-07-20 21:08:17.000000000 +0000
++++ kdebase-3.4.2/kicker/extensions/Makefile.in	2005-07-26 19:06:42.306301856 +0000
+@@ -252,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19221,7 +23482,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -540,7 +543,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -19230,7 +23491,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -578,9 +581,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19242,10 +23503,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kicker/extensions/sidebar/Makefile.in kdebase-3.4.2/kicker/extensions/sidebar/Makefile.in
+--- kdebase-3.4.2.orig/kicker/extensions/sidebar/Makefile.in	2005-07-20 21:08:17.000000000 +0000
++++ kdebase-3.4.2/kicker/extensions/sidebar/Makefile.in	2005-07-26 19:06:42.518269632 +0000
+@@ -282,6 +282,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19255,7 +23516,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -577,7 +580,7 @@
+@@ -578,7 +581,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19264,7 +23525,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -615,9 +618,9 @@
+@@ -616,9 +619,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19276,10 +23537,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kicker/extensions/taskbar/Makefile.in kdebase-3.4.2/kicker/extensions/taskbar/Makefile.in
+--- kdebase-3.4.2.orig/kicker/extensions/taskbar/Makefile.in	2005-07-20 21:08:17.000000000 +0000
++++ kdebase-3.4.2/kicker/extensions/taskbar/Makefile.in	2005-07-26 19:06:42.549264920 +0000
+@@ -290,6 +290,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19289,7 +23550,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -593,7 +596,7 @@
+@@ -594,7 +597,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19298,7 +23559,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -631,9 +634,9 @@
+@@ -632,9 +635,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19310,10 +23571,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kicker/Makefile.in kdebase-3.4.2/kicker/Makefile.in
+--- kdebase-3.4.2.orig/kicker/Makefile.in	2005-07-20 21:08:15.000000000 +0000
++++ kdebase-3.4.2/kicker/Makefile.in	2005-07-26 19:06:41.293455832 +0000
+@@ -334,6 +334,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19323,7 +23584,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -645,7 +648,7 @@
+@@ -646,7 +649,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19332,7 +23593,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -683,9 +686,9 @@
+@@ -684,9 +687,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19344,10 +23605,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kicker/menuext/find/Makefile.in kdebase-3.4.2/kicker/menuext/find/Makefile.in
+--- kdebase-3.4.2.orig/kicker/menuext/find/Makefile.in	2005-07-20 21:08:17.000000000 +0000
++++ kdebase-3.4.2/kicker/menuext/find/Makefile.in	2005-07-26 19:06:42.614255040 +0000
+@@ -282,6 +282,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19357,7 +23618,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -579,7 +582,7 @@
+@@ -580,7 +583,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19366,7 +23627,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -617,9 +620,9 @@
+@@ -618,9 +621,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19378,10 +23639,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kicker/menuext/kdeprint/Makefile.in kdebase-3.4.2/kicker/menuext/kdeprint/Makefile.in
+--- kdebase-3.4.2.orig/kicker/menuext/kdeprint/Makefile.in	2005-07-20 21:08:17.000000000 +0000
++++ kdebase-3.4.2/kicker/menuext/kdeprint/Makefile.in	2005-07-26 19:06:42.642250784 +0000
+@@ -282,6 +282,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19391,7 +23652,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -577,7 +580,7 @@
+@@ -578,7 +581,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19400,7 +23661,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -615,9 +618,9 @@
+@@ -616,9 +619,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19412,10 +23673,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kicker/menuext/konq-profiles/Makefile.in kdebase-3.4.2/kicker/menuext/konq-profiles/Makefile.in
+--- kdebase-3.4.2.orig/kicker/menuext/konq-profiles/Makefile.in	2005-07-20 21:08:17.000000000 +0000
++++ kdebase-3.4.2/kicker/menuext/konq-profiles/Makefile.in	2005-07-26 19:06:42.687243944 +0000
+@@ -283,6 +283,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19425,7 +23686,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -578,7 +581,7 @@
+@@ -579,7 +582,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19434,7 +23695,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -616,9 +619,9 @@
+@@ -617,9 +620,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19446,10 +23707,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kicker/menuext/konsole/Makefile.in kdebase-3.4.2/kicker/menuext/konsole/Makefile.in
+--- kdebase-3.4.2.orig/kicker/menuext/konsole/Makefile.in	2005-07-20 21:08:17.000000000 +0000
++++ kdebase-3.4.2/kicker/menuext/konsole/Makefile.in	2005-07-26 19:06:42.720238928 +0000
+@@ -287,6 +287,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19459,7 +23720,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -582,7 +585,7 @@
+@@ -583,7 +586,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19468,7 +23729,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -620,9 +623,9 @@
+@@ -621,9 +624,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19480,10 +23741,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kicker/menuext/Makefile.in kdebase-3.4.2/kicker/menuext/Makefile.in
+--- kdebase-3.4.2.orig/kicker/menuext/Makefile.in	2005-07-20 21:08:17.000000000 +0000
++++ kdebase-3.4.2/kicker/menuext/Makefile.in	2005-07-26 19:06:42.576260816 +0000
+@@ -252,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19493,7 +23754,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -540,7 +543,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -19502,7 +23763,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -578,9 +581,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19514,10 +23775,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kicker/menuext/prefmenu/Makefile.in kdebase-3.4.2/kicker/menuext/prefmenu/Makefile.in
+--- kdebase-3.4.2.orig/kicker/menuext/prefmenu/Makefile.in	2005-07-20 21:08:17.000000000 +0000
++++ kdebase-3.4.2/kicker/menuext/prefmenu/Makefile.in	2005-07-26 19:06:42.765232088 +0000
+@@ -282,6 +282,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19527,7 +23788,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -577,7 +580,7 @@
+@@ -578,7 +581,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19536,7 +23797,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -615,9 +618,9 @@
+@@ -616,9 +619,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19548,10 +23809,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kicker/menuext/recentdocs/Makefile.in kdebase-3.4.2/kicker/menuext/recentdocs/Makefile.in
+--- kdebase-3.4.2.orig/kicker/menuext/recentdocs/Makefile.in	2005-07-20 21:08:17.000000000 +0000
++++ kdebase-3.4.2/kicker/menuext/recentdocs/Makefile.in	2005-07-26 19:06:42.800226768 +0000
+@@ -282,6 +282,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19561,7 +23822,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -577,7 +580,7 @@
+@@ -578,7 +581,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19570,7 +23831,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -615,9 +618,9 @@
+@@ -616,9 +619,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19582,10 +23843,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kicker/menuext/remote/Makefile.in kdebase-3.4.2/kicker/menuext/remote/Makefile.in
+--- kdebase-3.4.2.orig/kicker/menuext/remote/Makefile.in	2005-07-20 21:08:18.000000000 +0000
++++ kdebase-3.4.2/kicker/menuext/remote/Makefile.in	2005-07-26 19:06:42.831222056 +0000
+@@ -285,6 +285,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19595,7 +23856,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -582,7 +585,7 @@
+@@ -583,7 +586,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19604,7 +23865,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -620,9 +623,9 @@
+@@ -621,9 +624,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19616,10 +23877,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kicker/menuext/system/Makefile.in kdebase-3.4.2/kicker/menuext/system/Makefile.in
+--- kdebase-3.4.2.orig/kicker/menuext/system/Makefile.in	2005-07-20 21:08:18.000000000 +0000
++++ kdebase-3.4.2/kicker/menuext/system/Makefile.in	2005-07-26 19:06:42.859217800 +0000
+@@ -282,6 +282,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19629,7 +23890,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -577,7 +580,7 @@
+@@ -578,7 +581,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19638,7 +23899,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -615,9 +618,9 @@
+@@ -616,9 +619,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19650,10 +23911,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kicker/menuext/tom/Makefile.in kdebase-3.4.2/kicker/menuext/tom/Makefile.in
+--- kdebase-3.4.2.orig/kicker/menuext/tom/Makefile.in	2005-07-20 21:08:18.000000000 +0000
++++ kdebase-3.4.2/kicker/menuext/tom/Makefile.in	2005-07-26 19:06:42.933206552 +0000
+@@ -282,6 +282,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19663,7 +23924,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -580,7 +583,7 @@
+@@ -581,7 +584,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -19672,7 +23933,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -618,9 +621,9 @@
+@@ -619,9 +622,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19684,10 +23945,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kicker/proxy/Makefile.in kdebase-3.4.2/kicker/proxy/Makefile.in
+--- kdebase-3.4.2.orig/kicker/proxy/Makefile.in	2005-07-20 21:08:18.000000000 +0000
++++ kdebase-3.4.2/kicker/proxy/Makefile.in	2005-07-26 19:06:42.997196824 +0000
+@@ -314,6 +314,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19697,7 +23958,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -620,7 +623,7 @@
+@@ -621,7 +624,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19706,7 +23967,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -658,9 +661,9 @@
+@@ -659,9 +662,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19718,10 +23979,44 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -1043,18 +1046,18 @@
+ extensionproxy_DEPENDENCIES = libkdeinit_extensionproxy.la
+ 
+ #>+ 3
+-appletproxy.moc: $(srcdir)/appletproxy.h
+-	$(MOC) $(srcdir)/appletproxy.h -o appletproxy.moc
++extensionproxy.moc: $(srcdir)/extensionproxy.h
++	$(MOC) $(srcdir)/extensionproxy.h -o extensionproxy.moc
+ 
+ #>+ 2
+-mocs: appletproxy.moc
++mocs: extensionproxy.moc
+ 
+ #>+ 3
+-extensionproxy.moc: $(srcdir)/extensionproxy.h
+-	$(MOC) $(srcdir)/extensionproxy.h -o extensionproxy.moc
++appletproxy.moc: $(srcdir)/appletproxy.h
++	$(MOC) $(srcdir)/appletproxy.h -o appletproxy.moc
+ 
+ #>+ 2
+-mocs: extensionproxy.moc
++mocs: appletproxy.moc
+ 
+ #>+ 3
+ extensiondebugger.moc: $(srcdir)/extensiondebugger.h
+@@ -1065,7 +1068,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  appletproxy.moc extensionproxy.moc extensiondebugger.moc
++	-rm -f  extensionproxy.moc appletproxy.moc extensiondebugger.moc
+ 
+ #>+ 2
+ KDE_DIST=Makefile.in appletproxy.h extensiondebugger.h extensionproxy.h Makefile.am 
+diff -Nru kdebase-3.4.2.orig/kicker/share/Makefile.in kdebase-3.4.2/kicker/share/Makefile.in
+--- kdebase-3.4.2.orig/kicker/share/Makefile.in	2005-07-20 21:08:18.000000000 +0000
++++ kdebase-3.4.2/kicker/share/Makefile.in	2005-07-26 19:06:43.035191048 +0000
+@@ -282,6 +282,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19731,7 +24026,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -584,7 +587,7 @@
+@@ -585,7 +588,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19740,7 +24035,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -622,9 +625,9 @@
+@@ -623,9 +626,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19752,10 +24047,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kicker/taskbar/Makefile.in kdebase-3.4.2/kicker/taskbar/Makefile.in
+--- kdebase-3.4.2.orig/kicker/taskbar/Makefile.in	2005-07-20 21:08:18.000000000 +0000
++++ kdebase-3.4.2/kicker/taskbar/Makefile.in	2005-07-26 19:06:43.071185576 +0000
+@@ -287,6 +287,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19765,7 +24060,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -592,7 +595,7 @@
+@@ -593,7 +596,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19774,7 +24069,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -630,9 +633,9 @@
+@@ -631,9 +634,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19786,10 +24081,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kicker/taskmanager/Makefile.in kdebase-3.4.2/kicker/taskmanager/Makefile.in
+--- kdebase-3.4.2.orig/kicker/taskmanager/Makefile.in	2005-07-20 21:08:18.000000000 +0000
++++ kdebase-3.4.2/kicker/taskmanager/Makefile.in	2005-07-26 19:06:43.129176760 +0000
+@@ -282,6 +282,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19799,7 +24094,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -577,7 +580,7 @@
+@@ -578,7 +581,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19808,7 +24103,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -615,9 +618,9 @@
+@@ -616,9 +619,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19820,10 +24115,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kicker/ui/Makefile.in kdebase-3.4.2/kicker/ui/Makefile.in
+--- kdebase-3.4.2.orig/kicker/ui/Makefile.in	2005-07-20 21:08:20.000000000 +0000
++++ kdebase-3.4.2/kicker/ui/Makefile.in	2005-07-26 19:06:44.988894040 +0000
+@@ -289,6 +289,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19833,7 +24128,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -609,7 +612,7 @@
+@@ -610,7 +613,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19842,7 +24137,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -647,9 +650,9 @@
+@@ -648,9 +651,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19854,10 +24149,83 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-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 @@
+@@ -993,11 +996,11 @@
+ mocs: addapplet_mnu.moc
+ 
+ #>+ 3
+-browser_dlg.moc: $(srcdir)/browser_dlg.h
+-	$(MOC) $(srcdir)/browser_dlg.h -o browser_dlg.moc
++service_mnu.moc: $(srcdir)/service_mnu.h
++	$(MOC) $(srcdir)/service_mnu.h -o service_mnu.moc
+ 
+ #>+ 2
+-mocs: browser_dlg.moc
++mocs: service_mnu.moc
+ 
+ #>+ 3
+ addcontainer_mnu.moc: $(srcdir)/addcontainer_mnu.h
+@@ -1007,11 +1010,11 @@
+ mocs: addcontainer_mnu.moc
+ 
+ #>+ 3
+-service_mnu.moc: $(srcdir)/service_mnu.h
+-	$(MOC) $(srcdir)/service_mnu.h -o service_mnu.moc
++browser_dlg.moc: $(srcdir)/browser_dlg.h
++	$(MOC) $(srcdir)/browser_dlg.h -o browser_dlg.moc
+ 
+ #>+ 2
+-mocs: service_mnu.moc
++mocs: browser_dlg.moc
+ 
+ #>+ 3
+ addbutton_mnu.moc: $(srcdir)/addbutton_mnu.h
+@@ -1028,18 +1031,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
+@@ -1057,7 +1060,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 browser_dlg.moc addcontainer_mnu.moc service_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 
+@@ -1109,7 +1112,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 browser_dlg.moc addcontainer_mnu.moc service_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.2.orig/kioslave/about/Makefile.in kdebase-3.4.2/kioslave/about/Makefile.in
+--- kdebase-3.4.2.orig/kioslave/about/Makefile.in	2005-07-20 21:08:20.000000000 +0000
++++ kdebase-3.4.2/kioslave/about/Makefile.in	2005-07-26 19:06:45.046885224 +0000
+@@ -284,6 +284,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19867,7 +24235,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -583,7 +586,7 @@
+@@ -584,7 +587,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19876,7 +24244,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -621,9 +624,9 @@
+@@ -622,9 +625,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19888,10 +24256,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kioslave/cgi/kcmcgi/Makefile.in kdebase-3.4.2/kioslave/cgi/kcmcgi/Makefile.in
+--- kdebase-3.4.2.orig/kioslave/cgi/kcmcgi/Makefile.in	2005-07-20 21:08:20.000000000 +0000
++++ kdebase-3.4.2/kioslave/cgi/kcmcgi/Makefile.in	2005-07-26 19:06:45.555807856 +0000
+@@ -284,6 +284,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19901,7 +24269,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -581,7 +584,7 @@
+@@ -582,7 +585,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19910,7 +24278,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -619,9 +622,9 @@
+@@ -620,9 +623,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19922,10 +24290,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kioslave/cgi/Makefile.in kdebase-3.4.2/kioslave/cgi/Makefile.in
+--- kdebase-3.4.2.orig/kioslave/cgi/Makefile.in	2005-07-20 21:08:20.000000000 +0000
++++ kdebase-3.4.2/kioslave/cgi/Makefile.in	2005-07-26 19:06:45.516813784 +0000
+@@ -298,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19935,7 +24303,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -595,7 +598,7 @@
+@@ -596,7 +599,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19944,7 +24312,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -633,9 +636,9 @@
+@@ -634,9 +637,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19956,10 +24324,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kioslave/filter/Makefile.in kdebase-3.4.2/kioslave/filter/Makefile.in
+--- kdebase-3.4.2.orig/kioslave/filter/Makefile.in	2005-07-20 21:08:20.000000000 +0000
++++ kdebase-3.4.2/kioslave/filter/Makefile.in	2005-07-26 19:06:45.583803600 +0000
+@@ -284,6 +284,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19969,7 +24337,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -582,7 +585,7 @@
+@@ -583,7 +586,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -19978,7 +24346,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -620,9 +623,9 @@
+@@ -621,9 +624,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19990,10 +24358,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kioslave/finger/Makefile.in kdebase-3.4.2/kioslave/finger/Makefile.in
+--- kdebase-3.4.2.orig/kioslave/finger/Makefile.in	2005-07-20 21:08:20.000000000 +0000
++++ kdebase-3.4.2/kioslave/finger/Makefile.in	2005-07-26 19:06:45.634795848 +0000
+@@ -284,6 +284,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20003,7 +24371,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -586,7 +589,7 @@
+@@ -587,7 +590,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20012,7 +24380,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -624,9 +627,9 @@
+@@ -625,9 +628,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20024,10 +24392,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kioslave/fish/Makefile.in kdebase-3.4.2/kioslave/fish/Makefile.in
+--- kdebase-3.4.2.orig/kioslave/fish/Makefile.in	2005-07-20 21:08:20.000000000 +0000
++++ kdebase-3.4.2/kioslave/fish/Makefile.in	2005-07-26 19:06:45.677789312 +0000
+@@ -284,6 +284,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20037,7 +24405,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -583,7 +586,7 @@
+@@ -584,7 +587,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20046,7 +24414,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -621,9 +624,9 @@
+@@ -622,9 +625,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20058,10 +24426,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kioslave/floppy/Makefile.in kdebase-3.4.2/kioslave/floppy/Makefile.in
+--- kdebase-3.4.2.orig/kioslave/floppy/Makefile.in	2005-07-20 21:08:20.000000000 +0000
++++ kdebase-3.4.2/kioslave/floppy/Makefile.in	2005-07-26 19:06:45.705785056 +0000
+@@ -285,6 +285,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20071,7 +24439,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -583,7 +586,7 @@
+@@ -584,7 +587,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20080,7 +24448,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -621,9 +624,9 @@
+@@ -622,9 +625,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20092,10 +24460,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kioslave/info/Makefile.in kdebase-3.4.2/kioslave/info/Makefile.in
+--- kdebase-3.4.2.orig/kioslave/info/Makefile.in	2005-07-20 21:08:20.000000000 +0000
++++ kdebase-3.4.2/kioslave/info/Makefile.in	2005-07-26 19:06:45.762776392 +0000
+@@ -289,6 +289,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20105,7 +24473,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -590,7 +593,7 @@
+@@ -591,7 +594,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -20114,7 +24482,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -628,9 +631,9 @@
+@@ -629,9 +632,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20126,10 +24494,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kioslave/ldap/Makefile.in kdebase-3.4.2/kioslave/ldap/Makefile.in
+--- kdebase-3.4.2.orig/kioslave/ldap/Makefile.in	2005-07-20 21:08:20.000000000 +0000
++++ kdebase-3.4.2/kioslave/ldap/Makefile.in	2005-07-26 19:06:45.789772288 +0000
+@@ -285,6 +285,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20139,7 +24507,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -584,7 +587,7 @@
+@@ -585,7 +588,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20148,7 +24516,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -622,9 +625,9 @@
+@@ -623,9 +626,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20160,10 +24528,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kioslave/mac/Makefile.in kdebase-3.4.2/kioslave/mac/Makefile.in
+--- kdebase-3.4.2.orig/kioslave/mac/Makefile.in	2005-07-20 21:08:20.000000000 +0000
++++ kdebase-3.4.2/kioslave/mac/Makefile.in	2005-07-26 19:06:45.866760584 +0000
+@@ -283,6 +283,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20173,7 +24541,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -583,7 +586,7 @@
+@@ -584,7 +587,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20182,7 +24550,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -621,9 +624,9 @@
+@@ -622,9 +625,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20194,10 +24562,28 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -938,14 +941,14 @@
+ 
+ #>+ 10
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-mac.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mac.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-mac.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mac.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/cr32-app-mac.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mac.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mac.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mac.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mac.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nru kdebase-3.4.2.orig/kioslave/Makefile.in kdebase-3.4.2/kioslave/Makefile.in
+--- kdebase-3.4.2.orig/kioslave/Makefile.in	2005-07-20 21:08:20.000000000 +0000
++++ kdebase-3.4.2/kioslave/Makefile.in	2005-07-26 19:06:45.007891152 +0000
+@@ -254,6 +254,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20207,7 +24593,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -546,7 +549,7 @@
+@@ -547,7 +550,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -20216,7 +24602,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -584,9 +587,9 @@
+@@ -585,9 +588,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20228,10 +24614,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kioslave/man/Makefile.in kdebase-3.4.2/kioslave/man/Makefile.in
+--- kdebase-3.4.2.orig/kioslave/man/Makefile.in	2005-07-20 21:08:20.000000000 +0000
++++ kdebase-3.4.2/kioslave/man/Makefile.in	2005-07-26 19:06:45.942749032 +0000
+@@ -307,6 +307,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20241,7 +24627,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -617,7 +620,7 @@
+@@ -618,7 +621,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20250,7 +24636,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -655,9 +658,9 @@
+@@ -656,9 +659,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20262,10 +24648,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kioslave/media/kdedmodule/Makefile.in kdebase-3.4.2/kioslave/media/kdedmodule/Makefile.in
+--- kdebase-3.4.2.orig/kioslave/media/kdedmodule/Makefile.in	2005-07-20 21:08:22.000000000 +0000
++++ kdebase-3.4.2/kioslave/media/kdedmodule/Makefile.in	2005-07-26 19:06:46.101724864 +0000
+@@ -322,6 +322,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20275,7 +24661,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -628,7 +631,7 @@
+@@ -629,7 +632,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20284,7 +24670,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -666,9 +669,9 @@
+@@ -667,9 +670,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20296,10 +24682,19 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -1019,7 +1022,7 @@
+ 	-rm -f  removablebackend.moc mediamanager.moc fstabbackend.moc halbackend.moc linuxcdpolling.moc medialist.moc
+ 
+ #>+ 2
+-KDE_DIST=fstabbackend.h mediadirnotify.h linuxcdpolling.h removablebackend.h Makefile.in halbackend.h mediamanager.desktop mediamanager.h backendbase.h medialist.h Makefile.am 
++KDE_DIST=fstabbackend.h linuxcdpolling.h mediadirnotify.h removablebackend.h Makefile.in halbackend.h mediamanager.desktop mediamanager.h backendbase.h medialist.h Makefile.am 
+ 
+ #>+ 5
+ clean-idl:
+diff -Nru kdebase-3.4.2.orig/kioslave/media/kfile-plugin/Makefile.in kdebase-3.4.2/kioslave/media/kfile-plugin/Makefile.in
+--- kdebase-3.4.2.orig/kioslave/media/kfile-plugin/Makefile.in	2005-07-20 21:08:22.000000000 +0000
++++ kdebase-3.4.2/kioslave/media/kfile-plugin/Makefile.in	2005-07-26 19:06:46.141718784 +0000
+@@ -285,6 +285,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20309,7 +24704,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -581,7 +584,7 @@
+@@ -582,7 +585,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20318,7 +24713,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -619,9 +622,9 @@
+@@ -620,9 +623,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20330,10 +24725,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kioslave/media/libmediacommon/Makefile.in kdebase-3.4.2/kioslave/media/libmediacommon/Makefile.in
+--- kdebase-3.4.2.orig/kioslave/media/libmediacommon/Makefile.in	2005-07-20 21:08:22.000000000 +0000
++++ kdebase-3.4.2/kioslave/media/libmediacommon/Makefile.in	2005-07-26 19:06:46.165715136 +0000
+@@ -268,6 +268,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20343,7 +24738,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -559,7 +562,7 @@
+@@ -560,7 +563,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20352,7 +24747,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -597,9 +600,9 @@
+@@ -598,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20364,10 +24759,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kioslave/media/Makefile.in kdebase-3.4.2/kioslave/media/Makefile.in
+--- kdebase-3.4.2.orig/kioslave/media/Makefile.in	2005-07-20 21:08:22.000000000 +0000
++++ kdebase-3.4.2/kioslave/media/Makefile.in	2005-07-26 19:06:46.035734896 +0000
+@@ -312,6 +312,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20377,7 +24772,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -616,7 +619,7 @@
+@@ -617,7 +620,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20386,7 +24781,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -654,9 +657,9 @@
+@@ -655,9 +658,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20398,10 +24793,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kioslave/media/mimetypes/Makefile.in kdebase-3.4.2/kioslave/media/mimetypes/Makefile.in
+--- kdebase-3.4.2.orig/kioslave/media/mimetypes/Makefile.in	2005-07-20 21:08:22.000000000 +0000
++++ kdebase-3.4.2/kioslave/media/mimetypes/Makefile.in	2005-07-26 19:06:46.184712248 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20411,7 +24806,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
+@@ -553,7 +556,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20420,7 +24815,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -591,9 +594,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20432,10 +24827,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kioslave/media/mounthelper/Makefile.in kdebase-3.4.2/kioslave/media/mounthelper/Makefile.in
+--- kdebase-3.4.2.orig/kioslave/media/mounthelper/Makefile.in	2005-07-20 21:08:22.000000000 +0000
++++ kdebase-3.4.2/kioslave/media/mounthelper/Makefile.in	2005-07-26 19:06:46.208708600 +0000
+@@ -272,6 +272,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20445,7 +24840,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -565,7 +568,7 @@
+@@ -566,7 +569,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20454,7 +24849,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -603,9 +606,9 @@
+@@ -604,9 +607,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20466,10 +24861,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kioslave/media/services/Makefile.in kdebase-3.4.2/kioslave/media/services/Makefile.in
+--- kdebase-3.4.2.orig/kioslave/media/services/Makefile.in	2005-07-20 21:08:22.000000000 +0000
++++ kdebase-3.4.2/kioslave/media/services/Makefile.in	2005-07-26 19:06:46.225706016 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20479,7 +24874,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -535,7 +538,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20488,7 +24883,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -573,9 +576,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20500,10 +24895,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kioslave/nfs/Makefile.in kdebase-3.4.2/kioslave/nfs/Makefile.in
+--- kdebase-3.4.2.orig/kioslave/nfs/Makefile.in	2005-07-20 21:08:22.000000000 +0000
++++ kdebase-3.4.2/kioslave/nfs/Makefile.in	2005-07-26 19:06:46.256701304 +0000
+@@ -295,6 +295,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20513,7 +24908,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -594,7 +597,7 @@
+@@ -595,7 +598,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -20522,7 +24917,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -632,9 +635,9 @@
+@@ -633,9 +636,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20534,10 +24929,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kioslave/nntp/Makefile.in kdebase-3.4.2/kioslave/nntp/Makefile.in
+--- kdebase-3.4.2.orig/kioslave/nntp/Makefile.in	2005-07-20 21:08:22.000000000 +0000
++++ kdebase-3.4.2/kioslave/nntp/Makefile.in	2005-07-26 19:06:46.318691880 +0000
+@@ -284,6 +284,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20547,7 +24942,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -582,7 +585,7 @@
+@@ -583,7 +586,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20556,7 +24951,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -620,9 +623,9 @@
+@@ -621,9 +624,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20568,10 +24963,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kioslave/pop3/Makefile.in kdebase-3.4.2/kioslave/pop3/Makefile.in
+--- kdebase-3.4.2.orig/kioslave/pop3/Makefile.in	2005-07-20 21:08:22.000000000 +0000
++++ kdebase-3.4.2/kioslave/pop3/Makefile.in	2005-07-26 19:06:46.346687624 +0000
+@@ -284,6 +284,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20581,7 +24976,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -581,7 +584,7 @@
+@@ -582,7 +585,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -20590,7 +24985,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -619,9 +622,9 @@
+@@ -620,9 +623,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20602,10 +24997,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kioslave/remote/kdedmodule/Makefile.in kdebase-3.4.2/kioslave/remote/kdedmodule/Makefile.in
+--- kdebase-3.4.2.orig/kioslave/remote/kdedmodule/Makefile.in	2005-07-20 21:08:22.000000000 +0000
++++ kdebase-3.4.2/kioslave/remote/kdedmodule/Makefile.in	2005-07-26 19:06:46.485666496 +0000
+@@ -287,6 +287,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20615,7 +25010,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -584,7 +587,7 @@
+@@ -585,7 +588,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20624,7 +25019,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -622,9 +625,9 @@
+@@ -623,9 +626,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20636,10 +25031,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kioslave/remote/Makefile.in kdebase-3.4.2/kioslave/remote/Makefile.in
+--- kdebase-3.4.2.orig/kioslave/remote/Makefile.in	2005-07-20 21:08:22.000000000 +0000
++++ kdebase-3.4.2/kioslave/remote/Makefile.in	2005-07-26 19:06:46.440673336 +0000
+@@ -311,6 +311,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20649,7 +25044,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -614,7 +617,7 @@
+@@ -615,7 +618,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20658,7 +25053,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -652,9 +655,9 @@
+@@ -653,9 +656,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20670,10 +25065,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kioslave/settings/Makefile.in kdebase-3.4.2/kioslave/settings/Makefile.in
+--- kdebase-3.4.2.orig/kioslave/settings/Makefile.in	2005-07-20 21:08:22.000000000 +0000
++++ kdebase-3.4.2/kioslave/settings/Makefile.in	2005-07-26 19:06:46.514662088 +0000
+@@ -298,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20683,7 +25078,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -596,7 +599,7 @@
+@@ -597,7 +600,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -20692,7 +25087,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -634,9 +637,9 @@
+@@ -635,9 +638,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20704,10 +25099,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kioslave/sftp/Makefile.in kdebase-3.4.2/kioslave/sftp/Makefile.in
+--- kdebase-3.4.2.orig/kioslave/sftp/Makefile.in	2005-07-20 21:08:22.000000000 +0000
++++ kdebase-3.4.2/kioslave/sftp/Makefile.in	2005-07-26 19:06:46.557655552 +0000
+@@ -296,6 +296,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20717,7 +25112,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -595,7 +598,7 @@
+@@ -596,7 +599,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20726,7 +25121,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -633,9 +636,9 @@
+@@ -634,9 +637,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20738,10 +25133,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kioslave/smb/Makefile.in kdebase-3.4.2/kioslave/smb/Makefile.in
+--- kdebase-3.4.2.orig/kioslave/smb/Makefile.in	2005-07-20 21:08:22.000000000 +0000
++++ kdebase-3.4.2/kioslave/smb/Makefile.in	2005-07-26 19:06:46.608647800 +0000
+@@ -295,6 +295,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20751,7 +25146,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -607,7 +610,7 @@
+@@ -608,7 +611,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20760,7 +25155,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -645,9 +648,9 @@
+@@ -646,9 +649,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20772,10 +25167,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kioslave/smtp/Makefile.in kdebase-3.4.2/kioslave/smtp/Makefile.in
+--- kdebase-3.4.2.orig/kioslave/smtp/Makefile.in	2005-07-20 21:08:22.000000000 +0000
++++ kdebase-3.4.2/kioslave/smtp/Makefile.in	2005-07-26 19:06:46.674637768 +0000
+@@ -317,6 +317,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20785,7 +25180,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -626,7 +629,7 @@
+@@ -627,7 +630,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -20794,7 +25189,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -664,9 +667,9 @@
+@@ -665,9 +668,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20806,10 +25201,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kioslave/system/entries/Makefile.in kdebase-3.4.2/kioslave/system/entries/Makefile.in
+--- kdebase-3.4.2.orig/kioslave/system/entries/Makefile.in	2005-07-20 21:08:23.000000000 +0000
++++ kdebase-3.4.2/kioslave/system/entries/Makefile.in	2005-07-26 19:06:46.732628952 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20819,7 +25214,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -535,7 +538,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20828,7 +25223,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -573,9 +576,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20840,10 +25235,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kioslave/system/kdedmodule/Makefile.in kdebase-3.4.2/kioslave/system/kdedmodule/Makefile.in
+--- kdebase-3.4.2.orig/kioslave/system/kdedmodule/Makefile.in	2005-07-20 21:08:23.000000000 +0000
++++ kdebase-3.4.2/kioslave/system/kdedmodule/Makefile.in	2005-07-26 19:06:46.761624544 +0000
+@@ -287,6 +287,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20853,7 +25248,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -584,7 +587,7 @@
+@@ -585,7 +588,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20862,7 +25257,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -622,9 +625,9 @@
+@@ -623,9 +626,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20874,10 +25269,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kioslave/system/Makefile.in kdebase-3.4.2/kioslave/system/Makefile.in
+--- kdebase-3.4.2.orig/kioslave/system/Makefile.in	2005-07-20 21:08:23.000000000 +0000
++++ kdebase-3.4.2/kioslave/system/Makefile.in	2005-07-26 19:06:46.715631536 +0000
+@@ -311,6 +311,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20887,7 +25282,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -613,7 +616,7 @@
+@@ -614,7 +617,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20896,7 +25291,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -651,9 +654,9 @@
+@@ -652,9 +655,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20908,10 +25303,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kioslave/system/mimetypes/Makefile.in kdebase-3.4.2/kioslave/system/mimetypes/Makefile.in
+--- kdebase-3.4.2.orig/kioslave/system/mimetypes/Makefile.in	2005-07-20 21:08:23.000000000 +0000
++++ kdebase-3.4.2/kioslave/system/mimetypes/Makefile.in	2005-07-26 19:06:46.778621960 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20921,7 +25316,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -536,7 +539,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20930,7 +25325,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -574,9 +577,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20942,10 +25337,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kioslave/tar/Makefile.in kdebase-3.4.2/kioslave/tar/Makefile.in
+--- kdebase-3.4.2.orig/kioslave/tar/Makefile.in	2005-07-20 21:08:23.000000000 +0000
++++ kdebase-3.4.2/kioslave/tar/Makefile.in	2005-07-26 19:06:46.809617248 +0000
+@@ -290,6 +290,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20955,7 +25350,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -589,7 +592,7 @@
+@@ -590,7 +593,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -20964,7 +25359,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -627,9 +630,9 @@
+@@ -628,9 +631,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20976,10 +25371,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kioslave/thumbnail/Makefile.in kdebase-3.4.2/kioslave/thumbnail/Makefile.in
+--- kdebase-3.4.2.orig/kioslave/thumbnail/Makefile.in	2005-07-20 21:08:23.000000000 +0000
++++ kdebase-3.4.2/kioslave/thumbnail/Makefile.in	2005-07-26 19:06:46.918600680 +0000
+@@ -335,6 +335,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20989,7 +25384,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -672,7 +675,7 @@
+@@ -673,7 +676,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20998,7 +25393,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -710,9 +713,9 @@
+@@ -711,9 +714,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21010,10 +25405,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kioslave/trash/kfile-plugin/Makefile.in kdebase-3.4.2/kioslave/trash/kfile-plugin/Makefile.in
+--- kdebase-3.4.2.orig/kioslave/trash/kfile-plugin/Makefile.in	2005-07-20 21:08:23.000000000 +0000
++++ kdebase-3.4.2/kioslave/trash/kfile-plugin/Makefile.in	2005-07-26 19:06:47.044581528 +0000
+@@ -282,6 +282,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21023,7 +25418,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -577,7 +580,7 @@
+@@ -578,7 +581,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21032,7 +25427,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -615,9 +618,9 @@
+@@ -616,9 +619,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21044,10 +25439,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kioslave/trash/Makefile.in kdebase-3.4.2/kioslave/trash/Makefile.in
+--- kdebase-3.4.2.orig/kioslave/trash/Makefile.in	2005-07-20 21:08:23.000000000 +0000
++++ kdebase-3.4.2/kioslave/trash/Makefile.in	2005-07-26 19:06:47.016585784 +0000
+@@ -317,6 +317,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21057,7 +25452,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -623,7 +626,7 @@
+@@ -624,7 +627,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21066,7 +25461,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -661,9 +664,9 @@
+@@ -662,9 +665,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21078,10 +25473,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/klipper/Makefile.in kdebase-3.4.2/klipper/Makefile.in
+--- kdebase-3.4.2.orig/klipper/Makefile.in	2005-07-20 21:08:23.000000000 +0000
++++ kdebase-3.4.2/klipper/Makefile.in	2005-07-26 19:06:47.205557056 +0000
+@@ -334,6 +334,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21091,7 +25486,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -661,7 +664,7 @@
+@@ -662,7 +665,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21100,7 +25495,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -699,9 +702,9 @@
+@@ -700,9 +703,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21112,10 +25507,95 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -1235,18 +1238,18 @@
+ mocs: history.moc
+ 
+ #>+ 3
+-urlgrabber.moc: $(srcdir)/urlgrabber.h
+-	$(MOC) $(srcdir)/urlgrabber.h -o urlgrabber.moc
++configdialog.moc: $(srcdir)/configdialog.h
++	$(MOC) $(srcdir)/configdialog.h -o configdialog.moc
+ 
+ #>+ 2
+-mocs: urlgrabber.moc
++mocs: configdialog.moc
+ 
+ #>+ 3
+-configdialog.moc: $(srcdir)/configdialog.h
+-	$(MOC) $(srcdir)/configdialog.h -o configdialog.moc
++urlgrabber.moc: $(srcdir)/urlgrabber.h
++	$(MOC) $(srcdir)/urlgrabber.h -o urlgrabber.moc
+ 
+ #>+ 2
+-mocs: configdialog.moc
++mocs: urlgrabber.moc
+ 
+ #>+ 3
+ clipboardpoll.moc: $(srcdir)/clipboardpoll.h
+@@ -1285,7 +1288,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  history.moc urlgrabber.moc configdialog.moc clipboardpoll.moc klipperpopup.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 
+@@ -1301,29 +1304,29 @@
+ 
+ #>+ 25
+ install-kde-icons:
+-	$(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/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-klipper.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/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/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/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/cr48-app-klipper.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/klipper.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/klipper.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/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/16x16/apps/klipper.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/klipper.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/klipper.png
+ 
+ #>+ 15
+ force-reedit:
+@@ -1376,7 +1379,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 klipperpopup.moc clipboardpoll.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; \
+diff -Nru kdebase-3.4.2.orig/kmenuedit/Makefile.in kdebase-3.4.2/kmenuedit/Makefile.in
+--- kdebase-3.4.2.orig/kmenuedit/Makefile.in	2005-07-20 21:08:23.000000000 +0000
++++ kdebase-3.4.2/kmenuedit/Makefile.in	2005-07-26 19:06:47.306541704 +0000
+@@ -341,6 +341,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21125,7 +25605,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -662,7 +665,7 @@
+@@ -663,7 +666,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21134,7 +25614,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -700,9 +703,9 @@
+@@ -701,9 +704,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21146,10 +25626,31 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -1294,17 +1297,17 @@
+ 
+ #>+ 13
+ install-kde-icons:
++	$(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
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kmenuedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kmenuedit.png
+ 
+ uninstall-kde-icons:
++	-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
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kmenuedit.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nru kdebase-3.4.2.orig/kmenuedit/pixmaps/Makefile.in kdebase-3.4.2/kmenuedit/pixmaps/Makefile.in
+--- kdebase-3.4.2.orig/kmenuedit/pixmaps/Makefile.in	2005-07-20 21:08:23.000000000 +0000
++++ kdebase-3.4.2/kmenuedit/pixmaps/Makefile.in	2005-07-26 19:06:47.331537904 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21159,7 +25660,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -526,7 +529,7 @@
+@@ -527,7 +530,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -21168,7 +25669,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -564,9 +567,9 @@
+@@ -565,9 +568,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21180,10 +25681,61 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -717,34 +720,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_sep.png $(DESTDIR)$(kmenuediticondir)/crystalsvg/22x22/actions/menu_new_sep.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-menu_new.png $(DESTDIR)$(kmenuediticondir)/crystalsvg/22x22/actions/menu_new.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_sep.png $(DESTDIR)$(kcontrolediticondir)/crystalsvg/22x22/actions/menu_new_sep.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-menu_new.png $(DESTDIR)$(kcontrolediticondir)/crystalsvg/22x22/actions/menu_new.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)/crystalsvg/22x22/actions/menu_new_sep.png
++	-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/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)$(kcontrolediticondir)/crystalsvg/22x22/actions/menu_new_sep.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/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.2.orig/knetattach/Makefile.in kdebase-3.4.2/knetattach/Makefile.in
+--- kdebase-3.4.2.orig/knetattach/Makefile.in	2005-07-20 21:08:23.000000000 +0000
++++ kdebase-3.4.2/knetattach/Makefile.in	2005-07-26 19:06:47.380530456 +0000
+@@ -284,6 +284,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21193,7 +25745,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -580,7 +583,7 @@
+@@ -581,7 +584,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21202,7 +25754,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -618,9 +621,9 @@
+@@ -619,9 +622,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21214,10 +25766,51 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -912,28 +915,28 @@
+ 
+ #>+ 25
+ install-kde-icons:
+-	$(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/128x128/apps
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-knetattach.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/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/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/22x22/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr22-app-knetattach.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/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/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/16x16/apps/knetattach.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/knetattach.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/knetattach.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/knetattach.svgz
+ 	-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/22x22/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/32x32/apps/knetattach.png
+ 
+ #>+ 15
+diff -Nru kdebase-3.4.2.orig/konqueror/about/Makefile.in kdebase-3.4.2/konqueror/about/Makefile.in
+--- kdebase-3.4.2.orig/konqueror/about/Makefile.in	2005-07-20 21:08:24.000000000 +0000
++++ kdebase-3.4.2/konqueror/about/Makefile.in	2005-07-26 19:06:48.525356416 +0000
+@@ -286,6 +286,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21227,7 +25820,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -587,7 +590,7 @@
+@@ -588,7 +591,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -21236,7 +25829,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -625,9 +628,9 @@
+@@ -626,9 +629,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21248,10 +25841,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/konqueror/client/Makefile.in kdebase-3.4.2/konqueror/client/Makefile.in
+--- kdebase-3.4.2.orig/konqueror/client/Makefile.in	2005-07-20 21:08:24.000000000 +0000
++++ kdebase-3.4.2/konqueror/client/Makefile.in	2005-07-26 19:06:48.572349272 +0000
+@@ -304,6 +304,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21261,7 +25854,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -612,7 +615,7 @@
+@@ -613,7 +616,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -21270,7 +25863,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -650,9 +653,9 @@
+@@ -651,9 +654,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21282,10 +25875,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/konqueror/iconview/Makefile.in kdebase-3.4.2/konqueror/iconview/Makefile.in
+--- kdebase-3.4.2.orig/konqueror/iconview/Makefile.in	2005-07-20 21:08:24.000000000 +0000
++++ kdebase-3.4.2/konqueror/iconview/Makefile.in	2005-07-26 19:06:48.634339848 +0000
+@@ -284,6 +284,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21295,7 +25888,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -581,7 +584,7 @@
+@@ -582,7 +585,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -21304,7 +25897,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -619,9 +622,9 @@
+@@ -620,9 +623,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21316,10 +25909,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/konqueror/keditbookmarks/Makefile.in kdebase-3.4.2/konqueror/keditbookmarks/Makefile.in
+--- kdebase-3.4.2.orig/konqueror/keditbookmarks/Makefile.in	2005-07-20 21:08:25.000000000 +0000
++++ kdebase-3.4.2/konqueror/keditbookmarks/Makefile.in	2005-07-26 19:06:48.757321152 +0000
+@@ -305,6 +305,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21329,7 +25922,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -617,7 +620,7 @@
+@@ -618,7 +621,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21338,7 +25931,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -655,9 +658,9 @@
+@@ -656,9 +659,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21350,10 +25943,110 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -1083,18 +1086,18 @@
+ mocs: updater.moc
+ 
+ #>+ 3
+-importers.moc: $(srcdir)/importers.h
+-	$(MOC) $(srcdir)/importers.h -o importers.moc
++toplevel.moc: $(srcdir)/toplevel.h
++	$(MOC) $(srcdir)/toplevel.h -o toplevel.moc
+ 
+ #>+ 2
+-mocs: importers.moc
++mocs: toplevel.moc
+ 
+ #>+ 3
+-toplevel.moc: $(srcdir)/toplevel.h
+-	$(MOC) $(srcdir)/toplevel.h -o toplevel.moc
++importers.moc: $(srcdir)/importers.h
++	$(MOC) $(srcdir)/importers.h -o importers.moc
+ 
+ #>+ 2
+-mocs: toplevel.moc
++mocs: importers.moc
+ 
+ #>+ 3
+ bookmarkinfo.moc: $(srcdir)/bookmarkinfo.h
+@@ -1104,11 +1107,11 @@
+ mocs: bookmarkinfo.moc
+ 
+ #>+ 3
+-listview.moc: $(srcdir)/listview.h
+-	$(MOC) $(srcdir)/listview.h -o listview.moc
++testlink.moc: $(srcdir)/testlink.h
++	$(MOC) $(srcdir)/testlink.h -o testlink.moc
+ 
+ #>+ 2
+-mocs: listview.moc
++mocs: testlink.moc
+ 
+ #>+ 3
+ dcop.moc: $(srcdir)/dcop.h
+@@ -1118,18 +1121,18 @@
+ mocs: dcop.moc
+ 
+ #>+ 3
+-testlink.moc: $(srcdir)/testlink.h
+-	$(MOC) $(srcdir)/testlink.h -o testlink.moc
++listview.moc: $(srcdir)/listview.h
++	$(MOC) $(srcdir)/listview.h -o listview.moc
+ 
+ #>+ 2
+-mocs: testlink.moc
++mocs: listview.moc
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  favicons.moc actionsimpl.moc bookmarkiterator.moc updater.moc importers.moc toplevel.moc bookmarkinfo.moc listview.moc dcop.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:
+@@ -1142,20 +1145,20 @@
+ 
+ #>+ 16
+ install-kde-icons:
+-	$(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/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-keditbookmarks.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/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/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/cr16-app-keditbookmarks.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/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/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/32x32/apps/keditbookmarks.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keditbookmarks.png
+ 	-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/48x48/apps/keditbookmarks.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keditbookmarks.png
+ 
+ #>+ 15
+ force-reedit:
+@@ -1196,7 +1199,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 bookmarkiterator.moc actionsimpl.moc updater.moc importers.moc toplevel.moc testlink.moc dcop.moc bookmarkinfo.moc listview.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.2.orig/konqueror/kttsplugin/Makefile.in kdebase-3.4.2/konqueror/kttsplugin/Makefile.in
+--- kdebase-3.4.2.orig/konqueror/kttsplugin/Makefile.in	2005-07-20 21:08:25.000000000 +0000
++++ kdebase-3.4.2/konqueror/kttsplugin/Makefile.in	2005-07-26 19:06:48.804314008 +0000
+@@ -281,6 +281,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21363,7 +26056,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -578,7 +581,7 @@
+@@ -579,7 +582,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21372,7 +26065,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -616,9 +619,9 @@
+@@ -617,9 +620,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21384,10 +26077,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/konqueror/listview/Makefile.in kdebase-3.4.2/konqueror/listview/Makefile.in
+--- kdebase-3.4.2.orig/konqueror/listview/Makefile.in	2005-07-20 21:08:25.000000000 +0000
++++ kdebase-3.4.2/konqueror/listview/Makefile.in	2005-07-26 19:06:48.916296984 +0000
+@@ -292,6 +292,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21397,7 +26090,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -597,7 +600,7 @@
+@@ -598,7 +601,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -21406,7 +26099,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -635,9 +638,9 @@
+@@ -636,9 +639,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21418,10 +26111,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/konqueror/Makefile.in kdebase-3.4.2/konqueror/Makefile.in
+--- kdebase-3.4.2.orig/konqueror/Makefile.in	2005-07-20 21:08:24.000000000 +0000
++++ kdebase-3.4.2/konqueror/Makefile.in	2005-07-26 19:06:48.472364472 +0000
+@@ -331,6 +331,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21431,7 +26124,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -690,7 +693,7 @@
+@@ -691,7 +694,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -21440,7 +26133,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -728,9 +731,9 @@
+@@ -729,9 +732,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21452,10 +26145,75 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -1402,6 +1405,13 @@
+ mocs: konq_frame.moc
+ 
+ #>+ 3
++konq_tabs.moc: $(srcdir)/konq_tabs.h
++	$(MOC) $(srcdir)/konq_tabs.h -o konq_tabs.moc
++
++#>+ 2
++mocs: konq_tabs.moc
++
++#>+ 3
+ konq_misc.moc: $(srcdir)/konq_misc.h
+ 	$(MOC) $(srcdir)/konq_misc.h -o konq_misc.moc
+ 
+@@ -1416,11 +1426,11 @@
+ mocs: konq_browseriface.moc
+ 
+ #>+ 3
+-konq_tabs.moc: $(srcdir)/konq_tabs.h
+-	$(MOC) $(srcdir)/konq_tabs.h -o konq_tabs.moc
++konq_view.moc: $(srcdir)/konq_view.h
++	$(MOC) $(srcdir)/konq_view.h -o konq_view.moc
+ 
+ #>+ 2
+-mocs: konq_tabs.moc
++mocs: konq_view.moc
+ 
+ #>+ 3
+ konq_run.moc: $(srcdir)/konq_run.h
+@@ -1430,13 +1440,6 @@
+ mocs: konq_run.moc
+ 
+ #>+ 3
+-konq_view.moc: $(srcdir)/konq_view.h
+-	$(MOC) $(srcdir)/konq_view.h -o konq_view.moc
+-
+-#>+ 2
+-mocs: konq_view.moc
+-
+-#>+ 3
+ konq_viewmgr.moc: $(srcdir)/konq_viewmgr.h
+ 	$(MOC) $(srcdir)/konq_viewmgr.h -o konq_viewmgr.moc
+ 
+@@ -1475,10 +1478,10 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  konq_profiledlg.moc delayedinitializer.moc konq_mainwindow.moc konq_actions.moc konq_mainwindow_p.moc konq_frame.moc konq_misc.moc konq_browseriface.moc konq_tabs.moc konq_run.moc konq_view.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:
+@@ -1533,7 +1536,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_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_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.2.orig/konqueror/pics/actions/Makefile.in kdebase-3.4.2/konqueror/pics/actions/Makefile.in
+--- kdebase-3.4.2.orig/konqueror/pics/actions/Makefile.in	2005-07-20 21:08:25.000000000 +0000
++++ kdebase-3.4.2/konqueror/pics/actions/Makefile.in	2005-07-26 19:06:48.962289992 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21465,7 +26223,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -21474,7 +26232,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21486,10 +26244,35 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -716,20 +719,20 @@
+ #>+ 17
+ install-kde-icons:
+ 	$(mkinstalldirs) $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-kde5.png $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde5.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-kde6.png $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde6.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-kde1.png $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde1.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-kde2.png $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde2.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-kde3.png $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde3.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-kde4.png $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde4.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-kde5.png $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde5.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-kde6.png $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde6.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde5.png
+-	-rm -f $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde6.png
+ 	-rm -f $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde1.png
+ 	-rm -f $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde2.png
+ 	-rm -f $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde3.png
+ 	-rm -f $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde4.png
++	-rm -f $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde5.png
++	-rm -f $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde6.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nru kdebase-3.4.2.orig/konqueror/pics/indicators/Makefile.in kdebase-3.4.2/konqueror/pics/indicators/Makefile.in
+--- kdebase-3.4.2.orig/konqueror/pics/indicators/Makefile.in	2005-07-20 21:08:25.000000000 +0000
++++ kdebase-3.4.2/konqueror/pics/indicators/Makefile.in	2005-07-26 19:06:48.978287560 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21499,7 +26282,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -537,7 +540,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -21508,7 +26291,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -575,9 +578,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21520,10 +26303,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/konqueror/pics/Makefile.in kdebase-3.4.2/konqueror/pics/Makefile.in
+--- kdebase-3.4.2.orig/konqueror/pics/Makefile.in	2005-07-20 21:08:25.000000000 +0000
++++ kdebase-3.4.2/konqueror/pics/Makefile.in	2005-07-26 19:06:48.942293032 +0000
+@@ -252,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21533,7 +26316,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -540,7 +543,7 @@
+@@ -541,7 +544,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -21542,7 +26325,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -578,9 +581,9 @@
+@@ -579,9 +582,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21554,10 +26337,70 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -879,39 +882,39 @@
+ 
+ #>+ 35
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-konqueror.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/konqueror.svgz
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
++	$(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/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kfm.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/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/64x64/apps
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-kfm.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kfm.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kfm.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/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-konqueror.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/konqueror.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-konqueror.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/konqueror.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-konqueror.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/konqueror.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-konqueror.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/konqueror.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-konqueror.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/konqueror.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/konqueror.svgz
++	-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/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/32x32/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/64x64/apps/kfm.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfm.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/konqueror.svgz
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/konqueror.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/konqueror.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/konqueror.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/konqueror.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/konqueror.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nru kdebase-3.4.2.orig/konqueror/pics/tiles/Makefile.in kdebase-3.4.2/konqueror/pics/tiles/Makefile.in
+--- kdebase-3.4.2.orig/konqueror/pics/tiles/Makefile.in	2005-07-20 21:08:25.000000000 +0000
++++ kdebase-3.4.2/konqueror/pics/tiles/Makefile.in	2005-07-26 19:06:48.996284824 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21567,7 +26410,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -537,7 +540,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -21576,7 +26419,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -575,9 +578,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21588,10 +26431,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/konqueror/preloader/Makefile.in kdebase-3.4.2/konqueror/preloader/Makefile.in
+--- kdebase-3.4.2.orig/konqueror/preloader/Makefile.in	2005-07-20 21:08:25.000000000 +0000
++++ kdebase-3.4.2/konqueror/preloader/Makefile.in	2005-07-26 19:06:49.046277224 +0000
+@@ -286,6 +286,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21601,7 +26444,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -587,7 +590,7 @@
+@@ -588,7 +591,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -21610,7 +26453,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -625,9 +628,9 @@
+@@ -626,9 +629,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21622,10 +26465,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/konqueror/quickprint/Makefile.in kdebase-3.4.2/konqueror/quickprint/Makefile.in
+--- kdebase-3.4.2.orig/konqueror/quickprint/Makefile.in	2005-07-20 21:08:25.000000000 +0000
++++ kdebase-3.4.2/konqueror/quickprint/Makefile.in	2005-07-26 19:06:49.064274488 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21635,7 +26478,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -540,7 +543,7 @@
+@@ -541,7 +544,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -21644,7 +26487,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -578,9 +581,9 @@
+@@ -579,9 +582,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21656,10 +26499,19 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -741,7 +744,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=text-perl-print.desktop text-c-print.desktop text-diff-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.2.orig/konqueror/remoteencodingplugin/Makefile.in kdebase-3.4.2/konqueror/remoteencodingplugin/Makefile.in
+--- kdebase-3.4.2.orig/konqueror/remoteencodingplugin/Makefile.in	2005-07-20 21:08:25.000000000 +0000
++++ kdebase-3.4.2/konqueror/remoteencodingplugin/Makefile.in	2005-07-26 19:06:49.113267040 +0000
+@@ -282,6 +282,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21669,7 +26521,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -579,7 +582,7 @@
+@@ -580,7 +583,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21678,7 +26530,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -617,9 +620,9 @@
+@@ -618,9 +621,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21690,10 +26542,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/konqueror/shellcmdplugin/Makefile.in kdebase-3.4.2/konqueror/shellcmdplugin/Makefile.in
+--- kdebase-3.4.2.orig/konqueror/shellcmdplugin/Makefile.in	2005-07-20 21:08:25.000000000 +0000
++++ kdebase-3.4.2/konqueror/shellcmdplugin/Makefile.in	2005-07-26 19:06:49.154260808 +0000
+@@ -287,6 +287,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21703,7 +26555,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -586,7 +589,7 @@
+@@ -587,7 +590,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21712,7 +26564,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -624,9 +627,9 @@
+@@ -625,9 +628,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21724,10 +26576,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/konqueror/sidebar/Makefile.in kdebase-3.4.2/konqueror/sidebar/Makefile.in
+--- kdebase-3.4.2.orig/konqueror/sidebar/Makefile.in	2005-07-20 21:08:25.000000000 +0000
++++ kdebase-3.4.2/konqueror/sidebar/Makefile.in	2005-07-26 19:06:49.219250928 +0000
+@@ -326,6 +326,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21737,7 +26589,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -651,7 +654,7 @@
+@@ -652,7 +655,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21746,7 +26598,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -689,9 +692,9 @@
+@@ -690,9 +693,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21758,10 +26610,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/konqueror/sidebar/test/Makefile.in kdebase-3.4.2/konqueror/sidebar/test/Makefile.in
+--- kdebase-3.4.2.orig/konqueror/sidebar/test/Makefile.in	2005-07-20 21:08:25.000000000 +0000
++++ kdebase-3.4.2/konqueror/sidebar/test/Makefile.in	2005-07-26 19:06:49.258245000 +0000
+@@ -299,6 +299,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21771,7 +26623,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -609,7 +612,7 @@
+@@ -610,7 +613,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21780,7 +26632,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -647,9 +650,9 @@
+@@ -648,9 +651,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21792,10 +26644,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/konqueror/sidebar/trees/bookmark_module/Makefile.in kdebase-3.4.2/konqueror/sidebar/trees/bookmark_module/Makefile.in
+--- kdebase-3.4.2.orig/konqueror/sidebar/trees/bookmark_module/Makefile.in	2005-07-20 21:08:25.000000000 +0000
++++ kdebase-3.4.2/konqueror/sidebar/trees/bookmark_module/Makefile.in	2005-07-26 19:06:49.382226152 +0000
+@@ -283,6 +283,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21805,7 +26657,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -576,7 +579,7 @@
+@@ -577,7 +580,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21814,7 +26666,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -614,9 +617,9 @@
+@@ -615,9 +618,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21826,10 +26678,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/konqueror/sidebar/trees/dirtree_module/Makefile.in kdebase-3.4.2/konqueror/sidebar/trees/dirtree_module/Makefile.in
+--- kdebase-3.4.2.orig/konqueror/sidebar/trees/dirtree_module/Makefile.in	2005-07-20 21:08:25.000000000 +0000
++++ kdebase-3.4.2/konqueror/sidebar/trees/dirtree_module/Makefile.in	2005-07-26 19:06:49.455215056 +0000
+@@ -283,6 +283,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21839,7 +26691,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -578,7 +581,7 @@
+@@ -579,7 +582,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21848,7 +26700,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -616,9 +619,9 @@
+@@ -617,9 +620,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21860,10 +26712,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/konqueror/sidebar/trees/history_module/Makefile.in kdebase-3.4.2/konqueror/sidebar/trees/history_module/Makefile.in
+--- kdebase-3.4.2.orig/konqueror/sidebar/trees/history_module/Makefile.in	2005-07-20 21:08:25.000000000 +0000
++++ kdebase-3.4.2/konqueror/sidebar/trees/history_module/Makefile.in	2005-07-26 19:06:49.532203352 +0000
+@@ -297,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21873,7 +26725,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -603,7 +606,7 @@
+@@ -604,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21882,7 +26734,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -641,9 +644,9 @@
+@@ -642,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21894,10 +26746,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/konqueror/sidebar/trees/init/Makefile.in kdebase-3.4.2/konqueror/sidebar/trees/init/Makefile.in
+--- kdebase-3.4.2.orig/konqueror/sidebar/trees/init/Makefile.in	2005-07-20 21:08:25.000000000 +0000
++++ kdebase-3.4.2/konqueror/sidebar/trees/init/Makefile.in	2005-07-26 19:06:49.552200312 +0000
+@@ -269,6 +269,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21907,7 +26759,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -568,7 +571,7 @@
+@@ -569,7 +572,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -21916,7 +26768,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -606,9 +609,9 @@
+@@ -607,9 +610,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21928,10 +26780,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/konqueror/sidebar/trees/init/remote/ftp/Makefile.in kdebase-3.4.2/konqueror/sidebar/trees/init/remote/ftp/Makefile.in
+--- kdebase-3.4.2.orig/konqueror/sidebar/trees/init/remote/ftp/Makefile.in	2005-07-20 21:08:25.000000000 +0000
++++ kdebase-3.4.2/konqueror/sidebar/trees/init/remote/ftp/Makefile.in	2005-07-26 19:06:49.604192408 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21941,7 +26793,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -535,7 +538,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -21950,7 +26802,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -573,9 +576,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21962,10 +26814,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/konqueror/sidebar/trees/init/remote/Makefile.in kdebase-3.4.2/konqueror/sidebar/trees/init/remote/Makefile.in
+--- kdebase-3.4.2.orig/konqueror/sidebar/trees/init/remote/Makefile.in	2005-07-20 21:08:25.000000000 +0000
++++ kdebase-3.4.2/konqueror/sidebar/trees/init/remote/Makefile.in	2005-07-26 19:06:49.579196208 +0000
+@@ -262,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21975,7 +26827,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -551,7 +554,7 @@
+@@ -552,7 +555,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -21984,7 +26836,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -589,9 +592,9 @@
+@@ -590,9 +593,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21996,10 +26848,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/konqueror/sidebar/trees/init/remote/web/Makefile.in kdebase-3.4.2/konqueror/sidebar/trees/init/remote/web/Makefile.in
+--- kdebase-3.4.2.orig/konqueror/sidebar/trees/init/remote/web/Makefile.in	2005-07-20 21:08:25.000000000 +0000
++++ kdebase-3.4.2/konqueror/sidebar/trees/init/remote/web/Makefile.in	2005-07-26 19:06:49.621189824 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22009,7 +26861,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -535,7 +538,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -22018,7 +26870,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -573,9 +576,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22030,10 +26882,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/konqueror/sidebar/trees/init/services/Makefile.in kdebase-3.4.2/konqueror/sidebar/trees/init/services/Makefile.in
+--- kdebase-3.4.2.orig/konqueror/sidebar/trees/init/services/Makefile.in	2005-07-20 21:08:25.000000000 +0000
++++ kdebase-3.4.2/konqueror/sidebar/trees/init/services/Makefile.in	2005-07-26 19:06:49.646186024 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22043,7 +26895,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -535,7 +538,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -22052,7 +26904,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -573,9 +576,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22064,10 +26916,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/konqueror/sidebar/trees/Makefile.in kdebase-3.4.2/konqueror/sidebar/trees/Makefile.in
+--- kdebase-3.4.2.orig/konqueror/sidebar/trees/Makefile.in	2005-07-20 21:08:25.000000000 +0000
++++ kdebase-3.4.2/konqueror/sidebar/trees/Makefile.in	2005-07-26 19:06:49.348231320 +0000
+@@ -305,6 +305,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22077,7 +26929,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -607,7 +610,7 @@
+@@ -608,7 +611,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22086,7 +26938,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -645,9 +648,9 @@
+@@ -646,9 +649,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22098,10 +26950,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/konqueror/sidebar/web_module/Makefile.in kdebase-3.4.2/konqueror/sidebar/web_module/Makefile.in
+--- kdebase-3.4.2.orig/konqueror/sidebar/web_module/Makefile.in	2005-07-20 21:08:25.000000000 +0000
++++ kdebase-3.4.2/konqueror/sidebar/web_module/Makefile.in	2005-07-26 19:06:49.676181464 +0000
+@@ -284,6 +284,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22111,7 +26963,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -584,7 +587,7 @@
+@@ -585,7 +588,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22120,7 +26972,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -622,9 +625,9 @@
+@@ -623,9 +626,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22132,10 +26984,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/konsole/doc/Makefile.in kdebase-3.4.2/konsole/doc/Makefile.in
+--- kdebase-3.4.2.orig/konsole/doc/Makefile.in	2005-07-20 21:08:25.000000000 +0000
++++ kdebase-3.4.2/konsole/doc/Makefile.in	2005-07-26 19:06:49.718175080 +0000
+@@ -252,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22145,7 +26997,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -540,7 +543,7 @@
+@@ -541,7 +544,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -22154,7 +27006,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -578,9 +581,9 @@
+@@ -579,9 +582,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22166,10 +27018,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/konsole/doc/VT100/Makefile.in kdebase-3.4.2/konsole/doc/VT100/Makefile.in
+--- kdebase-3.4.2.orig/konsole/doc/VT100/Makefile.in	2005-07-20 21:08:25.000000000 +0000
++++ kdebase-3.4.2/konsole/doc/VT100/Makefile.in	2005-07-26 19:06:49.735172496 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22179,7 +27031,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -526,7 +529,7 @@
+@@ -527,7 +530,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -22188,7 +27040,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -564,9 +567,9 @@
+@@ -565,9 +568,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22200,10 +27052,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/konsole/fonts/Makefile.in kdebase-3.4.2/konsole/fonts/Makefile.in
+--- kdebase-3.4.2.orig/konsole/fonts/Makefile.in	2005-07-20 21:08:25.000000000 +0000
++++ kdebase-3.4.2/konsole/fonts/Makefile.in	2005-07-26 19:06:49.752169912 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22213,7 +27065,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -536,7 +539,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -22222,7 +27074,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -574,9 +577,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22234,10 +27086,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/konsole/konsole/Makefile.in kdebase-3.4.2/konsole/konsole/Makefile.in
+--- kdebase-3.4.2.orig/konsole/konsole/Makefile.in	2005-07-20 21:08:26.000000000 +0000
++++ kdebase-3.4.2/konsole/konsole/Makefile.in	2005-07-26 19:06:51.394920176 +0000
+@@ -343,6 +343,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22247,7 +27099,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -709,7 +712,7 @@
+@@ -710,7 +713,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22256,7 +27108,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -747,9 +750,9 @@
+@@ -748,9 +751,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22268,10 +27120,88 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -1225,18 +1228,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
+@@ -1281,18 +1284,18 @@
+ mocs: konsole_part.moc
+ 
+ #>+ 3
+-TEPty.moc: $(srcdir)/TEPty.h
+-	$(MOC) $(srcdir)/TEPty.h -o TEPty.moc
++printsettings.moc: $(srcdir)/printsettings.h
++	$(MOC) $(srcdir)/printsettings.h -o printsettings.moc
+ 
+ #>+ 2
+-mocs: TEPty.moc
++mocs: printsettings.moc
+ 
+ #>+ 3
+-printsettings.moc: $(srcdir)/printsettings.h
+-	$(MOC) $(srcdir)/printsettings.h -o printsettings.moc
++TEPty.moc: $(srcdir)/TEPty.h
++	$(MOC) $(srcdir)/TEPty.h -o TEPty.moc
+ 
+ #>+ 2
+-mocs: printsettings.moc
++mocs: TEPty.moc
+ 
+ #>+ 5
+ kwrited.kidl: $(srcdir)/kwrited.h $(DCOP_DEPENDENCIES)
+@@ -1311,7 +1314,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  kwrited.moc TEWidget.moc konsolebookmarkhandler.moc TEmulation.moc konsole.moc konsolebookmarkmenu.moc zmodem_dialog.moc TEmuVt102.moc session.moc konsole_part.moc TEPty.moc printsettings.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 
+@@ -1371,7 +1374,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 TEmuVt102.moc session.moc printsettings.moc TEPty.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; \
+@@ -1453,8 +1456,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.2.orig/konsole/Makefile.in kdebase-3.4.2/konsole/Makefile.in
+--- kdebase-3.4.2.orig/konsole/Makefile.in	2005-07-20 21:08:25.000000000 +0000
++++ kdebase-3.4.2/konsole/Makefile.in	2005-07-26 19:06:49.699177968 +0000
+@@ -279,6 +279,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22281,7 +27211,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -581,7 +584,7 @@
+@@ -582,7 +585,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -22290,7 +27220,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -619,9 +622,9 @@
+@@ -620,9 +623,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22302,10 +27232,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-updateSCRIPTS: $(update_SCRIPTS)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/konsole/other/icons/Makefile.in kdebase-3.4.2/konsole/other/icons/Makefile.in
+--- kdebase-3.4.2.orig/konsole/other/icons/Makefile.in	2005-07-20 21:08:26.000000000 +0000
++++ kdebase-3.4.2/konsole/other/icons/Makefile.in	2005-07-26 19:06:51.487906040 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22315,7 +27245,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -22324,7 +27254,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22336,10 +27266,56 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -708,7 +711,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=cr16-action-activity.png cr32-action-opentermred.png cr22-action-opentermblue.png Makefile.in cr16-action-silence.png cr16-action-opentermblue.png cr22-action-opentermred.png cr32-action-opentermblue.png cr16-action-opentermred.png Makefile.am 
++KDE_DIST=cr16-action-activity.png cr22-action-opentermblue.png cr32-action-opentermred.png Makefile.in cr16-action-silence.png cr16-action-opentermblue.png cr22-action-opentermred.png cr32-action-opentermblue.png cr16-action-opentermred.png Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+@@ -716,26 +719,26 @@
+ #>+ 23
+ install-kde-icons:
+ 	$(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/16x16/actions
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-activity.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/activity.png
+ 	$(mkinstalldirs) $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-opentermblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermblue.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-opentermblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermblue.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-opentermred.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermred.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-silence.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/silence.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-action-opentermred.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermred.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-silence.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/silence.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-opentermblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermblue.png
+ 	$(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/22x22/actions/opentermblue.png
+-	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/activity.png
+-	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermblue.png
+-	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermblue.png
+ 	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermred.png
+-	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/silence.png
++	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/activity.png
+ 	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermred.png
++	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/silence.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.2.orig/konsole/other/Makefile.in kdebase-3.4.2/konsole/other/Makefile.in
+--- kdebase-3.4.2.orig/konsole/other/Makefile.in	2005-07-20 21:08:26.000000000 +0000
++++ kdebase-3.4.2/konsole/other/Makefile.in	2005-07-26 19:06:51.466909232 +0000
+@@ -264,6 +264,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22349,7 +27325,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -567,7 +570,7 @@
+@@ -568,7 +571,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -22358,7 +27334,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -605,9 +608,9 @@
+@@ -606,9 +609,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22370,10 +27346,47 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -949,27 +952,27 @@
+ install-kde-icons:
+ 	$(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/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-konsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/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/22x22/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr22-app-konsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/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/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-konsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/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/32x32/apps/konsole.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/konsole.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/konsole.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/konsole.svgz
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/konsole.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/konsole.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/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.2.orig/kpager/Makefile.in kdebase-3.4.2/kpager/Makefile.in
+--- kdebase-3.4.2.orig/kpager/Makefile.in	2005-07-20 21:08:26.000000000 +0000
++++ kdebase-3.4.2/kpager/Makefile.in	2005-07-26 19:06:51.559895096 +0000
+@@ -286,6 +286,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22383,7 +27396,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -586,7 +589,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22392,7 +27405,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -624,9 +627,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22404,10 +27417,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kpersonalizer/Makefile.in kdebase-3.4.2/kpersonalizer/Makefile.in
+--- kdebase-3.4.2.orig/kpersonalizer/Makefile.in	2005-07-20 21:08:26.000000000 +0000
++++ kdebase-3.4.2/kpersonalizer/Makefile.in	2005-07-26 19:06:51.675877464 +0000
+@@ -304,6 +304,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22417,7 +27430,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -629,7 +632,7 @@
+@@ -630,7 +633,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22426,7 +27439,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -667,9 +670,9 @@
+@@ -668,9 +671,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22438,10 +27451,62 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -1093,18 +1096,18 @@
+ mocs: krefinepage.moc
+ 
+ #>+ 3
+-kpersonalizer.moc: $(srcdir)/kpersonalizer.h
+-	$(MOC) $(srcdir)/kpersonalizer.h -o kpersonalizer.moc
++kstylepage.moc: $(srcdir)/kstylepage.h
++	$(MOC) $(srcdir)/kstylepage.h -o kstylepage.moc
+ 
+ #>+ 2
+-mocs: kpersonalizer.moc
++mocs: kstylepage.moc
+ 
+ #>+ 3
+-kstylepage.moc: $(srcdir)/kstylepage.h
+-	$(MOC) $(srcdir)/kstylepage.h -o kstylepage.moc
++kpersonalizer.moc: $(srcdir)/kpersonalizer.h
++	$(MOC) $(srcdir)/kpersonalizer.h -o kpersonalizer.moc
+ 
+ #>+ 2
+-mocs: kstylepage.moc
++mocs: kpersonalizer.moc
+ 
+ #>+ 3
+ kospage.moc: $(srcdir)/kospage.h
+@@ -1115,7 +1118,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  kcountrypage.moc keyecandypage.moc krefinepage.moc kpersonalizer.moc kstylepage.moc kospage.moc
++	-rm -f  kcountrypage.moc keyecandypage.moc krefinepage.moc kstylepage.moc kpersonalizer.moc kospage.moc
+ 
+ #>+ 2
+ KDE_DIST=kospagedlg.ui Makefile.in uninstall.desktop stylepreview.ui stylepreview.ui.h ksysinfo.h Makefile.am 
+@@ -1135,14 +1138,14 @@
+ 
+ #>+ 10
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kpersonalizer.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpersonalizer.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-kpersonalizer.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpersonalizer.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kpersonalizer.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpersonalizer.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpersonalizer.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpersonalizer.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpersonalizer.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nru kdebase-3.4.2.orig/kpersonalizer/pics/Makefile.in kdebase-3.4.2/kpersonalizer/pics/Makefile.in
+--- kdebase-3.4.2.orig/kpersonalizer/pics/Makefile.in	2005-07-20 21:08:26.000000000 +0000
++++ kdebase-3.4.2/kpersonalizer/pics/Makefile.in	2005-07-26 19:06:51.692874880 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22451,7 +27516,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -535,7 +538,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -22460,7 +27525,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -573,9 +576,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22472,10 +27537,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kreadconfig/Makefile.in kdebase-3.4.2/kreadconfig/Makefile.in
+--- kdebase-3.4.2.orig/kreadconfig/Makefile.in	2005-07-20 21:08:26.000000000 +0000
++++ kdebase-3.4.2/kreadconfig/Makefile.in	2005-07-26 19:06:51.717871080 +0000
+@@ -279,6 +279,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22485,7 +27550,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -572,7 +575,7 @@
+@@ -573,7 +576,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22494,7 +27559,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -610,9 +613,9 @@
+@@ -611,9 +614,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22506,10 +27571,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kscreensaver/Makefile.in kdebase-3.4.2/kscreensaver/Makefile.in
+--- kdebase-3.4.2.orig/kscreensaver/Makefile.in	2005-07-20 21:08:26.000000000 +0000
++++ kdebase-3.4.2/kscreensaver/Makefile.in	2005-07-26 19:06:51.758864848 +0000
+@@ -290,6 +290,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22519,7 +27584,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -590,7 +593,7 @@
+@@ -591,7 +594,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22528,7 +27593,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -628,9 +631,9 @@
+@@ -629,9 +632,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22540,10 +27605,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/ksmserver/Makefile.in kdebase-3.4.2/ksmserver/Makefile.in
+--- kdebase-3.4.2.orig/ksmserver/Makefile.in	2005-07-20 21:08:26.000000000 +0000
++++ kdebase-3.4.2/ksmserver/Makefile.in	2005-07-26 19:06:51.837852840 +0000
+@@ -344,6 +344,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22553,7 +27618,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -658,7 +661,7 @@
+@@ -659,7 +662,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22562,7 +27627,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -696,9 +699,9 @@
+@@ -697,9 +700,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22574,10 +27639,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/ksplashml/kcmksplash/Makefile.in kdebase-3.4.2/ksplashml/kcmksplash/Makefile.in
+--- kdebase-3.4.2.orig/ksplashml/kcmksplash/Makefile.in	2005-07-20 21:08:26.000000000 +0000
++++ kdebase-3.4.2/ksplashml/kcmksplash/Makefile.in	2005-07-26 19:06:51.944836576 +0000
+@@ -301,6 +301,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22587,7 +27652,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -599,7 +602,7 @@
+@@ -600,7 +603,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22596,7 +27661,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -637,9 +640,9 @@
+@@ -638,9 +641,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22608,10 +27673,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/ksplashml/kcmksplash/pics/Makefile.in kdebase-3.4.2/ksplashml/kcmksplash/pics/Makefile.in
+--- kdebase-3.4.2.orig/ksplashml/kcmksplash/pics/Makefile.in	2005-07-20 21:08:26.000000000 +0000
++++ kdebase-3.4.2/ksplashml/kcmksplash/pics/Makefile.in	2005-07-26 19:06:51.965833384 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22621,7 +27686,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -523,7 +526,7 @@
+@@ -524,7 +527,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -22630,7 +27695,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -561,9 +564,9 @@
+@@ -562,9 +565,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22642,10 +27707,49 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -714,26 +717,26 @@
+ 
+ #>+ 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/64x64/apps
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-ksplash.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/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/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-ksplash.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/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/64x64/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/32x32/apps/ksplash.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/ksplash.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ksplash.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nru kdebase-3.4.2.orig/ksplashml/Makefile.in kdebase-3.4.2/ksplashml/Makefile.in
+--- kdebase-3.4.2.orig/ksplashml/Makefile.in	2005-07-20 21:08:26.000000000 +0000
++++ kdebase-3.4.2/ksplashml/Makefile.in	2005-07-26 19:06:51.909841896 +0000
+@@ -303,6 +303,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22655,7 +27759,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -601,7 +604,7 @@
+@@ -602,7 +605,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22664,7 +27768,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +642,9 @@
+@@ -640,9 +643,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22676,10 +27780,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/ksplashml/pics/Makefile.in kdebase-3.4.2/ksplashml/pics/Makefile.in
+--- kdebase-3.4.2.orig/ksplashml/pics/Makefile.in	2005-07-20 21:08:26.000000000 +0000
++++ kdebase-3.4.2/ksplashml/pics/Makefile.in	2005-07-26 19:06:51.983830648 +0000
+@@ -262,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22689,7 +27793,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
+@@ -553,7 +556,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -22698,7 +27802,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -591,9 +594,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22710,10 +27814,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/ksplashml/pics/themes/blue-bend/Makefile.in kdebase-3.4.2/ksplashml/pics/themes/blue-bend/Makefile.in
+--- kdebase-3.4.2.orig/ksplashml/pics/themes/blue-bend/Makefile.in	2005-07-20 21:08:26.000000000 +0000
++++ kdebase-3.4.2/ksplashml/pics/themes/blue-bend/Makefile.in	2005-07-26 19:06:52.019825176 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22723,7 +27827,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -536,7 +539,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -22732,7 +27836,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -574,9 +577,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22744,10 +27848,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/ksplashml/pics/themes/default/locolor/Makefile.in kdebase-3.4.2/ksplashml/pics/themes/default/locolor/Makefile.in
+--- kdebase-3.4.2.orig/ksplashml/pics/themes/default/locolor/Makefile.in	2005-07-20 21:08:26.000000000 +0000
++++ kdebase-3.4.2/ksplashml/pics/themes/default/locolor/Makefile.in	2005-07-26 19:06:52.055819704 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22757,7 +27861,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -536,7 +539,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -22766,7 +27870,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -574,9 +577,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22778,10 +27882,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/ksplashml/pics/themes/default/Makefile.in kdebase-3.4.2/ksplashml/pics/themes/default/Makefile.in
+--- kdebase-3.4.2.orig/ksplashml/pics/themes/default/Makefile.in	2005-07-20 21:08:26.000000000 +0000
++++ kdebase-3.4.2/ksplashml/pics/themes/default/Makefile.in	2005-07-26 19:06:52.039822136 +0000
+@@ -262,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22791,7 +27895,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
+@@ -553,7 +556,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -22800,7 +27904,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -591,9 +594,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22812,10 +27916,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/ksplashml/pics/themes/Makefile.in kdebase-3.4.2/ksplashml/pics/themes/Makefile.in
+--- kdebase-3.4.2.orig/ksplashml/pics/themes/Makefile.in	2005-07-20 21:08:26.000000000 +0000
++++ kdebase-3.4.2/ksplashml/pics/themes/Makefile.in	2005-07-26 19:06:52.002827760 +0000
+@@ -252,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22825,7 +27929,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -542,7 +545,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -22834,7 +27938,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -580,9 +583,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22846,10 +27950,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/ksplashml/pics/themes/none/Makefile.in kdebase-3.4.2/ksplashml/pics/themes/none/Makefile.in
+--- kdebase-3.4.2.orig/ksplashml/pics/themes/none/Makefile.in	2005-07-20 21:08:26.000000000 +0000
++++ kdebase-3.4.2/ksplashml/pics/themes/none/Makefile.in	2005-07-26 19:06:52.071817272 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22859,7 +27963,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -536,7 +539,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -22868,7 +27972,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -574,9 +577,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22880,10 +27984,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/ksplashml/pics/themes/simple/Makefile.in kdebase-3.4.2/ksplashml/pics/themes/simple/Makefile.in
+--- kdebase-3.4.2.orig/ksplashml/pics/themes/simple/Makefile.in	2005-07-20 21:08:26.000000000 +0000
++++ kdebase-3.4.2/ksplashml/pics/themes/simple/Makefile.in	2005-07-26 19:06:52.088814688 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22893,7 +27997,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -536,7 +539,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -22902,7 +28006,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -574,9 +577,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22914,10 +28018,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/ksplashml/themeengine/default/Makefile.in kdebase-3.4.2/ksplashml/themeengine/default/Makefile.in
+--- kdebase-3.4.2.orig/ksplashml/themeengine/default/Makefile.in	2005-07-20 21:08:26.000000000 +0000
++++ kdebase-3.4.2/ksplashml/themeengine/default/Makefile.in	2005-07-26 19:06:52.201797512 +0000
+@@ -289,6 +289,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22927,7 +28031,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -588,7 +591,7 @@
+@@ -589,7 +592,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22936,7 +28040,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -626,9 +629,9 @@
+@@ -627,9 +630,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22948,10 +28052,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/ksplashml/themeengine/Makefile.in kdebase-3.4.2/ksplashml/themeengine/Makefile.in
+--- kdebase-3.4.2.orig/ksplashml/themeengine/Makefile.in	2005-07-20 21:08:26.000000000 +0000
++++ kdebase-3.4.2/ksplashml/themeengine/Makefile.in	2005-07-26 19:06:52.150805264 +0000
+@@ -305,6 +305,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22961,7 +28065,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -602,7 +605,7 @@
+@@ -603,7 +606,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22970,7 +28074,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -640,9 +643,9 @@
+@@ -641,9 +644,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22982,10 +28086,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/ksplashml/themeengine/redmond/Makefile.in kdebase-3.4.2/ksplashml/themeengine/redmond/Makefile.in
+--- kdebase-3.4.2.orig/ksplashml/themeengine/redmond/Makefile.in	2005-07-20 21:08:27.000000000 +0000
++++ kdebase-3.4.2/ksplashml/themeengine/redmond/Makefile.in	2005-07-26 19:06:52.243791128 +0000
+@@ -303,6 +303,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22995,7 +28099,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -602,7 +605,7 @@
+@@ -603,7 +606,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23004,7 +28108,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -640,9 +643,9 @@
+@@ -641,9 +644,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23016,10 +28120,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/ksplashml/themeengine/redmond/pics/Makefile.in kdebase-3.4.2/ksplashml/themeengine/redmond/pics/Makefile.in
+--- kdebase-3.4.2.orig/ksplashml/themeengine/redmond/pics/Makefile.in	2005-07-20 21:08:27.000000000 +0000
++++ kdebase-3.4.2/ksplashml/themeengine/redmond/pics/Makefile.in	2005-07-26 19:06:52.267787480 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23029,7 +28133,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -536,7 +539,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -23038,7 +28142,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -574,9 +577,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23050,10 +28154,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/ksplashml/themeengine/simple/Makefile.in kdebase-3.4.2/ksplashml/themeengine/simple/Makefile.in
+--- kdebase-3.4.2.orig/ksplashml/themeengine/simple/Makefile.in	2005-07-20 21:08:27.000000000 +0000
++++ kdebase-3.4.2/ksplashml/themeengine/simple/Makefile.in	2005-07-26 19:06:52.289784136 +0000
+@@ -273,6 +273,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23063,7 +28167,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -564,7 +567,7 @@
+@@ -565,7 +568,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23072,7 +28176,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -602,9 +605,9 @@
+@@ -603,9 +606,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23084,10 +28188,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/ksplashml/themeengine/standard/Makefile.in kdebase-3.4.2/ksplashml/themeengine/standard/Makefile.in
+--- kdebase-3.4.2.orig/ksplashml/themeengine/standard/Makefile.in	2005-07-20 21:08:27.000000000 +0000
++++ kdebase-3.4.2/ksplashml/themeengine/standard/Makefile.in	2005-07-26 19:06:52.347775320 +0000
+@@ -312,6 +312,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23097,7 +28201,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -615,7 +618,7 @@
+@@ -616,7 +619,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23106,7 +28210,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -653,9 +656,9 @@
+@@ -654,9 +657,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23118,10 +28222,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/ksplashml/themeengine/standard/pics/Makefile.in kdebase-3.4.2/ksplashml/themeengine/standard/pics/Makefile.in
+--- kdebase-3.4.2.orig/ksplashml/themeengine/standard/pics/Makefile.in	2005-07-20 21:08:27.000000000 +0000
++++ kdebase-3.4.2/ksplashml/themeengine/standard/pics/Makefile.in	2005-07-26 19:06:52.371771672 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23131,7 +28235,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -536,7 +539,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -23140,7 +28244,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -574,9 +577,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23152,10 +28256,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kstart/Makefile.in kdebase-3.4.2/kstart/Makefile.in
+--- kdebase-3.4.2.orig/kstart/Makefile.in	2005-07-20 21:08:27.000000000 +0000
++++ kdebase-3.4.2/kstart/Makefile.in	2005-07-26 19:06:52.465757384 +0000
+@@ -277,6 +277,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23165,7 +28269,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -572,7 +575,7 @@
+@@ -573,7 +576,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23174,7 +28278,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -610,9 +613,9 @@
+@@ -611,9 +614,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23186,10 +28290,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/ksysguard/CContLib/Makefile.in kdebase-3.4.2/ksysguard/CContLib/Makefile.in
+--- kdebase-3.4.2.orig/ksysguard/CContLib/Makefile.in	2005-07-20 21:08:27.000000000 +0000
++++ kdebase-3.4.2/ksysguard/CContLib/Makefile.in	2005-07-26 19:06:52.486754192 +0000
+@@ -263,6 +263,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23199,7 +28303,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -554,7 +557,7 @@
+@@ -555,7 +558,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -23208,7 +28312,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +595,9 @@
+@@ -593,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23220,10 +28324,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLIBRARIES:
-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 @@
+diff -Nru kdebase-3.4.2.orig/ksysguard/example/Makefile.in kdebase-3.4.2/ksysguard/example/Makefile.in
+--- kdebase-3.4.2.orig/ksysguard/example/Makefile.in	2005-07-20 21:08:27.000000000 +0000
++++ kdebase-3.4.2/ksysguard/example/Makefile.in	2005-07-26 19:06:52.543745528 +0000
+@@ -248,6 +248,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23233,7 +28337,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -538,7 +541,7 @@
+@@ -539,7 +542,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -23242,7 +28346,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -576,9 +579,9 @@
+@@ -577,9 +580,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23254,10 +28358,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/ksysguard/gui/ksgrd/Makefile.in kdebase-3.4.2/ksysguard/gui/ksgrd/Makefile.in
+--- kdebase-3.4.2.orig/ksysguard/gui/ksgrd/Makefile.in	2005-07-20 21:08:28.000000000 +0000
++++ kdebase-3.4.2/ksysguard/gui/ksgrd/Makefile.in	2005-07-26 19:06:52.889692936 +0000
+@@ -288,6 +288,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23267,7 +28371,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -610,7 +613,7 @@
+@@ -611,7 +614,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -23276,7 +28380,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -648,9 +651,9 @@
+@@ -649,9 +652,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23288,10 +28392,71 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -954,13 +957,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
+ 
+@@ -968,11 +964,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
+@@ -982,6 +978,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
+ 
+@@ -997,7 +1000,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 
+@@ -1048,7 +1051,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.2.orig/ksysguard/gui/Makefile.in kdebase-3.4.2/ksysguard/gui/Makefile.in
+--- kdebase-3.4.2.orig/ksysguard/gui/Makefile.in	2005-07-20 21:08:28.000000000 +0000
++++ kdebase-3.4.2/ksysguard/gui/Makefile.in	2005-07-26 19:06:52.700721664 +0000
+@@ -343,6 +343,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23301,7 +28466,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -685,7 +688,7 @@
+@@ -686,7 +689,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cc .lo .o .obj
@@ -23310,7 +28475,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -723,9 +726,9 @@
+@@ -724,9 +727,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23322,10 +28487,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/ksysguard/gui/SensorDisplayLib/Makefile.in kdebase-3.4.2/ksysguard/gui/SensorDisplayLib/Makefile.in
+--- kdebase-3.4.2.orig/ksysguard/gui/SensorDisplayLib/Makefile.in	2005-07-20 21:08:28.000000000 +0000
++++ kdebase-3.4.2/ksysguard/gui/SensorDisplayLib/Makefile.in	2005-07-26 19:06:52.819703576 +0000
+@@ -283,6 +283,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23335,7 +28500,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -635,7 +638,7 @@
+@@ -636,7 +639,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -23344,7 +28509,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -673,9 +676,9 @@
+@@ -674,9 +677,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23356,10 +28521,78 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-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 @@
+@@ -935,18 +938,18 @@
+ 
+ 
+ #>+ 3
+-ListViewSettings.moc: $(srcdir)/ListViewSettings.h
+-	$(MOC) $(srcdir)/ListViewSettings.h -o ListViewSettings.moc
++SensorDisplay.moc: $(srcdir)/SensorDisplay.h
++	$(MOC) $(srcdir)/SensorDisplay.h -o SensorDisplay.moc
+ 
+ #>+ 2
+-mocs: ListViewSettings.moc
++mocs: SensorDisplay.moc
+ 
+ #>+ 3
+-SensorDisplay.moc: $(srcdir)/SensorDisplay.h
+-	$(MOC) $(srcdir)/SensorDisplay.h -o SensorDisplay.moc
++ListViewSettings.moc: $(srcdir)/ListViewSettings.h
++	$(MOC) $(srcdir)/ListViewSettings.h -o ListViewSettings.moc
+ 
+ #>+ 2
+-mocs: SensorDisplay.moc
++mocs: ListViewSettings.moc
+ 
+ #>+ 3
+ DummyDisplay.moc: $(srcdir)/DummyDisplay.h
+@@ -998,18 +1001,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
+@@ -1069,7 +1072,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  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
++	-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 
+@@ -1129,7 +1132,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  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
++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.2.orig/ksysguard/ksysguardd/FreeBSD/Makefile.in kdebase-3.4.2/ksysguard/ksysguardd/FreeBSD/Makefile.in
+--- kdebase-3.4.2.orig/ksysguard/ksysguardd/FreeBSD/Makefile.in	2005-07-20 21:08:28.000000000 +0000
++++ kdebase-3.4.2/ksysguard/ksysguardd/FreeBSD/Makefile.in	2005-07-26 19:06:52.911689592 +0000
+@@ -270,6 +270,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23369,7 +28602,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -562,7 +565,7 @@
+@@ -563,7 +566,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -23378,7 +28611,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -600,9 +603,9 @@
+@@ -601,9 +604,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23390,10 +28623,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLIBRARIES:
-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 @@
+diff -Nru kdebase-3.4.2.orig/ksysguard/ksysguardd/Irix/Makefile.in kdebase-3.4.2/ksysguard/ksysguardd/Irix/Makefile.in
+--- kdebase-3.4.2.orig/ksysguard/ksysguardd/Irix/Makefile.in	2005-07-20 21:08:28.000000000 +0000
++++ kdebase-3.4.2/ksysguard/ksysguardd/Irix/Makefile.in	2005-07-26 19:06:52.932686400 +0000
+@@ -265,6 +265,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23403,7 +28636,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -556,7 +559,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -23412,7 +28645,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -594,9 +597,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23424,10 +28657,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLIBRARIES:
-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 @@
+diff -Nru kdebase-3.4.2.orig/ksysguard/ksysguardd/Linux/Makefile.in kdebase-3.4.2/ksysguard/ksysguardd/Linux/Makefile.in
+--- kdebase-3.4.2.orig/ksysguard/ksysguardd/Linux/Makefile.in	2005-07-20 21:08:28.000000000 +0000
++++ kdebase-3.4.2/ksysguard/ksysguardd/Linux/Makefile.in	2005-07-26 19:06:52.957682600 +0000
+@@ -271,6 +271,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23437,7 +28670,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -568,7 +571,7 @@
+@@ -569,7 +572,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -23446,7 +28679,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -606,9 +609,9 @@
+@@ -607,9 +610,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23458,10 +28691,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLIBRARIES:
-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 @@
+diff -Nru kdebase-3.4.2.orig/ksysguard/ksysguardd/Makefile.in kdebase-3.4.2/ksysguard/ksysguardd/Makefile.in
+--- kdebase-3.4.2.orig/ksysguard/ksysguardd/Makefile.in	2005-07-20 21:08:28.000000000 +0000
++++ kdebase-3.4.2/ksysguard/ksysguardd/Makefile.in	2005-07-26 19:06:52.981678952 +0000
+@@ -283,6 +283,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23471,7 +28704,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -586,7 +589,7 @@
+@@ -587,7 +590,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -23480,7 +28713,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -624,9 +627,9 @@
+@@ -625,9 +628,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23492,10 +28725,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/ksysguard/ksysguardd/NetBSD/Makefile.in kdebase-3.4.2/ksysguard/ksysguardd/NetBSD/Makefile.in
+--- kdebase-3.4.2.orig/ksysguard/ksysguardd/NetBSD/Makefile.in	2005-07-20 21:08:28.000000000 +0000
++++ kdebase-3.4.2/ksysguard/ksysguardd/NetBSD/Makefile.in	2005-07-26 19:06:53.003675608 +0000
+@@ -270,6 +270,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23505,7 +28738,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -562,7 +565,7 @@
+@@ -563,7 +566,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -23514,7 +28747,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -600,9 +603,9 @@
+@@ -601,9 +604,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23526,10 +28759,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLIBRARIES:
-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 @@
+diff -Nru kdebase-3.4.2.orig/ksysguard/ksysguardd/OpenBSD/Makefile.in kdebase-3.4.2/ksysguard/ksysguardd/OpenBSD/Makefile.in
+--- kdebase-3.4.2.orig/ksysguard/ksysguardd/OpenBSD/Makefile.in	2005-07-20 21:08:28.000000000 +0000
++++ kdebase-3.4.2/ksysguard/ksysguardd/OpenBSD/Makefile.in	2005-07-26 19:06:53.024672416 +0000
+@@ -263,6 +263,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23539,7 +28772,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -554,7 +557,7 @@
+@@ -555,7 +558,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -23548,7 +28781,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +595,9 @@
+@@ -593,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23560,10 +28793,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLIBRARIES:
-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 @@
+diff -Nru kdebase-3.4.2.orig/ksysguard/ksysguardd/Solaris/Makefile.in kdebase-3.4.2/ksysguard/ksysguardd/Solaris/Makefile.in
+--- kdebase-3.4.2.orig/ksysguard/ksysguardd/Solaris/Makefile.in	2005-07-20 21:08:28.000000000 +0000
++++ kdebase-3.4.2/ksysguard/ksysguardd/Solaris/Makefile.in	2005-07-26 19:06:53.045669224 +0000
+@@ -271,6 +271,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23573,7 +28806,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -561,7 +564,7 @@
+@@ -562,7 +565,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -23582,7 +28815,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -599,9 +602,9 @@
+@@ -600,9 +603,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23594,10 +28827,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLIBRARIES:
-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 @@
+diff -Nru kdebase-3.4.2.orig/ksysguard/ksysguardd/Tru64/Makefile.in kdebase-3.4.2/ksysguard/ksysguardd/Tru64/Makefile.in
+--- kdebase-3.4.2.orig/ksysguard/ksysguardd/Tru64/Makefile.in	2005-07-20 21:08:28.000000000 +0000
++++ kdebase-3.4.2/ksysguard/ksysguardd/Tru64/Makefile.in	2005-07-26 19:06:53.066666032 +0000
+@@ -273,6 +273,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23607,7 +28840,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -567,7 +570,7 @@
+@@ -568,7 +571,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -23616,7 +28849,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -605,9 +608,9 @@
+@@ -606,9 +609,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23628,10 +28861,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLIBRARIES: $(lib_LIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/ksysguard/Makefile.in kdebase-3.4.2/ksysguard/Makefile.in
+--- kdebase-3.4.2.orig/ksysguard/Makefile.in	2005-07-20 21:08:27.000000000 +0000
++++ kdebase-3.4.2/ksysguard/Makefile.in	2005-07-26 19:06:52.517749480 +0000
+@@ -252,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23641,7 +28874,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -543,7 +546,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -23650,7 +28883,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -581,9 +584,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23662,10 +28895,43 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -882,23 +885,23 @@
+ 
+ #>+ 19
+ install-kde-icons:
+-	$(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/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-ksysguard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/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
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+ 	$(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/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/32x32/apps/ksysguard.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksysguard.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ksysguard.png
+ 	-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/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
+ force-reedit:
+diff -Nru kdebase-3.4.2.orig/ksysguard/pics/Makefile.in kdebase-3.4.2/ksysguard/pics/Makefile.in
+--- kdebase-3.4.2.orig/ksysguard/pics/Makefile.in	2005-07-20 21:08:28.000000000 +0000
++++ kdebase-3.4.2/ksysguard/pics/Makefile.in	2005-07-26 19:06:53.083663448 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23675,7 +28941,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -538,7 +541,7 @@
+@@ -539,7 +542,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -23684,7 +28950,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -576,9 +579,9 @@
+@@ -577,9 +580,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23696,10 +28962,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/ksystraycmd/Makefile.in kdebase-3.4.2/ksystraycmd/Makefile.in
+--- kdebase-3.4.2.orig/ksystraycmd/Makefile.in	2005-07-20 21:08:28.000000000 +0000
++++ kdebase-3.4.2/ksystraycmd/Makefile.in	2005-07-26 19:06:53.149653416 +0000
+@@ -281,6 +281,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23709,7 +28975,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -574,7 +577,7 @@
+@@ -575,7 +578,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23718,7 +28984,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -612,9 +615,9 @@
+@@ -613,9 +616,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23730,10 +28996,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/ktip/Makefile.in kdebase-3.4.2/ktip/Makefile.in
+--- kdebase-3.4.2.orig/ktip/Makefile.in	2005-07-20 21:08:28.000000000 +0000
++++ kdebase-3.4.2/ktip/Makefile.in	2005-07-26 19:06:53.180648704 +0000
+@@ -298,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23743,7 +29009,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -597,7 +600,7 @@
+@@ -598,7 +601,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23752,7 +29018,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -635,9 +638,9 @@
+@@ -636,9 +639,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23764,10 +29030,46 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -1071,26 +1074,26 @@
+ 
+ #>+ 22
+ install-kde-icons:
+-	$(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/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-ktip.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/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/128x128/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr128-app-ktip.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/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/32x32/apps/ktip.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ktip.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ktip.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/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.2.orig/ktip/pics/Makefile.in kdebase-3.4.2/ktip/pics/Makefile.in
+--- kdebase-3.4.2.orig/ktip/pics/Makefile.in	2005-07-20 21:08:28.000000000 +0000
++++ kdebase-3.4.2/ktip/pics/Makefile.in	2005-07-26 19:06:53.196646272 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23777,7 +29079,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -535,7 +538,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -23786,7 +29088,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -573,9 +576,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23798,10 +29100,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kwin/clients/b2/config/Makefile.in kdebase-3.4.2/kwin/clients/b2/config/Makefile.in
+--- kdebase-3.4.2.orig/kwin/clients/b2/config/Makefile.in	2005-07-20 21:08:29.000000000 +0000
++++ kdebase-3.4.2/kwin/clients/b2/config/Makefile.in	2005-07-26 19:06:53.772558720 +0000
+@@ -280,6 +280,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23811,7 +29113,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -575,7 +578,7 @@
+@@ -576,7 +579,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23820,7 +29122,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -613,9 +616,9 @@
+@@ -614,9 +617,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23832,10 +29134,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kwin/clients/b2/Makefile.in kdebase-3.4.2/kwin/clients/b2/Makefile.in
+--- kdebase-3.4.2.orig/kwin/clients/b2/Makefile.in	2005-07-20 21:08:29.000000000 +0000
++++ kdebase-3.4.2/kwin/clients/b2/Makefile.in	2005-07-26 19:06:53.742563280 +0000
+@@ -296,6 +296,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23845,7 +29147,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -595,7 +598,7 @@
+@@ -596,7 +599,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23854,7 +29156,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -633,9 +636,9 @@
+@@ -634,9 +637,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23866,10 +29168,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kwin/clients/default/config/Makefile.in kdebase-3.4.2/kwin/clients/default/config/Makefile.in
+--- kdebase-3.4.2.orig/kwin/clients/default/config/Makefile.in	2005-07-20 21:08:29.000000000 +0000
++++ kdebase-3.4.2/kwin/clients/default/config/Makefile.in	2005-07-26 19:06:53.862545040 +0000
+@@ -280,6 +280,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23879,7 +29181,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -575,7 +578,7 @@
+@@ -576,7 +579,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23888,7 +29190,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -613,9 +616,9 @@
+@@ -614,9 +617,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23900,10 +29202,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kwin/clients/default/Makefile.in kdebase-3.4.2/kwin/clients/default/Makefile.in
+--- kdebase-3.4.2.orig/kwin/clients/default/Makefile.in	2005-07-20 21:08:29.000000000 +0000
++++ kdebase-3.4.2/kwin/clients/default/Makefile.in	2005-07-26 19:06:53.833549448 +0000
+@@ -295,6 +295,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23913,7 +29215,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -590,7 +593,7 @@
+@@ -591,7 +594,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23922,7 +29224,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -628,9 +631,9 @@
+@@ -629,9 +632,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23934,10 +29236,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kwin/clients/keramik/config/Makefile.in kdebase-3.4.2/kwin/clients/keramik/config/Makefile.in
+--- kdebase-3.4.2.orig/kwin/clients/keramik/config/Makefile.in	2005-07-20 21:08:30.000000000 +0000
++++ kdebase-3.4.2/kwin/clients/keramik/config/Makefile.in	2005-07-26 19:06:53.976527712 +0000
+@@ -283,6 +283,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23947,7 +29249,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -580,7 +583,7 @@
+@@ -581,7 +584,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23956,7 +29258,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -618,9 +621,9 @@
+@@ -619,9 +622,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23968,10 +29270,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kwin/clients/keramik/Makefile.in kdebase-3.4.2/kwin/clients/keramik/Makefile.in
+--- kdebase-3.4.2.orig/kwin/clients/keramik/Makefile.in	2005-07-20 21:08:30.000000000 +0000
++++ kdebase-3.4.2/kwin/clients/keramik/Makefile.in	2005-07-26 19:06:53.946532272 +0000
+@@ -306,6 +306,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23981,7 +29283,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -610,7 +613,7 @@
+@@ -611,7 +614,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23990,7 +29292,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -648,9 +651,9 @@
+@@ -649,9 +652,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24002,10 +29304,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kwin/clients/kwmtheme/cli_installer/Makefile.in kdebase-3.4.2/kwin/clients/kwmtheme/cli_installer/Makefile.in
+--- kdebase-3.4.2.orig/kwin/clients/kwmtheme/cli_installer/Makefile.in	2005-07-20 21:08:30.000000000 +0000
++++ kdebase-3.4.2/kwin/clients/kwmtheme/cli_installer/Makefile.in	2005-07-26 19:06:54.049516616 +0000
+@@ -272,6 +272,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24015,7 +29317,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -572,7 +575,7 @@
+@@ -573,7 +576,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24024,7 +29326,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -610,9 +613,9 @@
+@@ -611,9 +614,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24036,10 +29338,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kwin/clients/kwmtheme/Makefile.in kdebase-3.4.2/kwin/clients/kwmtheme/Makefile.in
+--- kdebase-3.4.2.orig/kwin/clients/kwmtheme/Makefile.in	2005-07-20 21:08:30.000000000 +0000
++++ kdebase-3.4.2/kwin/clients/kwmtheme/Makefile.in	2005-07-26 19:06:54.027519960 +0000
+@@ -296,6 +296,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24049,7 +29351,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -593,7 +596,7 @@
+@@ -594,7 +597,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24058,7 +29360,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -631,9 +634,9 @@
+@@ -632,9 +635,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24070,10 +29372,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kwin/clients/laptop/Makefile.in kdebase-3.4.2/kwin/clients/laptop/Makefile.in
+--- kdebase-3.4.2.orig/kwin/clients/laptop/Makefile.in	2005-07-20 21:08:30.000000000 +0000
++++ kdebase-3.4.2/kwin/clients/laptop/Makefile.in	2005-07-26 19:06:54.099509016 +0000
+@@ -282,6 +282,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24083,7 +29385,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -579,7 +582,7 @@
+@@ -580,7 +583,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24092,7 +29394,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -617,9 +620,9 @@
+@@ -618,9 +621,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24104,10 +29406,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kwin/clients/Makefile.in kdebase-3.4.2/kwin/clients/Makefile.in
+--- kdebase-3.4.2.orig/kwin/clients/Makefile.in	2005-07-20 21:08:29.000000000 +0000
++++ kdebase-3.4.2/kwin/clients/Makefile.in	2005-07-26 19:06:53.655576504 +0000
+@@ -252,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24117,7 +29419,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -540,7 +543,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -24126,7 +29428,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -578,9 +581,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24138,10 +29440,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kwin/clients/modernsystem/config/Makefile.in kdebase-3.4.2/kwin/clients/modernsystem/config/Makefile.in
+--- kdebase-3.4.2.orig/kwin/clients/modernsystem/config/Makefile.in	2005-07-20 21:08:30.000000000 +0000
++++ kdebase-3.4.2/kwin/clients/modernsystem/config/Makefile.in	2005-07-26 19:06:54.182496400 +0000
+@@ -281,6 +281,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24151,7 +29453,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -576,7 +579,7 @@
+@@ -577,7 +580,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24160,7 +29462,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -614,9 +617,9 @@
+@@ -615,9 +618,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24172,10 +29474,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kwin/clients/modernsystem/Makefile.in kdebase-3.4.2/kwin/clients/modernsystem/Makefile.in
+--- kdebase-3.4.2.orig/kwin/clients/modernsystem/Makefile.in	2005-07-20 21:08:30.000000000 +0000
++++ kdebase-3.4.2/kwin/clients/modernsystem/Makefile.in	2005-07-26 19:06:54.153500808 +0000
+@@ -296,6 +296,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24185,7 +29487,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -594,7 +597,7 @@
+@@ -595,7 +598,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24194,7 +29496,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -632,9 +635,9 @@
+@@ -633,9 +636,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24206,10 +29508,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kwin/clients/plastik/config/Makefile.in kdebase-3.4.2/kwin/clients/plastik/config/Makefile.in
+--- kdebase-3.4.2.orig/kwin/clients/plastik/config/Makefile.in	2005-07-20 21:08:30.000000000 +0000
++++ kdebase-3.4.2/kwin/clients/plastik/config/Makefile.in	2005-07-26 19:06:54.272482720 +0000
+@@ -283,6 +283,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24219,7 +29521,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -581,7 +584,7 @@
+@@ -582,7 +585,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24228,7 +29530,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -619,9 +622,9 @@
+@@ -620,9 +623,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24240,10 +29542,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kwin/clients/plastik/Makefile.in kdebase-3.4.2/kwin/clients/plastik/Makefile.in
+--- kdebase-3.4.2.orig/kwin/clients/plastik/Makefile.in	2005-07-20 21:08:30.000000000 +0000
++++ kdebase-3.4.2/kwin/clients/plastik/Makefile.in	2005-07-26 19:06:54.231488952 +0000
+@@ -300,6 +300,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24253,7 +29555,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -599,7 +602,7 @@
+@@ -600,7 +603,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24262,7 +29564,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -637,9 +640,9 @@
+@@ -638,9 +641,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24274,10 +29576,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kwin/clients/quartz/config/Makefile.in kdebase-3.4.2/kwin/clients/quartz/config/Makefile.in
+--- kdebase-3.4.2.orig/kwin/clients/quartz/config/Makefile.in	2005-07-20 21:08:30.000000000 +0000
++++ kdebase-3.4.2/kwin/clients/quartz/config/Makefile.in	2005-07-26 19:06:54.391464632 +0000
+@@ -280,6 +280,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24287,7 +29589,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -575,7 +578,7 @@
+@@ -576,7 +579,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24296,7 +29598,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -613,9 +616,9 @@
+@@ -614,9 +617,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24308,10 +29610,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kwin/clients/quartz/Makefile.in kdebase-3.4.2/kwin/clients/quartz/Makefile.in
+--- kdebase-3.4.2.orig/kwin/clients/quartz/Makefile.in	2005-07-20 21:08:30.000000000 +0000
++++ kdebase-3.4.2/kwin/clients/quartz/Makefile.in	2005-07-26 19:06:54.345471624 +0000
+@@ -298,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24321,7 +29623,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -596,7 +599,7 @@
+@@ -597,7 +600,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24330,7 +29632,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -634,9 +637,9 @@
+@@ -635,9 +638,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24342,10 +29644,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kwin/clients/redmond/Makefile.in kdebase-3.4.2/kwin/clients/redmond/Makefile.in
+--- kdebase-3.4.2.orig/kwin/clients/redmond/Makefile.in	2005-07-20 21:08:30.000000000 +0000
++++ kdebase-3.4.2/kwin/clients/redmond/Makefile.in	2005-07-26 19:06:54.465453384 +0000
+@@ -284,6 +284,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24355,7 +29657,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -581,7 +584,7 @@
+@@ -582,7 +585,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24364,7 +29666,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -619,9 +622,9 @@
+@@ -620,9 +623,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24376,10 +29678,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kwin/clients/test/Makefile.in kdebase-3.4.2/kwin/clients/test/Makefile.in
+--- kdebase-3.4.2.orig/kwin/clients/test/Makefile.in	2005-07-20 21:08:30.000000000 +0000
++++ kdebase-3.4.2/kwin/clients/test/Makefile.in	2005-07-26 19:06:54.514445936 +0000
+@@ -282,6 +282,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24389,7 +29691,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -579,7 +582,7 @@
+@@ -580,7 +583,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24398,7 +29700,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -617,9 +620,9 @@
+@@ -618,9 +621,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24410,10 +29712,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kwin/clients/web/Makefile.in kdebase-3.4.2/kwin/clients/web/Makefile.in
+--- kdebase-3.4.2.orig/kwin/clients/web/Makefile.in	2005-07-20 21:08:30.000000000 +0000
++++ kdebase-3.4.2/kwin/clients/web/Makefile.in	2005-07-26 19:06:54.568437728 +0000
+@@ -291,6 +291,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24423,7 +29725,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -606,7 +609,7 @@
+@@ -607,7 +610,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24432,7 +29734,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -644,9 +647,9 @@
+@@ -645,9 +648,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24444,10 +29746,85 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -947,20 +950,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
+ Web.moc: $(srcdir)/Web.h
+ 	$(MOC) $(srcdir)/Web.h -o Web.moc
+ 
+@@ -968,13 +957,6 @@
+ mocs: Web.moc
+ 
+ #>+ 3
+-WebButton.moc: $(srcdir)/WebButton.h
+-	$(MOC) $(srcdir)/WebButton.h -o WebButton.moc
+-
+-#>+ 2
+-mocs: WebButton.moc
+-
+-#>+ 3
+ WebButtonClose.moc: $(srcdir)/WebButtonClose.h
+ 	$(MOC) $(srcdir)/WebButtonClose.h -o WebButtonClose.moc
+ 
+@@ -996,8 +978,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 Web.moc WebButton.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 
+@@ -1048,7 +1051,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 WebButton.moc Web.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; \
+diff -Nru kdebase-3.4.2.orig/kwin/data/Makefile.in kdebase-3.4.2/kwin/data/Makefile.in
+--- kdebase-3.4.2.orig/kwin/data/Makefile.in	2005-07-20 21:08:30.000000000 +0000
++++ kdebase-3.4.2/kwin/data/Makefile.in	2005-07-26 19:06:54.594433776 +0000
+@@ -289,6 +289,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24457,7 +29834,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -589,7 +592,7 @@
+@@ -590,7 +593,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24466,7 +29843,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -627,9 +630,9 @@
+@@ -628,9 +631,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24478,10 +29855,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kconfPROGRAMS: $(kconf_PROGRAMS)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kwin/kcmkwin/kwindecoration/Makefile.in kdebase-3.4.2/kwin/kcmkwin/kwindecoration/Makefile.in
+--- kdebase-3.4.2.orig/kwin/kcmkwin/kwindecoration/Makefile.in	2005-07-20 21:08:30.000000000 +0000
++++ kdebase-3.4.2/kwin/kcmkwin/kwindecoration/Makefile.in	2005-07-26 19:06:54.682420400 +0000
+@@ -290,6 +290,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24491,7 +29868,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -592,7 +595,7 @@
+@@ -593,7 +596,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24500,7 +29877,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -630,9 +633,9 @@
+@@ -631,9 +634,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24512,10 +29889,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kwin/kcmkwin/kwinoptions/Makefile.in kdebase-3.4.2/kwin/kcmkwin/kwinoptions/Makefile.in
+--- kdebase-3.4.2.orig/kwin/kcmkwin/kwinoptions/Makefile.in	2005-07-20 21:08:30.000000000 +0000
++++ kdebase-3.4.2/kwin/kcmkwin/kwinoptions/Makefile.in	2005-07-26 19:06:54.781405352 +0000
+@@ -289,6 +289,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24525,7 +29902,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -588,7 +591,7 @@
+@@ -589,7 +592,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24534,7 +29911,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -626,9 +629,9 @@
+@@ -627,9 +630,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24546,10 +29923,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kwin/kcmkwin/kwinrules/Makefile.in kdebase-3.4.2/kwin/kcmkwin/kwinrules/Makefile.in
+--- kdebase-3.4.2.orig/kwin/kcmkwin/kwinrules/Makefile.in	2005-07-20 21:08:30.000000000 +0000
++++ kdebase-3.4.2/kwin/kcmkwin/kwinrules/Makefile.in	2005-07-26 19:06:54.893388328 +0000
+@@ -318,6 +318,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24559,7 +29936,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -639,7 +642,7 @@
+@@ -640,7 +643,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24568,7 +29945,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -677,9 +680,9 @@
+@@ -678,9 +681,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24580,10 +29957,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kwin/kcmkwin/Makefile.in kdebase-3.4.2/kwin/kcmkwin/Makefile.in
+--- kdebase-3.4.2.orig/kwin/kcmkwin/Makefile.in	2005-07-20 21:08:30.000000000 +0000
++++ kdebase-3.4.2/kwin/kcmkwin/Makefile.in	2005-07-26 19:06:54.612431040 +0000
+@@ -252,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24593,7 +29970,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -540,7 +543,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -24602,7 +29979,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -578,9 +581,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24614,10 +29991,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kwin/killer/Makefile.in kdebase-3.4.2/kwin/killer/Makefile.in
+--- kdebase-3.4.2.orig/kwin/killer/Makefile.in	2005-07-20 21:08:30.000000000 +0000
++++ kdebase-3.4.2/kwin/killer/Makefile.in	2005-07-26 19:06:54.917384680 +0000
+@@ -272,6 +272,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24627,7 +30004,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -564,7 +567,7 @@
+@@ -565,7 +568,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24636,7 +30013,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -602,9 +605,9 @@
+@@ -603,9 +606,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24648,10 +30025,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kwin/kompmgr/Makefile.in kdebase-3.4.2/kwin/kompmgr/Makefile.in
+--- kdebase-3.4.2.orig/kwin/kompmgr/Makefile.in	2005-07-20 21:08:30.000000000 +0000
++++ kdebase-3.4.2/kwin/kompmgr/Makefile.in	2005-07-26 19:06:54.938381488 +0000
+@@ -263,6 +263,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24661,7 +30038,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -553,7 +556,7 @@
+@@ -554,7 +557,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -24670,7 +30047,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -591,9 +594,9 @@
+@@ -592,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24682,10 +30059,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kwin/lib/Makefile.in kdebase-3.4.2/kwin/lib/Makefile.in
+--- kdebase-3.4.2.orig/kwin/lib/Makefile.in	2005-07-20 21:08:30.000000000 +0000
++++ kdebase-3.4.2/kwin/lib/Makefile.in	2005-07-26 19:06:54.994372976 +0000
+@@ -286,6 +286,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24695,7 +30072,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -590,7 +593,7 @@
+@@ -591,7 +594,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24704,7 +30081,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -628,9 +631,9 @@
+@@ -629,9 +632,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24716,10 +30093,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kwin/Makefile.in kdebase-3.4.2/kwin/Makefile.in
+--- kdebase-3.4.2.orig/kwin/Makefile.in	2005-07-20 21:08:29.000000000 +0000
++++ kdebase-3.4.2/kwin/Makefile.in	2005-07-26 19:06:53.636579392 +0000
+@@ -322,6 +322,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24729,7 +30106,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -641,7 +644,7 @@
+@@ -642,7 +645,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24738,7 +30115,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -679,9 +682,9 @@
+@@ -680,9 +683,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24750,10 +30127,150 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -1401,64 +1404,64 @@
+ 	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub KWinInterface.kidl
+ 
+ #>+ 3
+-workspace.moc: $(srcdir)/workspace.h
+-	$(MOC) $(srcdir)/workspace.h -o workspace.moc
++client.moc: $(srcdir)/client.h
++	$(MOC) $(srcdir)/client.h -o client.moc
+ 
+ #>+ 2
+-mocs: workspace.moc
++mocs: client.moc
+ 
+ #>+ 3
+-utils.moc: $(srcdir)/utils.h
+-	$(MOC) $(srcdir)/utils.h -o utils.moc
++workspace.moc: $(srcdir)/workspace.h
++	$(MOC) $(srcdir)/workspace.h -o workspace.moc
+ 
+ #>+ 2
+-mocs: utils.moc
++mocs: workspace.moc
+ 
+ #>+ 3
+-main.moc: $(srcdir)/main.h
+-	$(MOC) $(srcdir)/main.h -o main.moc
++tabbox.moc: $(srcdir)/tabbox.h
++	$(MOC) $(srcdir)/tabbox.h -o tabbox.moc
+ 
+ #>+ 2
+-mocs: main.moc
++mocs: tabbox.moc
+ 
+ #>+ 3
+-sm.moc: $(srcdir)/sm.h
+-	$(MOC) $(srcdir)/sm.h -o sm.moc
++utils.moc: $(srcdir)/utils.h
++	$(MOC) $(srcdir)/utils.h -o utils.moc
+ 
+ #>+ 2
+-mocs: sm.moc
++mocs: utils.moc
+ 
+ #>+ 3
+-client.moc: $(srcdir)/client.h
+-	$(MOC) $(srcdir)/client.h -o client.moc
++popupinfo.moc: $(srcdir)/popupinfo.h
++	$(MOC) $(srcdir)/popupinfo.h -o popupinfo.moc
+ 
+ #>+ 2
+-mocs: client.moc
++mocs: popupinfo.moc
+ 
+ #>+ 3
+-tabbox.moc: $(srcdir)/tabbox.h
+-	$(MOC) $(srcdir)/tabbox.h -o tabbox.moc
++geometrytip.moc: $(srcdir)/geometrytip.h
++	$(MOC) $(srcdir)/geometrytip.h -o geometrytip.moc
+ 
+ #>+ 2
+-mocs: tabbox.moc
++mocs: geometrytip.moc
+ 
+ #>+ 3
+-popupinfo.moc: $(srcdir)/popupinfo.h
+-	$(MOC) $(srcdir)/popupinfo.h -o popupinfo.moc
++main.moc: $(srcdir)/main.h
++	$(MOC) $(srcdir)/main.h -o main.moc
+ 
+ #>+ 2
+-mocs: popupinfo.moc
++mocs: main.moc
+ 
+ #>+ 3
+-geometrytip.moc: $(srcdir)/geometrytip.h
+-	$(MOC) $(srcdir)/geometrytip.h -o geometrytip.moc
++sm.moc: $(srcdir)/sm.h
++	$(MOC) $(srcdir)/sm.h -o sm.moc
+ 
+ #>+ 2
+-mocs: geometrytip.moc
++mocs: sm.moc
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  workspace.moc utils.moc main.moc sm.moc client.moc tabbox.moc popupinfo.moc geometrytip.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 
+@@ -1473,17 +1476,17 @@
+ 
+ #>+ 13
+ install-kde-icons:
+-	$(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/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kwin.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/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
++	$(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
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwin.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwin.png
+ 	-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
+ 
+ #>+ 15
+ force-reedit:
+@@ -1524,7 +1527,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  client.moc workspace.moc tabbox.moc popupinfo.moc utils.moc geometrytip.moc sm.moc main.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; \
+@@ -1581,13 +1584,13 @@
+ tabbox.lo: tabbox.moc 
+ main.lo: main.moc 
+ geometrytip.o: geometrytip.moc 
+-client.lo: client.moc 
+ utils.lo: utils.moc 
++client.lo: client.moc 
++main.o: main.moc 
++utils.o: utils.moc 
+ libkdeinit_kwin.la: $(libkdeinit_kwin_la_OBJECTS) $(libkdeinit_kwin_la_DEPENDENCIES)
+ 	$(CXXLINK) -rpath $(libdir) $(libkdeinit_kwin_la_LDFLAGS) $(libkdeinit_kwin_la_OBJECTS) $(libkdeinit_kwin_la_LIBADD) $(LIBS)
+ 
+-utils.o: utils.moc 
+-main.o: main.moc 
+ client.o: client.moc 
+ nmcheck: 
+ geometrytip.lo: geometrytip.moc 
+diff -Nru kdebase-3.4.2.orig/kwin/oldheaders/Makefile.in kdebase-3.4.2/kwin/oldheaders/Makefile.in
+--- kdebase-3.4.2.orig/kwin/oldheaders/Makefile.in	2005-07-20 21:08:30.000000000 +0000
++++ kdebase-3.4.2/kwin/oldheaders/Makefile.in	2005-07-26 19:06:55.012370240 +0000
+@@ -249,6 +249,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24763,7 +30280,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -537,7 +540,7 @@
+@@ -538,7 +541,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -24772,7 +30289,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -575,9 +578,9 @@
+@@ -576,9 +579,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24784,10 +30301,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kwin/pics/Makefile.in kdebase-3.4.2/kwin/pics/Makefile.in
+--- kdebase-3.4.2.orig/kwin/pics/Makefile.in	2005-07-20 21:08:30.000000000 +0000
++++ kdebase-3.4.2/kwin/pics/Makefile.in	2005-07-26 19:06:55.029367656 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24797,7 +30314,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -538,7 +541,7 @@
+@@ -539,7 +542,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -24806,7 +30323,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -576,9 +579,9 @@
+@@ -577,9 +580,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24818,10 +30335,19 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -739,7 +742,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=menu.png greenie.light.png Makefile.in unknown.png pinup.png greenie.dim.png bluesun.png fog.png maximize.png maximizedown.png fog-grey.png pindown.png iconify.png Makefile.am close.png 
++KDE_DIST=menu.png greenie.light.png Makefile.in unknown.png pinup.png greenie.dim.png bluesun.png fog.png maximize.png maximizedown.png pindown.png fog-grey.png iconify.png Makefile.am close.png 
+ 
+ #>+ 2
+ docs-am:
+diff -Nru kdebase-3.4.2.orig/kwin/tools/Makefile.in kdebase-3.4.2/kwin/tools/Makefile.in
+--- kdebase-3.4.2.orig/kwin/tools/Makefile.in	2005-07-20 21:08:30.000000000 +0000
++++ kdebase-3.4.2/kwin/tools/Makefile.in	2005-07-26 19:06:55.052364160 +0000
+@@ -270,6 +270,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24831,7 +30357,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -562,7 +565,7 @@
+@@ -563,7 +566,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24840,7 +30366,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -600,9 +603,9 @@
+@@ -601,9 +604,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24852,10 +30378,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstPROGRAMS:
-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 @@
+diff -Nru kdebase-3.4.2.orig/kxkb/Makefile.in kdebase-3.4.2/kxkb/Makefile.in
+--- kdebase-3.4.2.orig/kxkb/Makefile.in	2005-07-20 21:08:30.000000000 +0000
++++ kdebase-3.4.2/kxkb/Makefile.in	2005-07-26 19:06:55.134351696 +0000
+@@ -324,6 +324,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24865,26 +30391,8 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -622,7 +625,7 @@
- #>- kcm_keyboard_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
- #>+ 1
- kcm_keyboard_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED)
--kcm_keyboard_la_LIBADD = -lxkbfile $(XTESTLIB) $(LIB_KIO)
-+kcm_keyboard_la_LIBADD = -lxkbfile_pic $(XTESTLIB) $(LIB_KIO)
+@@ -644,7 +647,7 @@
  
- #kxkb_la_includedir = .
- #kxkb_la_include_HEADERS = kxkb.h
-@@ -631,7 +634,7 @@
- kxkb_la_SOURCES = kxkb_la_dummy.cpp
- libkdeinit_kxkb_la_SOURCES = kxkb.cpp rules.cpp extension.cpp pixmap.cpp  kxkb_skel.cpp
- kxkb_la_LDFLAGS = $(all_libraries) -module -avoid-version
--#>- kxkb_la_LIBADD = -lxkbfile -lX11 -lXext $(LIB_KDEUI)
-+#>- kxkb_la_LIBADD = -lxkbfile_pic -lX11 -lXext $(LIB_KDEUI)
- #>+ 1
- kxkb_la_LIBADD = libkdeinit_kxkb.la
- xdg_apps_DATA = keyboard.desktop keyboard_layout.desktop
-@@ -643,7 +646,7 @@
- 
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -24892,7 +30400,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -681,9 +684,9 @@
+@@ -682,9 +685,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24904,19 +30412,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1197,7 +1200,7 @@
- .NOEXPORT:
- 
- #>+ 2
--libkdeinit_kxkb_la_LIBADD = -lxkbfile -lX11 -lXext $(LIB_KDEUI)
-+libkdeinit_kxkb_la_LIBADD = -lxkbfile_pic -lX11 -lXext $(LIB_KDEUI)
- 
- #>+ 2
- libkdeinit_kxkb_la_LDFLAGS = -no-undefined -avoid-version $(all_libraries)
-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 @@
+diff -Nru kdebase-3.4.2.orig/kxkb/pics/Makefile.in kdebase-3.4.2/kxkb/pics/Makefile.in
+--- kdebase-3.4.2.orig/kxkb/pics/Makefile.in	2005-07-20 21:08:30.000000000 +0000
++++ kdebase-3.4.2/kxkb/pics/Makefile.in	2005-07-26 19:06:55.154348656 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24926,7 +30425,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -523,7 +526,7 @@
+@@ -524,7 +527,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -24935,7 +30434,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -561,9 +564,9 @@
+@@ -562,9 +565,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24947,10 +30446,34 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -714,17 +717,17 @@
+ 
+ #>+ 13
+ install-kde-icons:
+-	$(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/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kxkb.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/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
++	$(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
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kxkb.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kxkb.png
+ 	-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
+ 
+ #>+ 15
+ force-reedit:
+diff -Nru kdebase-3.4.2.orig/l10n/Makefile.in kdebase-3.4.2/l10n/Makefile.in
+--- kdebase-3.4.2.orig/l10n/Makefile.in	2005-07-20 21:08:30.000000000 +0000
++++ kdebase-3.4.2/l10n/Makefile.in	2005-07-26 19:06:55.178345008 +0000
+@@ -247,6 +247,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24960,7 +30483,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -545,7 +548,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -24969,7 +30492,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -583,9 +586,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24981,10 +30504,19 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -756,7 +759,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=caribbean.desktop eastasia.desktop country.template easteurope.desktop southasia.desktop southeurope.desktop Makefile.in westafrica.desktop northeurope.desktop centralamerica.desktop westeurope.desktop middleeast.desktop northafrica.desktop southamerica.desktop oceania.desktop southeastasia.desktop centraleurope.desktop centralasia.desktop centralafrica.desktop southafrica.desktop northamerica.desktop Makefile.am 
++KDE_DIST=caribbean.desktop eastasia.desktop country.template southasia.desktop easteurope.desktop southeurope.desktop Makefile.in westafrica.desktop northeurope.desktop centralamerica.desktop westeurope.desktop middleeast.desktop northafrica.desktop southamerica.desktop oceania.desktop southeastasia.desktop centraleurope.desktop centralasia.desktop centralafrica.desktop southafrica.desktop northamerica.desktop Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+diff -Nru kdebase-3.4.2.orig/libkonq/favicons/Makefile.in kdebase-3.4.2/libkonq/favicons/Makefile.in
+--- kdebase-3.4.2.orig/libkonq/favicons/Makefile.in	2005-07-20 21:08:31.000000000 +0000
++++ kdebase-3.4.2/libkonq/favicons/Makefile.in	2005-07-26 19:06:55.507295000 +0000
+@@ -289,6 +289,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24994,7 +30526,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -589,7 +592,7 @@
+@@ -590,7 +593,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25003,7 +30535,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -627,9 +630,9 @@
+@@ -628,9 +631,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25015,10 +30547,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/libkonq/Makefile.in kdebase-3.4.2/libkonq/Makefile.in
+--- kdebase-3.4.2.orig/libkonq/Makefile.in	2005-07-20 21:08:31.000000000 +0000
++++ kdebase-3.4.2/libkonq/Makefile.in	2005-07-26 19:06:55.468300928 +0000
+@@ -342,6 +342,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25028,7 +30560,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -679,7 +682,7 @@
+@@ -680,7 +683,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -25037,7 +30569,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -717,9 +720,9 @@
+@@ -718,9 +721,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25049,10 +30581,63 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+@@ -1427,18 +1430,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
+@@ -1493,7 +1496,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  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_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 
+@@ -1551,7 +1554,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_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_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; \
+@@ -1596,8 +1599,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.2.orig/libkonq/pics/Makefile.in kdebase-3.4.2/libkonq/pics/Makefile.in
+--- kdebase-3.4.2.orig/libkonq/pics/Makefile.in	2005-07-20 21:08:31.000000000 +0000
++++ kdebase-3.4.2/libkonq/pics/Makefile.in	2005-07-26 19:06:55.524292416 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25062,7 +30647,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -535,7 +538,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -25071,7 +30656,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -573,9 +576,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25083,10 +30668,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/Makefile.in kdebase-3.4.2/Makefile.in
+--- kdebase-3.4.2.orig/Makefile.in	2005-07-20 21:08:03.000000000 +0000
++++ kdebase-3.4.2/Makefile.in	2005-07-26 19:06:28.259437304 +0000
+@@ -274,6 +274,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25096,7 +30681,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -572,7 +575,7 @@
+@@ -573,7 +576,7 @@
  .SUFFIXES:
  am--refresh:
  	@:
@@ -25105,7 +30690,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -614,12 +617,12 @@
+@@ -615,12 +618,12 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	$(SHELL) ./config.status --recheck
  
@@ -25120,7 +30705,7 @@
  	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
  
  config.h: stamp-h1
-@@ -631,7 +634,7 @@
+@@ -632,7 +635,7 @@
  stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
  	@rm -f stamp-h1
  	cd $(top_builddir) && $(SHELL) ./config.status config.h
@@ -25129,19 +30714,19 @@
  	cd $(top_srcdir) && $(AUTOHEADER)
  	rm -f stamp-h1
  	touch $@
-@@ -1251,7 +1254,7 @@
+@@ -1252,7 +1255,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 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 
++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 
  
  #>+ 2
  docs-am:
-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 @@
+diff -Nru kdebase-3.4.2.orig/nsplugins/Makefile.in kdebase-3.4.2/nsplugins/Makefile.in
+--- kdebase-3.4.2.orig/nsplugins/Makefile.in	2005-07-20 21:08:31.000000000 +0000
++++ kdebase-3.4.2/nsplugins/Makefile.in	2005-07-26 19:06:55.584283296 +0000
+@@ -319,6 +319,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25151,7 +30736,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -635,7 +638,7 @@
+@@ -636,7 +639,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25160,7 +30745,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -673,9 +676,9 @@
+@@ -674,9 +677,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25172,10 +30757,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/nsplugins/test/Makefile.in kdebase-3.4.2/nsplugins/test/Makefile.in
+--- kdebase-3.4.2.orig/nsplugins/test/Makefile.in	2005-07-20 21:08:31.000000000 +0000
++++ kdebase-3.4.2/nsplugins/test/Makefile.in	2005-07-26 19:06:55.625277064 +0000
+@@ -271,6 +271,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25185,7 +30770,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -564,7 +567,7 @@
+@@ -565,7 +568,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25194,7 +30779,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -602,9 +605,9 @@
+@@ -603,9 +606,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25206,10 +30791,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-checkPROGRAMS:
-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 @@
+diff -Nru kdebase-3.4.2.orig/nsplugins/viewer/Makefile.in kdebase-3.4.2/nsplugins/viewer/Makefile.in
+--- kdebase-3.4.2.orig/nsplugins/viewer/Makefile.in	2005-07-20 21:08:31.000000000 +0000
++++ kdebase-3.4.2/nsplugins/viewer/Makefile.in	2005-07-26 19:06:55.742259280 +0000
+@@ -278,6 +278,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25219,7 +30804,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -576,7 +579,7 @@
+@@ -577,7 +580,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25228,7 +30813,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -614,9 +617,9 @@
+@@ -615,9 +618,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25240,10 +30825,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/nsplugins/wrapper/Makefile.in kdebase-3.4.2/nsplugins/wrapper/Makefile.in
+--- kdebase-3.4.2.orig/nsplugins/wrapper/Makefile.in	2005-07-20 21:08:31.000000000 +0000
++++ kdebase-3.4.2/nsplugins/wrapper/Makefile.in	2005-07-26 19:06:55.764255936 +0000
+@@ -266,6 +266,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25253,7 +30838,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -556,7 +559,7 @@
+@@ -557,7 +560,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -25262,7 +30847,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -594,9 +597,9 @@
+@@ -595,9 +598,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25274,10 +30859,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-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 @@
+diff -Nru kdebase-3.4.2.orig/pics/crystalsvg/Makefile.in kdebase-3.4.2/pics/crystalsvg/Makefile.in
+--- kdebase-3.4.2.orig/pics/crystalsvg/Makefile.in	2005-07-20 21:08:31.000000000 +0000
++++ kdebase-3.4.2/pics/crystalsvg/Makefile.in	2005-07-26 19:06:55.982222800 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25287,7 +30872,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -523,7 +526,7 @@
+@@ -524,7 +527,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -25296,7 +30881,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -561,9 +564,9 @@
+@@ -562,9 +565,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25308,10 +30893,1497 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+@@ -707,786 +710,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 cr32-app-xmag.png cr16-app-applixware.png cr48-app-xv.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-linuxconf.png cr48-app-package_settings.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_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 cr64-app-phppg.png cr32-app-blender.png cr16-app-sodipodi.png cr32-app-xedit.png cr48-app-clanbomber.png cr32-app-xclipboard.png crsc-app-openoffice.svgz crsc-app-aktion.svgz cr16-app-licq.png cr128-app-pysol.png cr32-app-package_multimedia.png cr16-app-kvirc.png cr16-app-netscape.png cr128-app-linuxconf.png Makefile.in 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-mathematica.png cr16-app-pybliographic.png cr16-app-clanbomber.png cr64-app-kfm_home.png cr22-app-package_development.png crsc-app-terminal.svgz cr32-app-xapp.png cr48-app-licq.png cr16-app-package_applications.png cr48-app-xfmail.png cr64-app-applixware.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 cr64-app-package.png crsc-app-quicktime.svgz cr16-app-mozilla_mail.png cr16-app-package_system.png cr16-app-xclock.png cr22-app-email.png cr64-app-kvirc.png cr32-app-package_games.png cr32-app-wine.png cr64-app-wp.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 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 cr48-app-evolution.png crsc-app-core.svgz crsc-app-display.svgz cr64-app-terminal.png cr16-app-dia.png cr32-app-x.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 cr48-app-xemacs.png cr48-app-package.png cr64-app-gimp.png cr48-app-pan.png cr16-app-blender.png cr48-app-pysol.png cr48-app-designer.png cr48-app-package_games_strategy.png cr64-app-randr.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 cr128-app-applixware.png cr48-app-planner.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-package_games_strategy.png cr32-app-gv.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 cr32-app-xfig.png cr16-app-gvim.png cr16-app-linuxconf.png cr16-app-wabi.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 cr32-app-package_edutainment.png crsc-app-x.svgz cr48-app-randr.png crsc-app-camera.svgz cr48-app-abiword.png cr16-app-nedit.png cr32-app-linuxconf.png cr16-app-xv.png cr32-app-gabber.png cr16-app-gnomemeeting.png cr32-app-package_wordprocessing.png cr128-app-package_toys.png cr16-app-gv.png cr48-app-netscape.png cr16-app-package_development.png cr64-app-xmag.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 cr128-app-mozilla.png cr48-app-kvirc.png cr16-app-tux.png crsc-app-penguin.svgz cr128-app-gimp.png cr16-app-package_utilities.png cr48-app-bluefish.png cr16-app-vnc.png cr16-app-package_network.png cr16-app-kfm_home.png cr32-app-xclock.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 cr128-app-penguin.png cr16-app-gaim.png cr128-app-xmag.png cr32-app-package_games_card.png cr48-app-package_edutainment.png crsc-app-applixware.svgz cr32-app-xmms.png cr48-app-package_development.png cr48-app-package_toys.png cr32-app-abiword.png cr32-app-xemacs.png crsc-app-wine.svgz cr48-app-gnumeric.png cr16-app-xcalc.png cr16-app-abiword.png cr32-app-package_applications.png cr64-app-xclock.png cr32-app-alevt.png cr64-app-mozilla.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 cr16-app-planner.png cr32-app-nedit.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 crsc-app-error.svgz cr48-app-tux.png 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 cr64-app-qtella.png crsc-app-package_development.svgz 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 cr16-app-edu_miscellaneous.png cr32-app-galeon.png cr48-app-dia.png cr32-app-plan.png cr16-app-linguist.png cr16-app-firefox.png cr128-app-package_settings.png cr48-app-package_editors.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 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 cr48-app-package_games_card.png cr64-app-netscape.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/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_arcade.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-edu_miscellaneous.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_miscellaneous.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-x.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/x.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-gnumeric.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnumeric.png
++	$(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-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clanbomber.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_settings.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-gnumeric.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnumeric.png
++	$(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-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kfm_home.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-gaim.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gaim.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)/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)/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-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/penguin.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)/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)/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)/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)/cr16-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_settings.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_settings.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_settings.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-evolution.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/evolution.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-eclipse.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/eclipse.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xclock.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/email.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)/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)/cr16-app-gnome_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnome_apps.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-mozilla_m.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_m.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gimp.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-staroffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/staroffice.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)/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
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-terminal.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/terminal.svgz
++	$(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)/cr32-app-firefox.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/firefox.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-designer.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/designer.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/phppg.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/netscape.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-xpaint.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xpaint.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-assistant.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/assistant.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)/cr16-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/penguin.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_multimedia.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-mozilla_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_mail.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_toys.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/randr.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-gnomemeeting.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnomemeeting.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-mathematica.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mathematica.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pysol.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-package_toys.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_toys.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-quicktime.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/quicktime.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-xemacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xemacs.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-mozilla_m.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_m.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/tux.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/tux.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-package_wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_wordprocessing.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-xclipboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclipboard.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-xpaint.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xpaint.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-eclipse.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/eclipse.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/licq.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_edutainment.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_edutainment.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-realplayer.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/realplayer.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wine.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-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/randr.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/nedit.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-firefox.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/firefox.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-browser.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/browser.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-thunderbird.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/thunderbird.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/blender.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/email.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-gnome_apps.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/gnome_apps.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/terminal.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/terminal.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclock.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfm_home.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kvirc.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pan.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-evolution.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/evolution.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfm_home.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-package_edutainment.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_edutainment.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-penguin.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/penguin.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-gnome_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnome_apps.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-edu_mathematics.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_mathematics.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/penguin.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_multimedia.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/nedit.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gvim.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-antivirus.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/antivirus.svgz
++	$(INSTALL_DATA) $(srcdir)/cr32-app-scribus.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/scribus.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-xemacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xemacs.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)/cr16-app-alevt.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/alevt.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-dlgedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dlgedit.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-xedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xedit.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pan.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-mozilla_m.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_m.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)/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)/cr32-app-xcalc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xcalc.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clanbomber.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-display.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/display.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-galeon.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/galeon.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/randr.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-aim.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aim.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/wp.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-bluefish.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bluefish.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xmag.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-xload.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xload.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_applications.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xclock.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/blender.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-staroffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/staroffice.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/penguin.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-camera.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/camera.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_favourite.png
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_board.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-xmms.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmms.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/emacs.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-gabber.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gabber.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gimp.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-xpaint.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xpaint.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-galeon.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/galeon.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-opera.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/opera.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-xosview.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xosview.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-xchat.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xchat.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-dlgedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dlgedit.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/mozilla.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_science.png
++	$(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-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_applications.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)/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)/cr64-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_toys.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-core.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/core.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-xemacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xemacs.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_board.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-clock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clock.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/blender.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xmag.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-package_wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_wordprocessing.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-xeyes.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xeyes.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-wabi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wabi.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/acroread.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/acroread.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/licq.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-gnucash.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnucash.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_network.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-package_games_strategy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_strategy.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/wp.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-realplayer.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/realplayer.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_development.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-edu_languages.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_languages.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wine.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/penguin.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-lyx.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/lyx.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/applixware.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-email.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/email.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-xcalc.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xcalc.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_favourite.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/gimp.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_development.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-gabber.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gabber.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-vnc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/vnc.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/email.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-download_manager.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/download_manager.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-xconsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xconsole.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-package_editors.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_editors.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-xconsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xconsole.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_development.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-linguist.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linguist.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-pybliographic.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pybliographic.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-xapp.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xapp.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-linguist.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linguist.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-xosview.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xosview.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gvim.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
++	$(INSTALL_DATA) $(srcdir)/cr48-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wp.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)/cr16-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_multimedia.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)/crsc-app-personal.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/personal.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-edu_languages.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_languages.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_network.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/pysol.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-gv.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gv.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-mathematica.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mathematica.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-sodipodi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/sodipodi.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_utilities.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/email.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/tux.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-gnucash.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnucash.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-edu_mathematics.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_mathematics.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmag.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/emacs.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_applications.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/terminal.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_favourite.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/randr.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_science.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-opera.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/opera.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-gaim.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gaim.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-error.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/error.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-gnumeric.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnumeric.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/applixware.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/tux.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-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)/cr48-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/phppg.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-abiword.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/abiword.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-xv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xv.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-dia.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dia.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gimp.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)/cr32-app-edu_miscellaneous.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_miscellaneous.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)/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)/cr22-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/randr.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-acroread.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/acroread.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-tux.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/tux.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-designer.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/designer.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/netscape.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_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_toys.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-mozilla_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_mail.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/netscape.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_network.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/linuxconf.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-package_graphics.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_graphics.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)/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)/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)/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)/cr32-app-xedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xedit.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-package_graphics.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_graphics.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-gnomemeeting.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnomemeeting.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kvirc.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-package_graphics.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_graphics.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_favourite.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xfmail.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_utilities.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-package_games_strategy.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_strategy.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-edu_mathematics.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_mathematics.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/package_development.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/pysol.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_games.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/mozilla.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wp.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/licq.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/email.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-xeyes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xeyes.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-package_system.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_system.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wine.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/nedit.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-package_games_card.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_card.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/terminal.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/terminal.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/applixware.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)/cr32-app-gabber.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gabber.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-package_development.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_development.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-abiword.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/abiword.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kfm_home.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/penguin.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfm_home.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-shell.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/shell.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-xchat.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xchat.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-planner.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/planner.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-edu_miscellaneous.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_miscellaneous.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-remote.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/remote.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/acroread.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-xchat.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xchat.png
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gvim.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-scribus.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/scribus.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_utilities.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/linuxconf.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/randr.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/licq.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfmail.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-hardware.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hardware.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wp.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-package_editors.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_editors.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_favourite.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-qtella.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/qtella.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-clanbomber.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clanbomber.svgz
++	$(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)/cr48-app-vnc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/vnc.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-x.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/x.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-abiword.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/abiword.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-bluefish.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bluefish.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)/cr32-app-edu_languages.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_languages.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-bluefish.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bluefish.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xmag.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_development.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linuxconf.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_network.png
+ 	$(INSTALL_DATA) $(srcdir)/cr64-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_applications.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clanbomber.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-thunderbird.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/thunderbird.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/nedit.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-lyx.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/lyx.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-scribus.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/scribus.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/applixware.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-gaim.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gaim.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-xmms.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmms.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-xedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xedit.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-package_edutainment.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_edutainment.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-gnome_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnome_apps.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-vnc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/vnc.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xclock.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-staroffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/staroffice.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_multimedia.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_utilities.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-my_mac.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/my_mac.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-pybliographic.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pybliographic.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-remote.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/remote.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-planner.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/planner.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_development.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-xv.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xv.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gimp.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_multimedia.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-staroffice.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/staroffice.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_arcade.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pan.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/acroread.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-mozilla_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_mail.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_toys.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-wabi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wabi.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/acroread.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-package_editors.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_editors.png
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-gnomemeeting.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnomemeeting.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xfmail.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)/cr128-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_applications.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-plan.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/plan.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/licq.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-xcalc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xcalc.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-xfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfig.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-package_system.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_system.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_settings.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-dia.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/dia.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_network.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pysol.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clanbomber.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-planner.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/planner.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linuxconf.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_science.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-xload.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xload.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-aktion.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aktion.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-xchat.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xchat.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/phppg.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclock.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-eclipse.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/eclipse.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/netscape.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-netscape.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/netscape.svgz
++	$(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)/cr48-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_utilities.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)/cr128-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_toys.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gvim.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-firefox.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/firefox.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-opera.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/opera.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)/cr32-app-assistant.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/assistant.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-xclock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xclock.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-sodipodi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/sodipodi.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-galeon.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/galeon.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-sodipodi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/sodipodi.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_games.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_board.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-x.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/x.svgz
++	$(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)/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-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/phppg.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-wmaker_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wmaker_apps.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-realplayer.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/realplayer.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-xemacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xemacs.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wp.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-package_wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_wordprocessing.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-evolution.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/evolution.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/linuxconf.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmag.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/email.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-xeyes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xeyes.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/applixware.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-package_games_card.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_card.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-applixware.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/applixware.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_applications.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-package_system.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_system.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/32x32/apps/package_games_arcade.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_miscellaneous.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/x.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnumeric.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla.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/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/xclock.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/abiword.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/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/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/32x32/apps/package_settings.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/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/16x16/apps/gnumeric.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kfm_home.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/64x64/apps/package_settings.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_settings.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/evolution.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/eclipse.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xclock.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/email.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/mozilla_mail.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnome_apps.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_m.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gimp.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/staroffice.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/scalable/apps/terminal.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/netscape.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/firefox.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/designer.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/phppg.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/netscape.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xpaint.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/assistant.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xfmail.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/penguin.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_multimedia.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_mail.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_toys.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/randr.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnomemeeting.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mathematica.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pysol.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_toys.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/quicktime.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xemacs.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_m.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/tux.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/tux.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_wordprocessing.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclipboard.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xpaint.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/eclipse.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/licq.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_strategy.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_edutainment.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/realplayer.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wine.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/tux.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/randr.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/nedit.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/firefox.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/browser.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/thunderbird.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/blender.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/email.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/gnome_apps.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/terminal.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/terminal.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclock.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfm_home.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kvirc.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pan.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/evolution.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfm_home.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_edutainment.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/penguin.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnome_apps.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_mathematics.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/penguin.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_multimedia.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/nedit.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gvim.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/antivirus.svgz
++	-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/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/16x16/apps/alevt.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dlgedit.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xedit.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pan.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_m.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/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/32x32/apps/xcalc.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clanbomber.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/display.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/galeon.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/randr.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aim.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/wp.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bluefish.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xmag.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xload.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_applications.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xclock.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/blender.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/staroffice.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/penguin.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/camera.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_favourite.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_board.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmms.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/emacs.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gabber.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gimp.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xpaint.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/galeon.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/opera.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xosview.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xchat.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dlgedit.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/mozilla.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_science.png
++	-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/package_applications.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/128x128/apps/terminal.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/phppg.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_toys.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/core.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xemacs.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_board.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clock.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/blender.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xmag.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_wordprocessing.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xeyes.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wabi.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/acroread.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/acroread.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/licq.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnucash.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_network.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_strategy.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/wp.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/realplayer.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_development.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_languages.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wine.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/penguin.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/lyx.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/applixware.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/email.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xcalc.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_favourite.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/gimp.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_development.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gabber.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/vnc.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/email.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/download_manager.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xconsole.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_editors.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xconsole.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_development.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linguist.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pybliographic.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xapp.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linguist.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xosview.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gvim.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/48x48/apps/wp.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/16x16/apps/package_multimedia.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/scalable/apps/personal.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_languages.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_network.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/pysol.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gv.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mathematica.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/sodipodi.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_utilities.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/email.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/tux.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnucash.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_mathematics.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmag.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/emacs.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_applications.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/terminal.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_favourite.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/randr.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_science.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/opera.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gaim.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/error.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnumeric.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/applixware.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/tux.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/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/48x48/apps/phppg.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/abiword.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xv.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dia.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gimp.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/32x32/apps/edu_miscellaneous.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/22x22/apps/randr.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/acroread.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/tux.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/designer.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/netscape.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_arcade.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_toys.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_mail.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/netscape.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_network.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/linuxconf.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_graphics.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/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/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/scalable/apps/aim.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/32x32/apps/xedit.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_graphics.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnomemeeting.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kvirc.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_graphics.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_favourite.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xfmail.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_utilities.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_strategy.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_mathematics.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/package_development.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/pysol.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_games.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/mozilla.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wp.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/licq.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/email.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xeyes.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_system.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wine.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/nedit.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/package_games_card.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/terminal.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/terminal.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/applixware.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/32x32/apps/gabber.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_development.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/abiword.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kfm_home.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/penguin.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfm_home.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/shell.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xchat.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/planner.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_miscellaneous.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/remote.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/acroread.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xchat.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gvim.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/scribus.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_utilities.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/linuxconf.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/randr.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/licq.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfmail.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hardware.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wp.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_editors.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_favourite.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/qtella.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clanbomber.svgz
++	-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/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/48x48/apps/vnc.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/x.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/abiword.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_card.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bluefish.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/email.svgz
++	-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/16x16/apps/bluefish.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xmag.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_development.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linuxconf.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_network.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_applications.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clanbomber.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/thunderbird.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/nedit.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/lyx.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/scribus.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/applixware.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gaim.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmms.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xedit.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_edutainment.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnome_apps.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/vnc.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xclock.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/staroffice.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_multimedia.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_utilities.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/my_mac.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pybliographic.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/remote.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/planner.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_development.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xv.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gimp.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_multimedia.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/staroffice.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_arcade.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pan.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/acroread.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_mail.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_toys.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wabi.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/acroread.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_editors.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnomemeeting.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xfmail.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/realplayer.svgz
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclipboard.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_applications.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/plan.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/xfig.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_system.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_settings.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/dia.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_network.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pysol.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clanbomber.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/planner.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linuxconf.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_science.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xload.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aktion.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xchat.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/phppg.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclock.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/eclipse.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/netscape.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/netscape.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/emacs.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_utilities.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/128x128/apps/package_toys.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gvim.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/firefox.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/opera.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/32x32/apps/assistant.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xclock.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/sodipodi.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/galeon.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/sodipodi.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_games.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_board.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/x.svgz
++	-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/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/phppg.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wmaker_apps.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/realplayer.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xemacs.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wp.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_wordprocessing.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/evolution.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/linuxconf.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmag.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/email.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xeyes.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/applixware.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_card.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/applixware.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_applications.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_system.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.2.orig/pics/hicolor/Makefile.in kdebase-3.4.2/pics/hicolor/Makefile.in
+--- kdebase-3.4.2.orig/pics/hicolor/Makefile.in	2005-07-20 21:08:31.000000000 +0000
++++ kdebase-3.4.2/pics/hicolor/Makefile.in	2005-07-26 19:06:55.999220216 +0000
+@@ -236,6 +236,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25321,7 +32393,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -523,7 +526,7 @@
+@@ -524,7 +527,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -25330,7 +32402,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -561,9 +564,9 @@
+@@ -562,9 +565,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25342,10 +32414,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/pics/Makefile.in kdebase-3.4.2/pics/Makefile.in
+--- kdebase-3.4.2.orig/pics/Makefile.in	2005-07-20 21:08:31.000000000 +0000
++++ kdebase-3.4.2/pics/Makefile.in	2005-07-26 19:06:55.785252744 +0000
+@@ -252,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25355,7 +32427,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -540,7 +543,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -25364,7 +32436,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -578,9 +581,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25376,10 +32448,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-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 @@
+diff -Nru kdebase-3.4.2.orig/pics/wallpapers/Makefile.in kdebase-3.4.2/pics/wallpapers/Makefile.in
+--- kdebase-3.4.2.orig/pics/wallpapers/Makefile.in	2005-07-20 21:08:31.000000000 +0000
++++ kdebase-3.4.2/pics/wallpapers/Makefile.in	2005-07-26 19:06:56.029215656 +0000
+@@ -246,6 +246,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25389,7 +32461,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -600,7 +603,7 @@
+@@ -601,7 +604,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -25398,7 +32470,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -638,9 +641,9 @@
+@@ -639,9 +642,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25410,3 +32482,12 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
+@@ -801,7 +804,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 default_gears.jpg only_k.jpg.desktop 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:




More information about the Pkg-kde-commits mailing list