[Pkg-kde-commits] rev 1401 - branches/kde-3.4.0/packages/kdetoys/debian/patches

Christopher Martin chrsmrtn-guest at costa.debian.org
Sun Jul 31 20:41:23 UTC 2005


Author: chrsmrtn-guest
Date: 2005-07-31 20:41:21 +0000 (Sun, 31 Jul 2005)
New Revision: 1401

Modified:
   branches/kde-3.4.0/packages/kdetoys/debian/patches/98_buildprep.diff
Log:
And the kdetoys 3.4.2 buildprep.diff update.


Modified: branches/kde-3.4.0/packages/kdetoys/debian/patches/98_buildprep.diff
===================================================================
--- branches/kde-3.4.0/packages/kdetoys/debian/patches/98_buildprep.diff	2005-07-31 20:40:20 UTC (rev 1400)
+++ branches/kde-3.4.0/packages/kdetoys/debian/patches/98_buildprep.diff	2005-07-31 20:41:21 UTC (rev 1401)
@@ -1,7 +1,7 @@
-diff -rua kdetoys-3.4.1.orig/acinclude.m4 kdetoys-3.4.1/acinclude.m4
---- kdetoys-3.4.1.orig/acinclude.m4	2005-05-23 18:12:12.000000000 +0200
-+++ kdetoys-3.4.1/acinclude.m4	2005-05-25 08:40:10.772163130 +0200
-@@ -1690,15 +1690,6 @@
+diff -Nru kdetoys-3.4.2.orig/acinclude.m4 kdetoys-3.4.2/acinclude.m4
+--- kdetoys-3.4.2.orig/acinclude.m4	2005-07-20 20:20:37.000000000 +0000
++++ kdetoys-3.4.2/acinclude.m4	2005-07-31 20:12:25.104714704 +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 kdetoys-3.4.1.orig/aclocal.m4 kdetoys-3.4.1/aclocal.m4
---- kdetoys-3.4.1.orig/aclocal.m4	2005-05-23 18:12:22.000000000 +0200
-+++ kdetoys-3.4.1/aclocal.m4	2005-05-25 08:40:25.225850608 +0200
+diff -Nru kdetoys-3.4.2.orig/aclocal.m4 kdetoys-3.4.2/aclocal.m4
+--- kdetoys-3.4.2.orig/aclocal.m4	2005-07-20 20:20:47.000000000 +0000
++++ kdetoys-3.4.2/aclocal.m4	2005-07-31 20:12:59.287518128 +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 kdetoys-3.4.1.orig/amor/data/Makefile.in kdetoys-3.4.1/amor/data/Makefile.in
---- kdetoys-3.4.1.orig/amor/data/Makefile.in	2005-05-23 18:12:44.000000000 +0200
-+++ kdetoys-3.4.1/amor/data/Makefile.in	2005-05-25 08:40:54.716172799 +0200
-@@ -185,6 +185,9 @@
+diff -Nru kdetoys-3.4.2.orig/amor/data/Makefile.in kdetoys-3.4.2/amor/data/Makefile.in
+--- kdetoys-3.4.2.orig/amor/data/Makefile.in	2005-07-20 20:21:10.000000000 +0000
++++ kdetoys-3.4.2/amor/data/Makefile.in	2005-07-31 20:14:25.235452056 +0000
+@@ -186,6 +186,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -1495,7 +1568,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -343,7 +346,7 @@
+@@ -344,7 +347,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -1504,7 +1577,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -381,9 +384,9 @@
+@@ -382,9 +385,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -1516,10 +1589,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdetoys-3.4.1.orig/amor/data/pics/animated/blob/Makefile.in kdetoys-3.4.1/amor/data/pics/animated/blob/Makefile.in
---- kdetoys-3.4.1.orig/amor/data/pics/animated/blob/Makefile.in	2005-05-23 18:12:44.000000000 +0200
-+++ kdetoys-3.4.1/amor/data/pics/animated/blob/Makefile.in	2005-05-25 08:40:54.750169712 +0200
-@@ -169,6 +169,9 @@
+diff -Nru kdetoys-3.4.2.orig/amor/data/pics/animated/blob/Makefile.in kdetoys-3.4.2/amor/data/pics/animated/blob/Makefile.in
+--- kdetoys-3.4.2.orig/amor/data/pics/animated/blob/Makefile.in	2005-07-20 20:21:10.000000000 +0000
++++ kdetoys-3.4.2/amor/data/pics/animated/blob/Makefile.in	2005-07-31 20:14:25.277445672 +0000
+@@ -170,6 +170,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -1529,7 +1602,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -404,7 +407,7 @@
+@@ -405,7 +408,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -1538,7 +1611,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -442,9 +445,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -1550,10 +1623,19 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdetoys-3.4.1.orig/amor/data/pics/animated/bonhomme/Makefile.in kdetoys-3.4.1/amor/data/pics/animated/bonhomme/Makefile.in
---- kdetoys-3.4.1.orig/amor/data/pics/animated/bonhomme/Makefile.in	2005-05-23 18:12:44.000000000 +0200
-+++ kdetoys-3.4.1/amor/data/pics/animated/bonhomme/Makefile.in	2005-05-25 08:40:54.761168714 +0200
-@@ -169,6 +169,9 @@
+@@ -604,7 +607,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=blob_r225.png blob_s3.png blob_gl1.png blob_l_jet3.png blob_BeamUp6.png blob_fire8.png blob_z1.png blob_BeamUp8.png blob_fire11.png blob_f3.png blob_sl3.png blob_ex1.png blob_BeamUp7.png blob_jet4.png blob_BeamUp1.png blob_BeamDown7.png blob_fire3.png blob_e1.png blob_BeamDown4.png blob_r315.png blob_r_turn1.png blob_BeamUp10.png blob_l_turn3.png blob_l_turn1.png blob_fire4.png blob_z3.png blob_h1.png blob_jet2.png blob_g2.png blob_gl2.png blob_BeamUp3.png blob_fire6.png blob_fire9.png blob_r180.png blob_h3.png blob_l_turn4.png blob_BeamUp2.png blob_BeamDown2.png blob_z2.png blob_r_turn3.png blob_g1.png blob_r45.png blob_sl4.png blob_l_jet1.png blob_BeamDown3.png blob_f1.png blob_r135.png blob_sl2.png blob_r270.png blob_BeamUp4.png blob_b1.png blob_r_turn4.png blob_s1.png blob_fire5.png blob_BeamUp5.png blob_fire2.png blob_f2.png blob_BeamUp9.png blob_BeamDown9.png blob_l_jet2.png blob_BeamDown5.png blob_fire7.png blob_r90.png blob_jet1.png Makefile.in blob_BeamDown6.png blob_sl1.png blob_l_turn2.png blob_b2.png blob_s2.png blob_BeamDown8.png blob_r_turn2.png blob_h2.png blob_jet3.png blob.png Makefile.am blob_BeamDown1.png blob_fire10.png blob_gl3.png blob_l_jet4.png 
++KDE_DIST=blob_s3.png blob_r225.png blob_gl1.png blob_l_jet3.png blob_BeamUp6.png blob_fire8.png blob_z1.png blob_BeamUp8.png blob_f3.png blob_fire11.png blob_sl3.png blob_BeamUp7.png blob_ex1.png blob_jet4.png blob_BeamUp1.png blob_fire3.png blob_BeamDown7.png blob_e1.png blob_BeamDown4.png blob_r315.png blob_r_turn1.png blob_BeamUp10.png blob_fire4.png blob_l_turn3.png blob_l_turn1.png blob_z3.png blob_h1.png blob_jet2.png blob_g2.png blob_gl2.png blob_BeamUp3.png blob_fire9.png blob_fire6.png blob_r180.png blob_h3.png blob_BeamUp2.png blob_l_turn4.png blob_BeamDown2.png blob_z2.png blob_r_turn3.png blob_g1.png blob_r45.png blob_sl4.png blob_l_jet1.png blob_BeamDown3.png blob_r135.png blob_f1.png blob_sl2.png blob_r270.png blob_BeamUp4.png blob_b1.png blob_r_turn4.png blob_s1.png blob_fire5.png blob_BeamUp5.png blob_fire2.png blob_BeamUp9.png blob_f2.png blob_BeamDown9.png blob_BeamDown5.png blob_l_jet2.png blob_fire7.png blob_r90.png blob_jet1.png Makefile.in blob_BeamDown6.png blob_sl1.png blob_l_turn2.png blob_b2.png blob_s2.png blob_BeamDown8.png blob_r_turn2.png blob_h2.png blob_jet3.png blob.png blob_BeamDown1.png Makefile.am blob_fire10.png blob_l_jet4.png blob_gl3.png 
+ 
+ #>+ 2
+ docs-am:
+diff -Nru kdetoys-3.4.2.orig/amor/data/pics/animated/bonhomme/Makefile.in kdetoys-3.4.2/amor/data/pics/animated/bonhomme/Makefile.in
+--- kdetoys-3.4.2.orig/amor/data/pics/animated/bonhomme/Makefile.in	2005-07-20 20:21:10.000000000 +0000
++++ kdetoys-3.4.2/amor/data/pics/animated/bonhomme/Makefile.in	2005-07-31 20:14:25.291443544 +0000
+@@ -170,6 +170,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -1563,7 +1645,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -367,7 +370,7 @@
+@@ -368,7 +371,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -1572,7 +1654,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -405,9 +408,9 @@
+@@ -406,9 +409,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -1584,10 +1666,19 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdetoys-3.4.1.orig/amor/data/pics/animated/eyes/Makefile.in kdetoys-3.4.1/amor/data/pics/animated/eyes/Makefile.in
---- kdetoys-3.4.1.orig/amor/data/pics/animated/eyes/Makefile.in	2005-05-23 18:12:44.000000000 +0200
-+++ kdetoys-3.4.1/amor/data/pics/animated/eyes/Makefile.in	2005-05-25 08:40:54.772167715 +0200
-@@ -169,6 +169,9 @@
+@@ -567,7 +570,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=b-f.png bdrib4.png bpof5.png b-f2.png b3-r.png bgo3.png bh1.png bpof2.png b2.png bgo6.png bgo5.png bdrop.png bcol1.png bpof6.png b4.png bpof1.png bdrib7.png b4-r.png bdrib3.png salut.png sa1.png bdrib5.png b3.png bdrib1.png bpof3.png bgo2.png b1.png salut1.png sa2b.png bcol2.png b2-r.png bdrib2.png sa2c.png sa2a.png Makefile.in sa2.png bgo4.png b1-r.png bgo1.png Makefile.am bdrib6.png bpof4.png bgo7.png 
++KDE_DIST=b-f.png bdrib4.png bpof5.png b-f2.png b3-r.png bgo3.png bh1.png bpof2.png b2.png bgo6.png bgo5.png bdrop.png bcol1.png bpof6.png bpof1.png b4.png bdrib7.png b4-r.png bdrib3.png salut.png sa1.png bdrib5.png b3.png bdrib1.png bpof3.png bgo2.png b1.png salut1.png sa2b.png bcol2.png b2-r.png bdrib2.png sa2c.png sa2a.png Makefile.in sa2.png bgo4.png b1-r.png bgo1.png Makefile.am bdrib6.png bgo7.png bpof4.png 
+ 
+ #>+ 2
+ docs-am:
+diff -Nru kdetoys-3.4.2.orig/amor/data/pics/animated/eyes/Makefile.in kdetoys-3.4.2/amor/data/pics/animated/eyes/Makefile.in
+--- kdetoys-3.4.2.orig/amor/data/pics/animated/eyes/Makefile.in	2005-07-20 20:21:10.000000000 +0000
++++ kdetoys-3.4.2/amor/data/pics/animated/eyes/Makefile.in	2005-07-31 20:14:25.304441568 +0000
+@@ -170,6 +170,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -1597,7 +1688,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -353,7 +356,7 @@
+@@ -354,7 +357,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -1606,7 +1697,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -391,9 +394,9 @@
+@@ -392,9 +395,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -1618,10 +1709,19 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdetoys-3.4.1.orig/amor/data/pics/animated/ghost/Makefile.in kdetoys-3.4.1/amor/data/pics/animated/ghost/Makefile.in
---- kdetoys-3.4.1.orig/amor/data/pics/animated/ghost/Makefile.in	2005-05-23 18:12:44.000000000 +0200
-+++ kdetoys-3.4.1/amor/data/pics/animated/ghost/Makefile.in	2005-05-25 08:40:54.782166807 +0200
-@@ -169,6 +169,9 @@
+@@ -553,7 +556,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=eye_z1.png eye_h2.png eye_z3.png eye_m2.png eye_z4.png eye_2.png eye_d.png eye_z2.png eye_s1.png eye_m7.png eye_m6.png eye_u.png eye_b.png eye_h4.png eye_e.png eye_s4.png eye_h3.png eye_h1.png eye_m5.png eye_l.png eye_m3.png Makefile.in eye_m4.png eye_s3.png eye_1.png eye_s2.png eye_z5.png Makefile.am eye_m1.png 
++KDE_DIST=eye_z1.png eye_h2.png eye_z3.png eye_m2.png eye_z4.png eye_2.png eye_z2.png eye_d.png eye_s1.png eye_m7.png eye_m6.png eye_u.png eye_b.png eye_h4.png eye_e.png eye_s4.png eye_h3.png eye_h1.png eye_m5.png eye_l.png eye_m3.png Makefile.in eye_m4.png eye_1.png eye_s3.png eye_s2.png eye_z5.png Makefile.am eye_m1.png 
+ 
+ #>+ 2
+ docs-am:
+diff -Nru kdetoys-3.4.2.orig/amor/data/pics/animated/ghost/Makefile.in kdetoys-3.4.2/amor/data/pics/animated/ghost/Makefile.in
+--- kdetoys-3.4.2.orig/amor/data/pics/animated/ghost/Makefile.in	2005-07-20 20:21:10.000000000 +0000
++++ kdetoys-3.4.2/amor/data/pics/animated/ghost/Makefile.in	2005-07-31 20:14:25.348434880 +0000
+@@ -170,6 +170,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -1631,7 +1731,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -341,7 +344,7 @@
+@@ -342,7 +345,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -1640,7 +1740,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -379,9 +382,9 @@
+@@ -380,9 +383,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -1652,10 +1752,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdetoys-3.4.1.orig/amor/data/pics/animated/Makefile.in kdetoys-3.4.1/amor/data/pics/animated/Makefile.in
---- kdetoys-3.4.1.orig/amor/data/pics/animated/Makefile.in	2005-05-23 18:12:44.000000000 +0200
-+++ kdetoys-3.4.1/amor/data/pics/animated/Makefile.in	2005-05-25 08:40:54.737170893 +0200
-@@ -175,6 +175,9 @@
+diff -Nru kdetoys-3.4.2.orig/amor/data/pics/animated/Makefile.in kdetoys-3.4.2/amor/data/pics/animated/Makefile.in
+--- kdetoys-3.4.2.orig/amor/data/pics/animated/Makefile.in	2005-07-20 20:21:10.000000000 +0000
++++ kdetoys-3.4.2/amor/data/pics/animated/Makefile.in	2005-07-31 20:14:25.262447952 +0000
+@@ -176,6 +176,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -1665,7 +1765,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -327,7 +330,7 @@
+@@ -328,7 +331,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -1674,7 +1774,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -365,9 +368,9 @@
+@@ -366,9 +369,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -1686,10 +1786,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdetoys-3.4.1.orig/amor/data/pics/animated/neko/Makefile.in kdetoys-3.4.1/amor/data/pics/animated/neko/Makefile.in
---- kdetoys-3.4.1.orig/amor/data/pics/animated/neko/Makefile.in	2005-05-23 18:12:44.000000000 +0200
-+++ kdetoys-3.4.1/amor/data/pics/animated/neko/Makefile.in	2005-05-25 08:40:54.793165808 +0200
-@@ -169,6 +169,9 @@
+diff -Nru kdetoys-3.4.2.orig/amor/data/pics/animated/neko/Makefile.in kdetoys-3.4.2/amor/data/pics/animated/neko/Makefile.in
+--- kdetoys-3.4.2.orig/amor/data/pics/animated/neko/Makefile.in	2005-07-20 20:21:10.000000000 +0000
++++ kdetoys-3.4.2/amor/data/pics/animated/neko/Makefile.in	2005-07-31 20:14:25.361432904 +0000
+@@ -170,6 +170,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -1699,7 +1799,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -353,7 +356,7 @@
+@@ -354,7 +357,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -1708,7 +1808,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -391,9 +394,9 @@
+@@ -392,9 +395,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -1720,10 +1820,19 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdetoys-3.4.1.orig/amor/data/pics/animated/pingu/Makefile.in kdetoys-3.4.1/amor/data/pics/animated/pingu/Makefile.in
---- kdetoys-3.4.1.orig/amor/data/pics/animated/pingu/Makefile.in	2005-05-23 18:12:44.000000000 +0200
-+++ kdetoys-3.4.1/amor/data/pics/animated/pingu/Makefile.in	2005-05-25 08:40:54.807164537 +0200
-@@ -169,6 +169,9 @@
+@@ -553,7 +556,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=run2.png claw2.png jump4.png jump1.png scratch4.png yawn.png lick2.png jump2.png surprise.png scratch2.png scratch1.png run3.png jumpl2.png run4.png jumpl4.png sleep2.png sleep1.png claw1.png jumpl1.png scratch3.png jump3.png lick.png Makefile.in tail.png sitleft.png jumpl3.png Makefile.am run1.png sit.png 
++KDE_DIST=run2.png claw2.png jump4.png jump1.png scratch4.png yawn.png lick2.png jump2.png surprise.png scratch2.png scratch1.png jumpl2.png run3.png run4.png jumpl4.png sleep2.png sleep1.png claw1.png jumpl1.png scratch3.png jump3.png lick.png Makefile.in tail.png sitleft.png jumpl3.png Makefile.am run1.png sit.png 
+ 
+ #>+ 2
+ docs-am:
+diff -Nru kdetoys-3.4.2.orig/amor/data/pics/animated/pingu/Makefile.in kdetoys-3.4.2/amor/data/pics/animated/pingu/Makefile.in
+--- kdetoys-3.4.2.orig/amor/data/pics/animated/pingu/Makefile.in	2005-07-20 20:21:10.000000000 +0000
++++ kdetoys-3.4.2/amor/data/pics/animated/pingu/Makefile.in	2005-07-31 20:14:25.380430016 +0000
+@@ -170,6 +170,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -1733,7 +1842,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -426,7 +429,7 @@
+@@ -427,7 +430,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -1742,7 +1851,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -464,9 +467,9 @@
+@@ -465,9 +468,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -1754,10 +1863,19 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdetoys-3.4.1.orig/amor/data/pics/animated/tao/Makefile.in kdetoys-3.4.1/amor/data/pics/animated/tao/Makefile.in
---- kdetoys-3.4.1.orig/amor/data/pics/animated/tao/Makefile.in	2005-05-23 18:12:44.000000000 +0200
-+++ kdetoys-3.4.1/amor/data/pics/animated/tao/Makefile.in	2005-05-25 08:40:54.819163448 +0200
-@@ -169,6 +169,9 @@
+@@ -626,7 +629,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=walk_l4.png bash_r2.png walk_r1.png digger2.png floater7.png floater3.png bash_l3.png blocker1.png bash_r7.png bash_r3.png tumble7.png walk_l1.png bash_l5.png faller5.png digger1.png bomber7.png floater5.png walk_l5.png blocker4.png blocker2.png bomber16.png faller4.png bash_l4.png bash_r11.png walk_l3.png walk_r6.png bash_r9.png bash_r5.png tumble6.png bash_l1.png floater1.png bomber11.png tumble5.png digger9.png walk_l7.png bomber6.png bash_r12.png bash_l10.png bash_r10.png tumble3.png walk_l2.png walk_l8.png floater6.png tumble8.png bash_r8.png bomber15.png bash_l9.png digger10.png blocker6.png tumble1.png bash_l2.png bomber10.png bash_l11.png bash_l8.png digger12.png walk_r5.png digger11.png bomber12.png digger4.png floater2.png bash_l12.png floater4.png bomber2.png floater8.png faller6.png bash_r6.png walk_r4.png bomber14.png digger5.png bomber5.png bomber3.png bash_r1.png walk_l6.png digger7.png faller7.png digger8.png bomber4.png digger3.png digger13.png digger6.png faller1.png walk_r3.png Makefile.in bash_r4.png bomber13.png bomber9.png faller3.png bomber8.png tumble2.png walk_r2.png digger14.png bomber1.png tumble4.png bash_l6.png faller2.png walk_r7.png faller8.png walk_r8.png bash_l7.png Makefile.am blocker3.png blocker5.png 
++KDE_DIST=bash_r2.png walk_l4.png walk_r1.png digger2.png floater7.png floater3.png blocker1.png bash_l3.png bash_r7.png bash_r3.png tumble7.png walk_l1.png faller5.png bash_l5.png bomber7.png floater5.png digger1.png blocker4.png walk_l5.png blocker2.png bomber16.png faller4.png bash_r11.png walk_r6.png walk_l3.png bash_l4.png bash_r9.png bash_r5.png tumble6.png floater1.png bash_l1.png bomber11.png tumble5.png digger9.png bomber6.png walk_l7.png bash_r12.png bash_l10.png tumble3.png bash_r10.png walk_l2.png walk_l8.png floater6.png tumble8.png bash_r8.png bomber15.png blocker6.png bash_l9.png digger10.png tumble1.png bomber10.png bash_l2.png bash_l11.png walk_r5.png bash_l8.png digger12.png digger11.png bomber12.png floater2.png digger4.png floater4.png bash_l12.png bomber2.png floater8.png faller6.png walk_r4.png bash_r6.png bomber14.png bomber5.png bomber3.png digger5.png bash_r1.png walk_l6.png digger7.png faller7.png bomber4.png digger8.png digger3.png digger13.png digger6.png faller1.png walk_r3.png Makefile.in bash_r4.png bomber13.png bomber9.png faller3.png bomber8.png tumble2.png walk_r2.png bomber1.png digger14.png tumble4.png faller2.png bash_l6.png walk_r7.png faller8.png walk_r8.png bash_l7.png Makefile.am blocker3.png blocker5.png 
+ 
+ #>+ 2
+ docs-am:
+diff -Nru kdetoys-3.4.2.orig/amor/data/pics/animated/tao/Makefile.in kdetoys-3.4.2/amor/data/pics/animated/tao/Makefile.in
+--- kdetoys-3.4.2.orig/amor/data/pics/animated/tao/Makefile.in	2005-07-20 20:21:10.000000000 +0000
++++ kdetoys-3.4.2/amor/data/pics/animated/tao/Makefile.in	2005-07-31 20:14:25.395427736 +0000
+@@ -170,6 +170,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -1767,7 +1885,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -372,7 +375,7 @@
+@@ -373,7 +376,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -1776,7 +1894,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -410,9 +413,9 @@
+@@ -411,9 +414,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -1788,10 +1906,19 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdetoys-3.4.1.orig/amor/data/pics/animated/worm/Makefile.in kdetoys-3.4.1/amor/data/pics/animated/worm/Makefile.in
---- kdetoys-3.4.1.orig/amor/data/pics/animated/worm/Makefile.in	2005-05-23 18:12:44.000000000 +0200
-+++ kdetoys-3.4.1/amor/data/pics/animated/worm/Makefile.in	2005-05-25 08:40:54.830162449 +0200
-@@ -169,6 +169,9 @@
+@@ -572,7 +575,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=yy-9.png yy-4.png yy135.png yy330.png yy120.png yy180.png yyx24.png yy-8.png yyx6.png yy195.png yyx18.png yy-3.png yy45.png yyx22.png yy-5.png yyx14.png yy90.png yyx26.png yy270.png yyx28.png yy-6.png yy.png yy210.png yy-2.png yy285.png yy105.png yy300.png yy-1.png yy15.png yyx16.png yyx30.png yy150.png yy-7.png yy315.png yyx8.png yyx12.png yy30.png Makefile.in yy60.png yy255.png yy75.png yy225.png yyx10.png yy345.png yyx20.png yy240.png Makefile.am yy165.png 
++KDE_DIST=yy-9.png yy-4.png yy135.png yy330.png yy120.png yy180.png yyx24.png yy-8.png yy195.png yyx6.png yyx18.png yy-3.png yy45.png yyx22.png yyx14.png yy-5.png yy90.png yyx26.png yy.png yyx28.png yy270.png yy-6.png yy210.png yy-2.png yy285.png yy300.png yy105.png yy-1.png yyx16.png yy15.png yyx30.png yy150.png yy-7.png yyx12.png yy315.png yyx8.png yy30.png Makefile.in yy60.png yy255.png yy75.png yy225.png yyx10.png yy345.png yyx20.png yy240.png Makefile.am yy165.png 
+ 
+ #>+ 2
+ docs-am:
+diff -Nru kdetoys-3.4.2.orig/amor/data/pics/animated/worm/Makefile.in kdetoys-3.4.2/amor/data/pics/animated/worm/Makefile.in
+--- kdetoys-3.4.2.orig/amor/data/pics/animated/worm/Makefile.in	2005-07-20 20:21:10.000000000 +0000
++++ kdetoys-3.4.2/amor/data/pics/animated/worm/Makefile.in	2005-07-31 20:14:25.408425760 +0000
+@@ -170,6 +170,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -1801,7 +1928,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -362,7 +365,7 @@
+@@ -363,7 +366,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -1810,7 +1937,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -400,9 +403,9 @@
+@@ -401,9 +404,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -1822,10 +1949,19 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdetoys-3.4.1.orig/amor/data/pics/Makefile.in kdetoys-3.4.1/amor/data/pics/Makefile.in
---- kdetoys-3.4.1.orig/amor/data/pics/Makefile.in	2005-05-23 18:12:44.000000000 +0200
-+++ kdetoys-3.4.1/amor/data/pics/Makefile.in	2005-05-25 08:40:54.726171891 +0200
-@@ -175,6 +175,9 @@
+@@ -562,7 +565,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=w-s2.png w-u2.png w-mr0.png w-wr2.png w-mr1.png w-mr3.png w-u3.png w-dr1.png w-d3.png w-l3.png w-mr2.png w-d4.png w-s3.png w-be4.png w-d5.png w-wl2.png w-a2.png w-wr1.png w-d1.png w-be1.png w-wl1.png w-be3.png w-b2.png w-b1.png w-l2.png w-e1.png Makefile.in w-d2.png w-u1.png w-ml3.png w-s1.png w-ml0.png w-ml1.png w-l1.png w-be2.png w-ml2.png Makefile.am w-a1.png 
++KDE_DIST=w-s2.png w-u2.png w-mr0.png w-wr2.png w-mr1.png w-mr3.png w-u3.png w-d3.png w-dr1.png w-l3.png w-mr2.png w-d4.png w-s3.png w-be4.png w-d5.png w-wl2.png w-a2.png w-wr1.png w-d1.png w-be1.png w-wl1.png w-b2.png w-be3.png w-b1.png w-l2.png w-e1.png Makefile.in w-d2.png w-u1.png w-ml3.png w-s1.png w-ml0.png w-ml1.png w-l1.png w-be2.png w-ml2.png w-a1.png Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+diff -Nru kdetoys-3.4.2.orig/amor/data/pics/Makefile.in kdetoys-3.4.2/amor/data/pics/Makefile.in
+--- kdetoys-3.4.2.orig/amor/data/pics/Makefile.in	2005-07-20 20:21:10.000000000 +0000
++++ kdetoys-3.4.2/amor/data/pics/Makefile.in	2005-07-31 20:14:25.248450080 +0000
+@@ -176,6 +176,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -1835,7 +1971,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -327,7 +330,7 @@
+@@ -328,7 +331,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -1844,7 +1980,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -365,9 +368,9 @@
+@@ -366,9 +369,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -1856,10 +1992,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdetoys-3.4.1.orig/amor/data/pics/preview/Makefile.in kdetoys-3.4.1/amor/data/pics/preview/Makefile.in
---- kdetoys-3.4.1.orig/amor/data/pics/preview/Makefile.in	2005-05-23 18:12:44.000000000 +0200
-+++ kdetoys-3.4.1/amor/data/pics/preview/Makefile.in	2005-05-25 08:40:54.839161632 +0200
-@@ -169,6 +169,9 @@
+diff -Nru kdetoys-3.4.2.orig/amor/data/pics/preview/Makefile.in kdetoys-3.4.2/amor/data/pics/preview/Makefile.in
+--- kdetoys-3.4.2.orig/amor/data/pics/preview/Makefile.in	2005-07-20 20:21:10.000000000 +0000
++++ kdetoys-3.4.2/amor/data/pics/preview/Makefile.in	2005-07-31 20:14:25.420423936 +0000
+@@ -170,6 +170,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -1869,7 +2005,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -326,7 +329,7 @@
+@@ -327,7 +330,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -1878,7 +2014,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -364,9 +367,9 @@
+@@ -365,9 +368,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -1890,10 +2026,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdetoys-3.4.1.orig/amor/data/pics/static/Makefile.in kdetoys-3.4.1/amor/data/pics/static/Makefile.in
---- kdetoys-3.4.1.orig/amor/data/pics/static/Makefile.in	2005-05-23 18:12:44.000000000 +0200
-+++ kdetoys-3.4.1/amor/data/pics/static/Makefile.in	2005-05-25 08:40:54.849160724 +0200
-@@ -169,6 +169,9 @@
+diff -Nru kdetoys-3.4.2.orig/amor/data/pics/static/Makefile.in kdetoys-3.4.2/amor/data/pics/static/Makefile.in
+--- kdetoys-3.4.2.orig/amor/data/pics/static/Makefile.in	2005-07-20 20:21:10.000000000 +0000
++++ kdetoys-3.4.2/amor/data/pics/static/Makefile.in	2005-07-31 20:14:25.432422112 +0000
+@@ -170,6 +170,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -1903,7 +2039,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -326,7 +329,7 @@
+@@ -327,7 +330,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -1912,7 +2048,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -364,9 +367,9 @@
+@@ -365,9 +368,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -1924,10 +2060,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdetoys-3.4.1.orig/amor/Makefile.in kdetoys-3.4.1/amor/Makefile.in
---- kdetoys-3.4.1.orig/amor/Makefile.in	2005-05-23 18:12:44.000000000 +0200
-+++ kdetoys-3.4.1/amor/Makefile.in	2005-05-25 08:40:54.704173889 +0200
-@@ -232,6 +232,9 @@
+diff -Nru kdetoys-3.4.2.orig/amor/Makefile.in kdetoys-3.4.2/amor/Makefile.in
+--- kdetoys-3.4.2.orig/amor/Makefile.in	2005-07-20 20:21:10.000000000 +0000
++++ kdetoys-3.4.2/amor/Makefile.in	2005-07-31 20:14:25.221454184 +0000
+@@ -233,6 +233,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -1937,7 +2073,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -413,7 +416,7 @@
+@@ -414,7 +417,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -1946,7 +2082,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -451,9 +454,9 @@
+@@ -452,9 +455,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -1958,15 +2094,104 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -rua kdetoys-3.4.1.orig/configure kdetoys-3.4.1/configure
---- kdetoys-3.4.1.orig/configure	2005-05-23 18:12:46.000000000 +0200
-+++ kdetoys-3.4.1/configure	2005-05-25 08:40:57.888884721 +0200
+@@ -870,18 +873,18 @@
+ 	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub AmorIface.kidl
+ 
+ #>+ 3
+-amorwidget.moc: $(srcdir)/amorwidget.h
+-	$(MOC) $(srcdir)/amorwidget.h -o amorwidget.moc
++amor.moc: $(srcdir)/amor.h
++	$(MOC) $(srcdir)/amor.h -o amor.moc
+ 
+ #>+ 2
+-mocs: amorwidget.moc
++mocs: amor.moc
+ 
+ #>+ 3
+-amor.moc: $(srcdir)/amor.h
+-	$(MOC) $(srcdir)/amor.h -o amor.moc
++amorwidget.moc: $(srcdir)/amorwidget.h
++	$(MOC) $(srcdir)/amorwidget.h -o amorwidget.moc
+ 
+ #>+ 2
+-mocs: amor.moc
++mocs: amorwidget.moc
+ 
+ #>+ 3
+ amordialog.moc: $(srcdir)/amordialog.h
+@@ -899,7 +902,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  amorwidget.moc amor.moc amordialog.moc amorbubble.moc
++	-rm -f  amor.moc amorwidget.moc amordialog.moc amorbubble.moc
+ 
+ #>+ 2
+ KDE_DIST=cr48-app-amor.png Makefile.in preparetips cr32-app-amor.png amor.desktop version.h cr16-app-amor.png configure.in.in Makefile.am 
+@@ -914,17 +917,17 @@
+ 
+ #>+ 13
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-amor.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/amor.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-amor.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/amor.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-amor.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/amor.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/cr16-app-amor.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/amor.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/cr32-app-amor.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/amor.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/amor.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/amor.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/amor.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/amor.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/amor.png
+ 
+ #>+ 15
+ force-reedit:
+@@ -965,7 +968,7 @@
+ 
+ 
+ #>+ 11
+-amor.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/amordialog.cpp $(srcdir)/amor.cpp $(srcdir)/amorwidget.cpp $(srcdir)/main.cpp $(srcdir)/amoranim.cpp $(srcdir)/amorpm.cpp $(srcdir)/amorbubble.cpp $(srcdir)/amorconfig.cpp $(srcdir)/amortips.cpp AmorIface_skel.cpp  amor.moc amorwidget.moc amordialog.moc amorbubble.moc
++amor.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/amordialog.cpp $(srcdir)/amor.cpp $(srcdir)/amorwidget.cpp $(srcdir)/main.cpp $(srcdir)/amoranim.cpp $(srcdir)/amorpm.cpp $(srcdir)/amorbubble.cpp $(srcdir)/amorconfig.cpp $(srcdir)/amortips.cpp AmorIface_skel.cpp  amorwidget.moc amor.moc amordialog.moc amorbubble.moc
+ 	@echo 'creating amor.all_cpp.cpp ...'; \
+ 	rm -f amor.all_cpp.files amor.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> amor.all_cpp.final; \
+@@ -1011,7 +1014,7 @@
+ nmcheck-am: nmcheck
+ amordialog.lo: amordialog.moc 
+ amorbubble.o: amorbubble.moc 
+-amorwidget.o: amorwidget.moc 
+ amor.lo: amor.moc 
++amorwidget.o: amorwidget.moc 
+ amorbubble.lo: amorbubble.moc 
+ amordialog.o: amordialog.moc 
+diff -Nru kdetoys-3.4.2.orig/config.h.in kdetoys-3.4.2/config.h.in
+--- kdetoys-3.4.2.orig/config.h.in	2005-07-20 20:20:53.000000000 +0000
++++ kdetoys-3.4.2/config.h.in	2005-07-31 20:13:13.137412624 +0000
+@@ -277,9 +277,6 @@
+ #endif
+ 
+ 
+-/* define to 1 if -fvisibility is supported */
+-#undef __KDE_HAVE_GCC_VISIBILITY
+-
+ 
+ #if defined(__SVR4) && !defined(__svr4__)
+ #define __svr4__ 1
+diff -Nru kdetoys-3.4.2.orig/configure kdetoys-3.4.2/configure
+--- kdetoys-3.4.2.orig/configure	2005-07-20 20:21:12.000000000 +0000
++++ kdetoys-3.4.2/configure	2005-07-31 20:14:34.966972640 +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 TOPSUBDIRS amor_SUBDIR_included_TRUE amor_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE eyesapplet_SUBDIR_included_TRUE eyesapplet_SUBDIR_included_FALSE fifteenapplet_SUBDIR_included_TRUE fifteenapplet_SUBDIR_included_FALSE kmoon_SUBDIR_included_TRUE kmoon_SUBDIR_included_FALSE kodo_SUBDIR_included_TRUE kodo_SUBDIR_included_FALSE kteatime_SUBDIR_included_TRUE kteatime_SUBDIR_included_FALSE ktux_SUBDIR_included_TRUE ktux_SUBDIR_included_FALSE kweather_SUBDIR_included_TRUE kweather_SUBDIR_included_FALSE kworldwatch_SUBDIR_included_TRUE kworldwatch_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 TOPSUBDIRS amor_SUBDIR_included_TRUE amor_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE eyesapplet_SUBDIR_included_TRUE eyesapplet_SUBDIR_included_FALSE fifteenapplet_SUBDIR_included_TRUE fifteenapplet_SUBDIR_included_FALSE kmoon_SUBDIR_included_TRUE kmoon_SUBDIR_included_FALSE kodo_SUBDIR_included_TRUE kodo_SUBDIR_included_FALSE kteatime_SUBDIR_included_TRUE kteatime_SUBDIR_included_FALSE ktux_SUBDIR_included_TRUE ktux_SUBDIR_included_FALSE kweather_SUBDIR_included_TRUE kweather_SUBDIR_included_FALSE kworldwatch_SUBDIR_included_TRUE kworldwatch_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 TOPSUBDIRS amor_SUBDIR_included_TRUE amor_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE eyesapplet_SUBDIR_included_TRUE eyesapplet_SUBDIR_included_FALSE fifteenapplet_SUBDIR_included_TRUE fifteenapplet_SUBDIR_included_FALSE kmoon_SUBDIR_included_TRUE kmoon_SUBDIR_included_FALSE kodo_SUBDIR_included_TRUE kodo_SUBDIR_included_FALSE kteatime_SUBDIR_included_TRUE kteatime_SUBDIR_included_FALSE ktux_SUBDIR_included_TRUE ktux_SUBDIR_included_FALSE kweather_SUBDIR_included_TRUE kweather_SUBDIR_included_FALSE kworldwatch_SUBDIR_included_TRUE kworldwatch_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 TOPSUBDIRS amor_SUBDIR_included_TRUE amor_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE eyesapplet_SUBDIR_included_TRUE eyesapplet_SUBDIR_included_FALSE fifteenapplet_SUBDIR_included_TRUE fifteenapplet_SUBDIR_included_FALSE kmoon_SUBDIR_included_TRUE kmoon_SUBDIR_included_FALSE kodo_SUBDIR_included_TRUE kodo_SUBDIR_included_FALSE kteatime_SUBDIR_included_TRUE kteatime_SUBDIR_included_FALSE ktux_SUBDIR_included_TRUE ktux_SUBDIR_included_FALSE kweather_SUBDIR_included_TRUE kweather_SUBDIR_included_FALSE kworldwatch_SUBDIR_included_TRUE kworldwatch_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
  ac_subst_files=''
  
  # Initialize some variables set by options.
@@ -6834,7 +7059,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28587,8 +28510,7 @@
+@@ -28590,8 +28513,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6844,7 +7069,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28663,8 +28585,7 @@
+@@ -28666,8 +28588,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6854,7 +7079,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28724,8 +28645,7 @@
+@@ -28727,8 +28648,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6864,7 +7089,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28808,8 +28728,7 @@
+@@ -28811,8 +28731,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6874,7 +7099,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28902,8 +28821,7 @@
+@@ -28905,8 +28824,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6884,7 +7109,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29077,8 +28995,7 @@
+@@ -29080,8 +28998,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6894,7 +7119,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29176,8 +29093,7 @@
+@@ -29179,8 +29096,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6904,7 +7129,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29270,8 +29186,7 @@
+@@ -29273,8 +29189,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6914,7 +7139,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29354,8 +29269,7 @@
+@@ -29357,8 +29272,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6924,25 +7149,25 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29408,7 +29322,7 @@
+@@ -29411,7 +29325,7 @@
  do
    for j in jpeglib.h;
    do
--    echo "configure: 29411: $i/$j" >&5
-+    echo "configure: 29325: $i/$j" >&5
+-    echo "configure: 29414: $i/$j" >&5
++    echo "configure: 29328: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        jpeg_incdir=$i
-@@ -29716,7 +29630,7 @@
+@@ -29714,7 +29628,7 @@
  do
    for j in $kde_qt_header;
    do
--    echo "configure: 29719: $i/$j" >&5
-+    echo "configure: 29633: $i/$j" >&5
+-    echo "configure: 29717: $i/$j" >&5
++    echo "configure: 29631: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        qt_incdir=$i
-@@ -30393,8 +30307,7 @@
+@@ -30391,8 +30305,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6952,93 +7177,334 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30553,7 +30466,7 @@
+@@ -30551,7 +30464,7 @@
  do
    for j in $kde_check_header;
    do
--    echo "configure: 30556: $i/$j" >&5
-+    echo "configure: 30469: $i/$j" >&5
+-    echo "configure: 30554: $i/$j" >&5
++    echo "configure: 30467: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_incdir=$i
-@@ -30583,7 +30496,7 @@
+@@ -30581,7 +30494,7 @@
  do
    for j in $kde_check_lib;
    do
--    echo "configure: 30586: $i/$j" >&5
-+    echo "configure: 30499: $i/$j" >&5
+-    echo "configure: 30584: $i/$j" >&5
++    echo "configure: 30497: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_libdir=$i
-@@ -30601,7 +30514,7 @@
+@@ -30599,7 +30512,7 @@
  do
    for j in "kde3/plugins/designer/kdewidgets.la";
    do
--    echo "configure: 30604: $i/$j" >&5
-+    echo "configure: 30517: $i/$j" >&5
+-    echo "configure: 30602: $i/$j" >&5
++    echo "configure: 30515: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_widgetdir=$i
-@@ -32119,7 +32032,7 @@
+@@ -32117,7 +32030,7 @@
  do
    for j in apps/ksgmltools2/customization/kde-chunk.xsl;
    do
--    echo "configure: 32122: $i/$j" >&5
-+    echo "configure: 32035: $i/$j" >&5
+-    echo "configure: 32120: $i/$j" >&5
++    echo "configure: 32033: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        KDE_XSL_STYLESHEET=$i
-@@ -32315,8 +32228,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+@@ -32273,290 +32186,6 @@
+ 
+   if test "x$GXX" = "xyes"; then
+     kde_have_gcc_visibility=no
+-
+-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'
+-
+-
+-  save_CXXFLAGS="$CXXFLAGS"
+-  CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+- return 0;
+-  ;
+-  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=$?
-@@ -32403,8 +32315,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_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
+-  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=$?
-@@ -32491,8 +32402,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=$?
-@@ -32579,8 +32489,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -32673,8 +32582,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -32758,9 +32666,6 @@
+-  { (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
+ 
+ CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
+@@ -32582,9 +32211,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7048,7 +7514,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -32791,8 +32696,7 @@
+@@ -32615,8 +32241,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7058,7 +7524,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32893,8 +32797,7 @@
+@@ -32717,8 +32342,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7068,7 +7534,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32973,9 +32876,6 @@
+@@ -32797,9 +32421,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7078,7 +7544,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -33006,8 +32906,7 @@
+@@ -32830,8 +32451,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7088,7 +7554,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33108,8 +33007,7 @@
+@@ -32932,8 +32552,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7098,7 +7564,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33188,9 +33086,6 @@
+@@ -33012,9 +32631,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7108,7 +7574,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -33226,8 +33121,7 @@
+@@ -33050,8 +32666,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7118,7 +7584,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33333,8 +33227,7 @@
+@@ -33157,8 +32772,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7128,7 +7594,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33716,6 +33609,13 @@
+@@ -33540,6 +33154,13 @@
  LTLIBOBJS=$ac_ltlibobjs
  
  
@@ -7142,7 +7608,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
-@@ -34430,6 +34330,9 @@
+@@ -34254,6 +33875,9 @@
  s, at AMTAR@,$AMTAR,;t t
  s, at am__tar@,$am__tar,;t t
  s, at am__untar@,$am__untar,;t t
@@ -7152,7 +7618,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
-@@ -34786,11 +34689,6 @@
+@@ -34611,11 +34235,6 @@
    *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
    esac
  
@@ -7164,7 +7630,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.  */
-@@ -34829,6 +34727,12 @@
+@@ -34654,6 +34273,12 @@
  	 fi;;
        esac
      done` || { (exit 1); exit 1; }
@@ -7177,22 +7643,22 @@
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
    sed "$ac_vpsub
-diff -rua kdetoys-3.4.1.orig/configure.in kdetoys-3.4.1/configure.in
---- kdetoys-3.4.1.orig/configure.in	2005-05-23 18:12:13.000000000 +0200
-+++ kdetoys-3.4.1/configure.in	2005-05-25 08:40:11.525094756 +0200
+diff -Nru kdetoys-3.4.2.orig/configure.in kdetoys-3.4.2/configure.in
+--- kdetoys-3.4.2.orig/configure.in	2005-07-20 20:20:38.000000000 +0000
++++ kdetoys-3.4.2/configure.in	2005-07-31 20:12:27.843298376 +0000
 @@ -42,6 +42,8 @@
  dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdetoys, "3.4.1") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdetoys, "3.4.2") dnl searches for some needed programs
  
 +AM_MAINTAINER_MODE
 +
  KDE_SET_PREFIX
  
  dnl generate the config header
-diff -rua kdetoys-3.4.1.orig/doc/amor/Makefile.in kdetoys-3.4.1/doc/amor/Makefile.in
---- kdetoys-3.4.1.orig/doc/amor/Makefile.in	2005-05-23 18:12:44.000000000 +0200
-+++ kdetoys-3.4.1/doc/amor/Makefile.in	2005-05-25 08:40:54.872158636 +0200
-@@ -159,6 +159,9 @@
+diff -Nru kdetoys-3.4.2.orig/doc/amor/Makefile.in kdetoys-3.4.2/doc/amor/Makefile.in
+--- kdetoys-3.4.2.orig/doc/amor/Makefile.in	2005-07-20 20:21:10.000000000 +0000
++++ kdetoys-3.4.2/doc/amor/Makefile.in	2005-07-31 20:14:25.561402504 +0000
+@@ -160,6 +160,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -7202,7 +7668,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -313,7 +316,7 @@
+@@ -314,7 +317,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -7211,7 +7677,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -351,9 +354,9 @@
+@@ -352,9 +355,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -7223,10 +7689,47 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdetoys-3.4.1.orig/doc/kmoon/Makefile.in kdetoys-3.4.1/doc/kmoon/Makefile.in
---- kdetoys-3.4.1.orig/doc/kmoon/Makefile.in	2005-05-23 18:12:44.000000000 +0200
-+++ kdetoys-3.4.1/doc/kmoon/Makefile.in	2005-05-25 08:40:54.882157728 +0200
-@@ -159,6 +159,9 @@
+@@ -499,10 +502,10 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=billy.png tao.png bonhomme.png spot.png index.docbook pingus.png neko.png tux.png index.cache.bz2 man-amor.6.docbook ghost.png Makefile.in eyes.png bsd.png worm.png Makefile.am 
++KDE_DIST=billy.png tao.png bonhomme.png index.docbook spot.png pingus.png neko.png tux.png index.cache.bz2 man-amor.6.docbook ghost.png Makefile.in eyes.png bsd.png worm.png Makefile.am 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) bonhomme.png neko.png tux.png tao.png index.docbook ghost.png worm.png eyes.png pingus.png spot.png bsd.png man-amor.6.docbook billy.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) eyes.png man-amor.6.docbook spot.png tao.png neko.png worm.png tux.png ghost.png pingus.png bonhomme.png billy.png index.docbook bsd.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
+@@ -529,20 +532,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amor
+-	@for base in bonhomme.png neko.png tux.png tao.png index.docbook ghost.png worm.png eyes.png pingus.png spot.png bsd.png man-amor.6.docbook billy.png ; do \
++	@for base in eyes.png man-amor.6.docbook spot.png tao.png neko.png worm.png tux.png ghost.png pingus.png bonhomme.png billy.png index.docbook bsd.png ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amor/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amor/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in bonhomme.png neko.png tux.png tao.png index.docbook ghost.png worm.png eyes.png pingus.png spot.png bsd.png man-amor.6.docbook billy.png ; do \
++	for base in eyes.png man-amor.6.docbook spot.png tao.png neko.png worm.png tux.png ghost.png pingus.png bonhomme.png billy.png index.docbook bsd.png ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amor/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in bonhomme.png neko.png tux.png tao.png index.docbook ghost.png worm.png eyes.png pingus.png spot.png bsd.png man-amor.6.docbook billy.png ; do \
++	for file in eyes.png man-amor.6.docbook spot.png tao.png neko.png worm.png tux.png ghost.png pingus.png bonhomme.png billy.png index.docbook bsd.png ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+diff -Nru kdetoys-3.4.2.orig/doc/kmoon/Makefile.in kdetoys-3.4.2/doc/kmoon/Makefile.in
+--- kdetoys-3.4.2.orig/doc/kmoon/Makefile.in	2005-07-20 20:21:10.000000000 +0000
++++ kdetoys-3.4.2/doc/kmoon/Makefile.in	2005-07-31 20:14:25.574400528 +0000
+@@ -160,6 +160,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -7236,7 +7739,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -312,7 +315,7 @@
+@@ -313,7 +316,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -7245,7 +7748,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -350,9 +353,9 @@
+@@ -351,9 +354,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -7257,10 +7760,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdetoys-3.4.1.orig/doc/kodo/Makefile.in kdetoys-3.4.1/doc/kodo/Makefile.in
---- kdetoys-3.4.1.orig/doc/kodo/Makefile.in	2005-05-23 18:12:44.000000000 +0200
-+++ kdetoys-3.4.1/doc/kodo/Makefile.in	2005-05-25 08:40:54.893156729 +0200
-@@ -159,6 +159,9 @@
+diff -Nru kdetoys-3.4.2.orig/doc/kodo/Makefile.in kdetoys-3.4.2/doc/kodo/Makefile.in
+--- kdetoys-3.4.2.orig/doc/kodo/Makefile.in	2005-07-20 20:21:10.000000000 +0000
++++ kdetoys-3.4.2/doc/kodo/Makefile.in	2005-07-31 20:14:25.587398552 +0000
+@@ -160,6 +160,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -7270,7 +7773,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -312,7 +315,7 @@
+@@ -313,7 +316,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -7279,7 +7782,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -350,9 +353,9 @@
+@@ -351,9 +354,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -7291,10 +7794,43 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdetoys-3.4.1.orig/doc/kteatime/Makefile.in kdetoys-3.4.1/doc/kteatime/Makefile.in
---- kdetoys-3.4.1.orig/doc/kteatime/Makefile.in	2005-05-23 18:12:44.000000000 +0200
-+++ kdetoys-3.4.1/doc/kteatime/Makefile.in	2005-05-25 08:40:54.902155912 +0200
-@@ -159,6 +159,9 @@
+@@ -501,7 +504,7 @@
+ KDE_DIST=index.docbook guide.png index.cache.bz2 Makefile.in Makefile.am 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook guide.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) guide.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
+@@ -528,20 +531,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kodo
+-	@for base in index.docbook guide.png ; do \
++	@for base in guide.png index.docbook ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kodo/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kodo/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in index.docbook guide.png ; do \
++	for base in guide.png index.docbook ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kodo/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in index.docbook guide.png ; do \
++	for file in guide.png index.docbook ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+diff -Nru kdetoys-3.4.2.orig/doc/kteatime/Makefile.in kdetoys-3.4.2/doc/kteatime/Makefile.in
+--- kdetoys-3.4.2.orig/doc/kteatime/Makefile.in	2005-07-20 20:21:10.000000000 +0000
++++ kdetoys-3.4.2/doc/kteatime/Makefile.in	2005-07-31 20:14:25.600396576 +0000
+@@ -160,6 +160,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -7304,7 +7840,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -312,7 +315,7 @@
+@@ -313,7 +316,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -7313,7 +7849,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -350,9 +353,9 @@
+@@ -351,9 +354,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -7325,10 +7861,43 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdetoys-3.4.1.orig/doc/kweather/Makefile.in kdetoys-3.4.1/doc/kweather/Makefile.in
---- kdetoys-3.4.1.orig/doc/kweather/Makefile.in	2005-05-23 18:12:44.000000000 +0200
-+++ kdetoys-3.4.1/doc/kweather/Makefile.in	2005-05-25 08:40:54.912155004 +0200
-@@ -159,6 +159,9 @@
+@@ -501,7 +504,7 @@
+ KDE_DIST=index.docbook index.cache.bz2 Makefile.in config.png Makefile.am 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook config.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) config.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
+@@ -528,20 +531,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kteatime
+-	@for base in index.docbook config.png ; do \
++	@for base in config.png index.docbook ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kteatime/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kteatime/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in index.docbook config.png ; do \
++	for base in config.png index.docbook ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kteatime/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in index.docbook config.png ; do \
++	for file in config.png index.docbook ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+diff -Nru kdetoys-3.4.2.orig/doc/kweather/Makefile.in kdetoys-3.4.2/doc/kweather/Makefile.in
+--- kdetoys-3.4.2.orig/doc/kweather/Makefile.in	2005-07-20 20:21:10.000000000 +0000
++++ kdetoys-3.4.2/doc/kweather/Makefile.in	2005-07-31 20:14:25.613394600 +0000
+@@ -160,6 +160,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -7338,7 +7907,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -312,7 +315,7 @@
+@@ -313,7 +316,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -7347,7 +7916,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -350,9 +353,9 @@
+@@ -351,9 +354,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -7359,10 +7928,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdetoys-3.4.1.orig/doc/kworldclock/Makefile.in kdetoys-3.4.1/doc/kworldclock/Makefile.in
---- kdetoys-3.4.1.orig/doc/kworldclock/Makefile.in	2005-05-23 18:12:44.000000000 +0200
-+++ kdetoys-3.4.1/doc/kworldclock/Makefile.in	2005-05-25 08:40:54.923154005 +0200
-@@ -159,6 +159,9 @@
+diff -Nru kdetoys-3.4.2.orig/doc/kworldclock/Makefile.in kdetoys-3.4.2/doc/kworldclock/Makefile.in
+--- kdetoys-3.4.2.orig/doc/kworldclock/Makefile.in	2005-07-20 20:21:10.000000000 +0000
++++ kdetoys-3.4.2/doc/kworldclock/Makefile.in	2005-07-31 20:14:25.635391256 +0000
+@@ -160,6 +160,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -7372,7 +7941,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -313,7 +316,7 @@
+@@ -314,7 +317,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -7381,7 +7950,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -351,9 +354,9 @@
+@@ -352,9 +355,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -7393,10 +7962,47 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdetoys-3.4.1.orig/doc/Makefile.in kdetoys-3.4.1/doc/Makefile.in
---- kdetoys-3.4.1.orig/doc/Makefile.in	2005-05-23 18:12:44.000000000 +0200
-+++ kdetoys-3.4.1/doc/Makefile.in	2005-05-25 08:40:54.861159635 +0200
-@@ -175,6 +175,9 @@
+@@ -499,10 +502,10 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=man-kworldclock.1.docbook screenshot-rmb-clock.png screenshot-rmb-daylight.png index.docbook screenshot-clock-dialog.png screenshot-quairading-clock.png screenshot-rmb-flags.png screenshot-withflags.png index.cache.bz2 screenshot-mlb.png screenshot.png screenshot-withclocks.png Makefile.in screenshot-quairading-dialog.png screenshot-rmb-cities.png Makefile.am 
++KDE_DIST=man-kworldclock.1.docbook screenshot-rmb-clock.png screenshot-rmb-daylight.png index.docbook screenshot-clock-dialog.png screenshot-quairading-clock.png screenshot-rmb-flags.png screenshot-withflags.png screenshot-mlb.png index.cache.bz2 screenshot.png screenshot-withclocks.png Makefile.in screenshot-quairading-dialog.png screenshot-rmb-cities.png Makefile.am 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) screenshot-quairading-dialog.png screenshot.png screenshot-rmb-daylight.png man-kworldclock.1.docbook index.docbook screenshot-clock-dialog.png screenshot-withflags.png screenshot-rmb-clock.png screenshot-mlb.png screenshot-rmb-flags.png screenshot-withclocks.png screenshot-quairading-clock.png screenshot-rmb-cities.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) screenshot-quairading-clock.png man-kworldclock.1.docbook screenshot-withflags.png screenshot-quairading-dialog.png screenshot-withclocks.png screenshot-rmb-cities.png screenshot-rmb-flags.png screenshot.png screenshot-rmb-clock.png screenshot-mlb.png screenshot-clock-dialog.png index.docbook screenshot-rmb-daylight.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
+@@ -529,20 +532,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kworldclock
+-	@for base in screenshot-quairading-dialog.png screenshot.png screenshot-rmb-daylight.png man-kworldclock.1.docbook index.docbook screenshot-clock-dialog.png screenshot-withflags.png screenshot-rmb-clock.png screenshot-mlb.png screenshot-rmb-flags.png screenshot-withclocks.png screenshot-quairading-clock.png screenshot-rmb-cities.png ; do \
++	@for base in screenshot-quairading-clock.png man-kworldclock.1.docbook screenshot-withflags.png screenshot-quairading-dialog.png screenshot-withclocks.png screenshot-rmb-cities.png screenshot-rmb-flags.png screenshot.png screenshot-rmb-clock.png screenshot-mlb.png screenshot-clock-dialog.png index.docbook screenshot-rmb-daylight.png ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kworldclock/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kworldclock/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in screenshot-quairading-dialog.png screenshot.png screenshot-rmb-daylight.png man-kworldclock.1.docbook index.docbook screenshot-clock-dialog.png screenshot-withflags.png screenshot-rmb-clock.png screenshot-mlb.png screenshot-rmb-flags.png screenshot-withclocks.png screenshot-quairading-clock.png screenshot-rmb-cities.png ; do \
++	for base in screenshot-quairading-clock.png man-kworldclock.1.docbook screenshot-withflags.png screenshot-quairading-dialog.png screenshot-withclocks.png screenshot-rmb-cities.png screenshot-rmb-flags.png screenshot.png screenshot-rmb-clock.png screenshot-mlb.png screenshot-clock-dialog.png index.docbook screenshot-rmb-daylight.png ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kworldclock/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in screenshot-quairading-dialog.png screenshot.png screenshot-rmb-daylight.png man-kworldclock.1.docbook index.docbook screenshot-clock-dialog.png screenshot-withflags.png screenshot-rmb-clock.png screenshot-mlb.png screenshot-rmb-flags.png screenshot-withclocks.png screenshot-quairading-clock.png screenshot-rmb-cities.png ; do \
++	for file in screenshot-quairading-clock.png man-kworldclock.1.docbook screenshot-withflags.png screenshot-quairading-dialog.png screenshot-withclocks.png screenshot-rmb-cities.png screenshot-rmb-flags.png screenshot.png screenshot-rmb-clock.png screenshot-mlb.png screenshot-clock-dialog.png index.docbook screenshot-rmb-daylight.png ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+diff -Nru kdetoys-3.4.2.orig/doc/Makefile.in kdetoys-3.4.2/doc/Makefile.in
+--- kdetoys-3.4.2.orig/doc/Makefile.in	2005-07-20 20:21:10.000000000 +0000
++++ kdetoys-3.4.2/doc/Makefile.in	2005-07-31 20:14:25.546404784 +0000
+@@ -176,6 +176,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -7406,7 +8012,14 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -331,7 +334,7 @@
+@@ -326,13 +329,13 @@
+ KDE_DOCS = AUTO
+ #>- SUBDIRS = $(AUTODIRS)
+ #>+ 1
+-SUBDIRS =. kmoon kteatime kweather kodo amor kworldclock
++SUBDIRS =. amor kodo kmoon kweather kworldclock kteatime
+ #>- all: all-recursive
+ #>+ 1
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -7415,7 +8028,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -369,9 +372,9 @@
+@@ -370,9 +373,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -7427,10 +8040,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdetoys-3.4.1.orig/eyesapplet/Makefile.in kdetoys-3.4.1/eyesapplet/Makefile.in
---- kdetoys-3.4.1.orig/eyesapplet/Makefile.in	2005-05-23 18:12:44.000000000 +0200
-+++ kdetoys-3.4.1/eyesapplet/Makefile.in	2005-05-25 08:40:54.939152553 +0200
-@@ -206,6 +206,9 @@
+diff -Nru kdetoys-3.4.2.orig/eyesapplet/Makefile.in kdetoys-3.4.2/eyesapplet/Makefile.in
+--- kdetoys-3.4.2.orig/eyesapplet/Makefile.in	2005-07-20 20:21:10.000000000 +0000
++++ kdetoys-3.4.2/eyesapplet/Makefile.in	2005-07-31 20:14:25.663387000 +0000
+@@ -207,6 +207,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -7440,7 +8053,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -368,7 +371,7 @@
+@@ -369,7 +372,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -7449,7 +8062,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -406,9 +409,9 @@
+@@ -407,9 +410,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -7461,10 +8074,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdetoys-3.4.1.orig/fifteenapplet/Makefile.in kdetoys-3.4.1/fifteenapplet/Makefile.in
---- kdetoys-3.4.1.orig/fifteenapplet/Makefile.in	2005-05-23 18:12:44.000000000 +0200
-+++ kdetoys-3.4.1/fifteenapplet/Makefile.in	2005-05-25 08:40:54.955151100 +0200
-@@ -209,6 +209,9 @@
+diff -Nru kdetoys-3.4.2.orig/fifteenapplet/Makefile.in kdetoys-3.4.2/fifteenapplet/Makefile.in
+--- kdetoys-3.4.2.orig/fifteenapplet/Makefile.in	2005-07-20 20:21:10.000000000 +0000
++++ kdetoys-3.4.2/fifteenapplet/Makefile.in	2005-07-31 20:14:25.692382592 +0000
+@@ -210,6 +210,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -7474,7 +8087,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -371,7 +374,7 @@
+@@ -372,7 +375,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -7483,7 +8096,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -409,9 +412,9 @@
+@@ -410,9 +413,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -7495,10 +8108,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdetoys-3.4.1.orig/kmoon/Makefile.in kdetoys-3.4.1/kmoon/Makefile.in
---- kdetoys-3.4.1.orig/kmoon/Makefile.in	2005-05-23 18:12:44.000000000 +0200
-+++ kdetoys-3.4.1/kmoon/Makefile.in	2005-05-25 08:40:54.978149012 +0200
-@@ -222,6 +222,9 @@
+diff -Nru kdetoys-3.4.2.orig/kmoon/Makefile.in kdetoys-3.4.2/kmoon/Makefile.in
+--- kdetoys-3.4.2.orig/kmoon/Makefile.in	2005-07-20 20:21:10.000000000 +0000
++++ kdetoys-3.4.2/kmoon/Makefile.in	2005-07-31 20:14:25.724377728 +0000
+@@ -223,6 +223,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -7508,7 +8121,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -384,7 +387,7 @@
+@@ -385,7 +388,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -7517,7 +8130,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -422,9 +425,9 @@
+@@ -423,9 +426,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -7529,10 +8142,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdetoys-3.4.1.orig/kmoon/pics/Makefile.in kdetoys-3.4.1/kmoon/pics/Makefile.in
---- kdetoys-3.4.1.orig/kmoon/pics/Makefile.in	2005-05-23 18:12:44.000000000 +0200
-+++ kdetoys-3.4.1/kmoon/pics/Makefile.in	2005-05-25 08:40:54.989148013 +0200
-@@ -169,6 +169,9 @@
+diff -Nru kdetoys-3.4.2.orig/kmoon/pics/Makefile.in kdetoys-3.4.2/kmoon/pics/Makefile.in
+--- kdetoys-3.4.2.orig/kmoon/pics/Makefile.in	2005-07-20 20:21:10.000000000 +0000
++++ kdetoys-3.4.2/kmoon/pics/Makefile.in	2005-07-31 20:14:25.738375600 +0000
+@@ -170,6 +170,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -7542,7 +8155,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -330,7 +333,7 @@
+@@ -331,7 +334,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -7551,7 +8164,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -368,9 +371,9 @@
+@@ -369,9 +372,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -7563,10 +8176,19 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdetoys-3.4.1.orig/kodo/Makefile.in kdetoys-3.4.1/kodo/Makefile.in
---- kdetoys-3.4.1.orig/kodo/Makefile.in	2005-05-23 18:12:44.000000000 +0200
-+++ kdetoys-3.4.1/kodo/Makefile.in	2005-05-25 08:40:55.010146107 +0200
-@@ -211,6 +211,9 @@
+@@ -530,7 +533,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=moon3.png moon4.png moon24.png moon13.png moon5.png moon25.png moon7.png moon28.png moon29.png moon19.png moon2.png moon9.png moon1.png moon26.png moon17.png moon16.png moon14.png moon23.png moon11.png moon12.png moon18.png moon6.png Makefile.in moon22.png moon15.png moon8.png moon10.png moon21.png moon27.png moon20.png Makefile.am 
++KDE_DIST=moon3.png moon4.png moon24.png moon13.png moon5.png moon25.png moon7.png moon28.png moon29.png moon19.png moon2.png moon9.png moon26.png moon1.png moon17.png moon16.png moon14.png moon23.png moon11.png moon12.png moon18.png moon6.png Makefile.in moon22.png moon15.png moon8.png moon10.png moon21.png moon27.png moon20.png Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+diff -Nru kdetoys-3.4.2.orig/kodo/Makefile.in kdetoys-3.4.2/kodo/Makefile.in
+--- kdetoys-3.4.2.orig/kodo/Makefile.in	2005-07-20 20:21:10.000000000 +0000
++++ kdetoys-3.4.2/kodo/Makefile.in	2005-07-31 20:14:25.912349152 +0000
+@@ -212,6 +212,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -7576,7 +8198,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -376,7 +379,7 @@
+@@ -377,7 +380,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -7585,7 +8207,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -414,9 +417,9 @@
+@@ -415,9 +418,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -7597,10 +8219,42 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -rua kdetoys-3.4.1.orig/kteatime/Makefile.in kdetoys-3.4.1/kteatime/Makefile.in
---- kdetoys-3.4.1.orig/kteatime/Makefile.in	2005-05-23 18:12:44.000000000 +0200
-+++ kdetoys-3.4.1/kteatime/Makefile.in	2005-05-25 08:40:55.029144382 +0200
-@@ -209,6 +209,9 @@
+@@ -731,24 +734,24 @@
+ 	-rm -f  kimagenumber.moc kodometer.moc
+ 
+ #>+ 2
+-KDE_DIST=kimagenumber.h cr32-app-kodo.png numbers.png cr48-app-kodo.png configure.in.in cr16-app-kodo.png Makefile.in kodometer.h Makefile.am kodo.desktop 
++KDE_DIST=kimagenumber.h cr32-app-kodo.png numbers.png cr48-app-kodo.png configure.in.in cr16-app-kodo.png kodometer.h Makefile.in Makefile.am kodo.desktop 
+ 
+ #>+ 2
+ docs-am:
+ 
+ #>+ 13
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kodo.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kodo.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kodo.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kodo.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-kodo.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kodo.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kodo.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kodo.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kodo.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kodo.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kodo.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kodo.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kodo.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kodo.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kodo.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nru kdetoys-3.4.2.orig/kteatime/Makefile.in kdetoys-3.4.2/kteatime/Makefile.in
+--- kdetoys-3.4.2.orig/kteatime/Makefile.in	2005-07-20 20:21:10.000000000 +0000
++++ kdetoys-3.4.2/kteatime/Makefile.in	2005-07-31 20:14:25.940344896 +0000
+@@ -210,6 +210,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -7610,7 +8264,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -375,7 +378,7 @@
+@@ -376,7 +379,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -7619,7 +8273,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -413,9 +416,9 @@
+@@ -414,9 +417,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -7631,10 +8285,55 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -rua kdetoys-3.4.1.orig/ktux/Makefile.in kdetoys-3.4.1/ktux/Makefile.in
---- kdetoys-3.4.1.orig/ktux/Makefile.in	2005-05-23 18:12:44.000000000 +0200
-+++ kdetoys-3.4.1/ktux/Makefile.in	2005-05-25 08:40:55.049142566 +0200
-@@ -226,6 +226,9 @@
+@@ -731,7 +734,7 @@
+ 	-rm -f  timeedit.moc toplevel.moc
+ 
+ #>+ 2
+-KDE_DIST=cr22-action-tea_not_ready.png eventsrc toplevel.h cr22-action-mug.png cr22-action-tea_anim1.png cr48-app-kteatime.png cr32-app-kteatime.png cr16-app-kteatime.png cr22-action-tea_anim2.png tealist.h Makefile.in kteatime.desktop timeedit.h Makefile.am 
++KDE_DIST=cr22-action-tea_not_ready.png toplevel.h eventsrc cr22-action-mug.png cr22-action-tea_anim1.png cr48-app-kteatime.png cr32-app-kteatime.png cr16-app-kteatime.png cr22-action-tea_anim2.png tealist.h Makefile.in kteatime.desktop timeedit.h Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+@@ -744,29 +747,29 @@
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-kteatime.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kteatime.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-kteatime.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kteatime.png
+-	$(mkinstalldirs) $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-tea_not_ready.png $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions/tea_not_ready.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kteatimeicondir)/crystalsvg/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-kteatime.png $(DESTDIR)$(kteatimeicondir)/crystalsvg/48x48/apps/kteatime.png
++	$(mkinstalldirs) $(DESTDIR)$(kteatimeicondir)/crystalsvg/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kteatime.png $(DESTDIR)$(kteatimeicondir)/crystalsvg/32x32/apps/kteatime.png
++	$(mkinstalldirs) $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-mug.png $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions/mug.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-tea_anim1.png $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions/tea_anim1.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-tea_anim2.png $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions/tea_anim2.png
+-	$(mkinstalldirs) $(DESTDIR)$(kteatimeicondir)/crystalsvg/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kteatime.png $(DESTDIR)$(kteatimeicondir)/crystalsvg/32x32/apps/kteatime.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kteatimeicondir)/crystalsvg/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-kteatime.png $(DESTDIR)$(kteatimeicondir)/crystalsvg/16x16/apps/kteatime.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-tea_not_ready.png $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions/tea_not_ready.png
+ 
+ uninstall-kde-icons:
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kteatime.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kteatime.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kteatime.png
+-	-rm -f $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions/tea_not_ready.png
+ 	-rm -f $(DESTDIR)$(kteatimeicondir)/crystalsvg/48x48/apps/kteatime.png
++	-rm -f $(DESTDIR)$(kteatimeicondir)/crystalsvg/32x32/apps/kteatime.png
+ 	-rm -f $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions/mug.png
+ 	-rm -f $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions/tea_anim1.png
+ 	-rm -f $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions/tea_anim2.png
+-	-rm -f $(DESTDIR)$(kteatimeicondir)/crystalsvg/32x32/apps/kteatime.png
+ 	-rm -f $(DESTDIR)$(kteatimeicondir)/crystalsvg/16x16/apps/kteatime.png
++	-rm -f $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions/tea_not_ready.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nru kdetoys-3.4.2.orig/ktux/Makefile.in kdetoys-3.4.2/ktux/Makefile.in
+--- kdetoys-3.4.2.orig/ktux/Makefile.in	2005-07-20 20:21:10.000000000 +0000
++++ kdetoys-3.4.2/ktux/Makefile.in	2005-07-31 20:14:25.968340640 +0000
+@@ -227,6 +227,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -7644,7 +8343,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -403,7 +406,7 @@
+@@ -404,7 +407,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -7653,7 +8352,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -441,9 +444,9 @@
+@@ -442,9 +445,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -7665,10 +8364,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -rua kdetoys-3.4.1.orig/ktux/sprites/Makefile.in kdetoys-3.4.1/ktux/sprites/Makefile.in
---- kdetoys-3.4.1.orig/ktux/sprites/Makefile.in	2005-05-23 18:12:44.000000000 +0200
-+++ kdetoys-3.4.1/ktux/sprites/Makefile.in	2005-05-25 08:40:55.058141749 +0200
-@@ -169,6 +169,9 @@
+diff -Nru kdetoys-3.4.2.orig/ktux/sprites/Makefile.in kdetoys-3.4.2/ktux/sprites/Makefile.in
+--- kdetoys-3.4.2.orig/ktux/sprites/Makefile.in	2005-07-20 20:21:10.000000000 +0000
++++ kdetoys-3.4.2/ktux/sprites/Makefile.in	2005-07-31 20:14:25.982338512 +0000
+@@ -170,6 +170,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -7678,7 +8377,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -330,7 +333,7 @@
+@@ -331,7 +334,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -7687,7 +8386,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -368,9 +371,9 @@
+@@ -369,9 +372,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -7699,10 +8398,19 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdetoys-3.4.1.orig/kweather/graphics/Makefile.in kdetoys-3.4.1/kweather/graphics/Makefile.in
---- kdetoys-3.4.1.orig/kweather/graphics/Makefile.in	2005-05-23 18:12:44.000000000 +0200
-+++ kdetoys-3.4.1/kweather/graphics/Makefile.in	2005-05-25 08:40:55.221126950 +0200
-@@ -169,6 +169,9 @@
+@@ -530,7 +533,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=anim0003.png anim0002.png anim0007.png anim0004.png flare0002.png anim0010.png star0002.png bg.png spriterc anim0001.png anim0008.png flare0001.png anim0006.png Makefile.in star0001.png anim0009.png anim0005.png Makefile.am 
++KDE_DIST=anim0003.png anim0002.png anim0007.png anim0004.png flare0002.png anim0010.png star0002.png bg.png spriterc anim0001.png anim0008.png flare0001.png anim0006.png Makefile.in anim0009.png star0001.png anim0005.png Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+diff -Nru kdetoys-3.4.2.orig/kweather/graphics/Makefile.in kdetoys-3.4.2/kweather/graphics/Makefile.in
+--- kdetoys-3.4.2.orig/kweather/graphics/Makefile.in	2005-07-20 20:21:10.000000000 +0000
++++ kdetoys-3.4.2/kweather/graphics/Makefile.in	2005-07-31 20:14:26.112318752 +0000
+@@ -170,6 +170,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -7712,7 +8420,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -322,7 +325,7 @@
+@@ -323,7 +326,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -7721,7 +8429,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -360,9 +363,9 @@
+@@ -361,9 +364,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -7733,10 +8441,19 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdetoys-3.4.1.orig/kweather/Makefile.in kdetoys-3.4.1/kweather/Makefile.in
---- kdetoys-3.4.1.orig/kweather/Makefile.in	2005-05-23 18:12:44.000000000 +0200
-+++ kdetoys-3.4.1/kweather/Makefile.in	2005-05-25 08:40:55.210127949 +0200
-@@ -326,6 +326,9 @@
+@@ -522,7 +525,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=light_rain.png snow4.png sleet.png snow3_night.png sunny.png tstorm1_night.png shower1_night.png shower2_night.png snow3.png snow2_night.png shower1.png cloudy4_night.png cloudy3.png tstorm1.png mist_night.png cloudy5.png shower2.png overcast.png snow1_night.png snow5.png mist.png tstorm2_night.png hail.png tstorm3.png fog.png cloudy2_night.png cloudy1_night.png cloudy1.png snow1.png Makefile.in tstorm2.png cloudy4.png fog_night.png snow2.png shower3.png cloudy2.png cloudy3_night.png sunny_night.png Makefile.am dunno.png 
++KDE_DIST=light_rain.png snow4.png sleet.png snow3_night.png sunny.png tstorm1_night.png shower1_night.png shower2_night.png snow3.png snow2_night.png shower1.png cloudy4_night.png cloudy3.png mist_night.png tstorm1.png cloudy5.png shower2.png overcast.png snow1_night.png snow5.png mist.png tstorm2_night.png hail.png fog.png tstorm3.png cloudy2_night.png cloudy1_night.png cloudy1.png snow1.png Makefile.in tstorm2.png cloudy4.png fog_night.png snow2.png shower3.png cloudy2.png cloudy3_night.png sunny_night.png Makefile.am dunno.png 
+ 
+ #>+ 2
+ docs-am:
+diff -Nru kdetoys-3.4.2.orig/kweather/Makefile.in kdetoys-3.4.2/kweather/Makefile.in
+--- kdetoys-3.4.2.orig/kweather/Makefile.in	2005-07-20 20:21:10.000000000 +0000
++++ kdetoys-3.4.2/kweather/Makefile.in	2005-07-31 20:14:26.098320880 +0000
+@@ -327,6 +327,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -7746,7 +8463,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -568,7 +571,7 @@
+@@ -569,7 +572,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -7755,7 +8472,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
  
@@ -7767,10 +8484,109 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdetoys-3.4.1.orig/kworldwatch/Makefile.in kdetoys-3.4.1/kworldwatch/Makefile.in
---- kdetoys-3.4.1.orig/kworldwatch/Makefile.in	2005-05-23 18:12:44.000000000 +0200
-+++ kdetoys-3.4.1/kworldwatch/Makefile.in	2005-05-25 08:40:55.251124226 +0200
-@@ -254,6 +254,9 @@
+@@ -1272,13 +1275,6 @@
+ mocs: kcmweather.moc
+ 
+ #>+ 3
+-weatherservice.moc: $(srcdir)/weatherservice.h
+-	$(MOC) $(srcdir)/weatherservice.h -o weatherservice.moc
+-
+-#>+ 2
+-mocs: weatherservice.moc
+-
+-#>+ 3
+ weatherlib.moc: $(srcdir)/weatherlib.h
+ 	$(MOC) $(srcdir)/weatherlib.h -o weatherlib.moc
+ 
+@@ -1286,11 +1282,11 @@
+ mocs: weatherlib.moc
+ 
+ #>+ 3
+-kweather.moc: $(srcdir)/kweather.h
+-	$(MOC) $(srcdir)/kweather.h -o kweather.moc
++weatherservice.moc: $(srcdir)/weatherservice.h
++	$(MOC) $(srcdir)/weatherservice.h -o weatherservice.moc
+ 
+ #>+ 2
+-mocs: kweather.moc
++mocs: weatherservice.moc
+ 
+ #>+ 3
+ kcmweatherservice.moc: $(srcdir)/kcmweatherservice.h
+@@ -1300,18 +1296,18 @@
+ mocs: kcmweatherservice.moc
+ 
+ #>+ 3
+-dockwidget.moc: $(srcdir)/dockwidget.h
+-	$(MOC) $(srcdir)/dockwidget.h -o dockwidget.moc
++kweather.moc: $(srcdir)/kweather.h
++	$(MOC) $(srcdir)/kweather.h -o kweather.moc
+ 
+ #>+ 2
+-mocs: dockwidget.moc
++mocs: kweather.moc
+ 
+ #>+ 3
+-weatherbutton.moc: $(srcdir)/weatherbutton.h
+-	$(MOC) $(srcdir)/weatherbutton.h -o weatherbutton.moc
++dockwidget.moc: $(srcdir)/dockwidget.h
++	$(MOC) $(srcdir)/dockwidget.h -o dockwidget.moc
+ 
+ #>+ 2
+-mocs: weatherbutton.moc
++mocs: dockwidget.moc
+ 
+ #>+ 3
+ reportview.moc: $(srcdir)/reportview.h
+@@ -1321,6 +1317,13 @@
+ mocs: reportview.moc
+ 
+ #>+ 3
++weatherbutton.moc: $(srcdir)/weatherbutton.h
++	$(MOC) $(srcdir)/weatherbutton.h -o weatherbutton.moc
++
++#>+ 2
++mocs: weatherbutton.moc
++
++#>+ 3
+ sidebarwidget.moc: $(srcdir)/sidebarwidget.h
+ 	$(MOC) $(srcdir)/sidebarwidget.h -o sidebarwidget.moc
+ 
+@@ -1366,10 +1369,10 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  weatherbar.moc serviceconfigwidget.moc kcmweather.moc weatherservice.moc weatherlib.moc kweather.moc kcmweatherservice.moc dockwidget.moc weatherbutton.moc reportview.moc sidebarwidget.moc
++	-rm -f  weatherbar.moc serviceconfigwidget.moc kcmweather.moc weatherlib.moc weatherservice.moc kcmweatherservice.moc kweather.moc dockwidget.moc reportview.moc weatherbutton.moc sidebarwidget.moc
+ 
+ #>+ 2
+-KDE_DIST=kcmweatherservice.h weatherlog.sh reportview.h weatherbar_add.desktop kweatherservice.desktop cr32-app-kweather.png kcmweatherservice.desktop weatherIface.h kcmweather.desktop serviceconfigwidget.h weather_stations.desktop serviceconfigdata.ui weatherbar.h sidebarwidget.h cr48-app-kweather.png dockwidget.h kweather.h sun.h test.sh kweatherreport.desktop prefdialogdata.ui kweather.desktop weatherbar.desktop configure.in.in weatherbutton.h stationdatabase.h Makefile.in cr16-app-kweather.png kweather.kdevprj metar_parser.h kcmweather.h weatherservice.h stations.dat Makefile.am weathersig.sh weatherlib.h 
++KDE_DIST=kcmweatherservice.h weatherlog.sh reportview.h weatherbar_add.desktop kweatherservice.desktop cr32-app-kweather.png kcmweatherservice.desktop weatherIface.h kcmweather.desktop serviceconfigwidget.h serviceconfigdata.ui weather_stations.desktop weatherbar.h sidebarwidget.h cr48-app-kweather.png kweather.h dockwidget.h sun.h test.sh kweatherreport.desktop prefdialogdata.ui kweather.desktop weatherbar.desktop configure.in.in weatherbutton.h stationdatabase.h Makefile.in cr16-app-kweather.png kweather.kdevprj metar_parser.h kcmweather.h weatherservice.h stations.dat Makefile.am weathersig.sh weatherlib.h 
+ 
+ #>+ 10
+ clean-idl:
+@@ -1484,7 +1487,7 @@
+ 	rm -f kcm_weatherservice_la.all_cpp.final kcm_weatherservice_la.all_cpp.files
+ 
+ #>+ 11
+-weather_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/reportview.cpp $(srcdir)/kweather.cpp $(srcdir)/dockwidget.cpp $(srcdir)/weatherbutton.cpp weatherIface_skel.cpp weatherservice_stub.cpp  kweather.moc dockwidget.moc weatherbutton.moc reportview.moc
++weather_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/reportview.cpp $(srcdir)/kweather.cpp $(srcdir)/dockwidget.cpp $(srcdir)/weatherbutton.cpp weatherIface_skel.cpp weatherservice_stub.cpp  kweather.moc dockwidget.moc reportview.moc weatherbutton.moc
+ 	@echo 'creating weather_panelapplet_la.all_cpp.cpp ...'; \
+ 	rm -f weather_panelapplet_la.all_cpp.files weather_panelapplet_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> weather_panelapplet_la.all_cpp.final; \
+@@ -1496,7 +1499,7 @@
+ 	rm -f weather_panelapplet_la.all_cpp.final weather_panelapplet_la.all_cpp.files
+ 
+ #>+ 11
+-kweatherservice.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/metar_parser.cpp $(srcdir)/weatherlib.cpp $(srcdir)/weatherservice.cpp $(srcdir)/stationdatabase.cpp $(srcdir)/sun.cpp weatherservice_skel.cpp weatherservice_stub.cpp  weatherlib.moc weatherservice.moc
++kweatherservice.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/metar_parser.cpp $(srcdir)/weatherlib.cpp $(srcdir)/weatherservice.cpp $(srcdir)/stationdatabase.cpp $(srcdir)/sun.cpp weatherservice_skel.cpp weatherservice_stub.cpp  weatherservice.moc weatherlib.moc
+ 	@echo 'creating kweatherservice.all_cpp.cpp ...'; \
+ 	rm -f kweatherservice.all_cpp.files kweatherservice.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kweatherservice.all_cpp.final; \
+diff -Nru kdetoys-3.4.2.orig/kworldwatch/Makefile.in kdetoys-3.4.2/kworldwatch/Makefile.in
+--- kdetoys-3.4.2.orig/kworldwatch/Makefile.in	2005-07-20 20:21:10.000000000 +0000
++++ kdetoys-3.4.2/kworldwatch/Makefile.in	2005-07-31 20:14:26.250297776 +0000
+@@ -255,6 +255,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -7780,7 +8596,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -430,7 +433,7 @@
+@@ -431,7 +434,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -7789,7 +8605,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -468,9 +471,9 @@
+@@ -469,9 +472,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -7801,10 +8617,31 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -rua kdetoys-3.4.1.orig/kworldwatch/maps/depths/Makefile.in kdetoys-3.4.1/kworldwatch/maps/depths/Makefile.in
---- kdetoys-3.4.1.orig/kworldwatch/maps/depths/Makefile.in	2005-05-23 18:12:44.000000000 +0200
-+++ kdetoys-3.4.1/kworldwatch/maps/depths/Makefile.in	2005-05-25 08:40:55.271122410 +0200
-@@ -169,6 +169,9 @@
+@@ -1047,17 +1050,17 @@
+ 
+ #>+ 13
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kworldclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kworldclock.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-kworldclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kworldclock.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-kworldclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kworldclock.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kworldclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kworldclock.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kworldclock.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kworldclock.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kworldclock.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kworldclock.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nru kdetoys-3.4.2.orig/kworldwatch/maps/depths/Makefile.in kdetoys-3.4.2/kworldwatch/maps/depths/Makefile.in
+--- kdetoys-3.4.2.orig/kworldwatch/maps/depths/Makefile.in	2005-07-20 20:21:10.000000000 +0000
++++ kdetoys-3.4.2/kworldwatch/maps/depths/Makefile.in	2005-07-31 20:14:26.276293824 +0000
+@@ -170,6 +170,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -7814,7 +8651,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -322,7 +325,7 @@
+@@ -323,7 +326,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -7823,7 +8660,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -360,9 +363,9 @@
+@@ -361,9 +364,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -7835,10 +8672,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdetoys-3.4.1.orig/kworldwatch/maps/flatworld/Makefile.in kdetoys-3.4.1/kworldwatch/maps/flatworld/Makefile.in
---- kdetoys-3.4.1.orig/kworldwatch/maps/flatworld/Makefile.in	2005-05-23 18:12:44.000000000 +0200
-+++ kdetoys-3.4.1/kworldwatch/maps/flatworld/Makefile.in	2005-05-25 08:40:55.279121684 +0200
-@@ -169,6 +169,9 @@
+diff -Nru kdetoys-3.4.2.orig/kworldwatch/maps/flatworld/Makefile.in kdetoys-3.4.2/kworldwatch/maps/flatworld/Makefile.in
+--- kdetoys-3.4.2.orig/kworldwatch/maps/flatworld/Makefile.in	2005-07-20 20:21:10.000000000 +0000
++++ kdetoys-3.4.2/kworldwatch/maps/flatworld/Makefile.in	2005-07-31 20:14:26.288292000 +0000
+@@ -170,6 +170,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -7848,7 +8685,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -322,7 +325,7 @@
+@@ -323,7 +326,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -7857,7 +8694,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -360,9 +363,9 @@
+@@ -361,9 +364,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -7869,10 +8706,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdetoys-3.4.1.orig/kworldwatch/maps/Makefile.in kdetoys-3.4.1/kworldwatch/maps/Makefile.in
---- kdetoys-3.4.1.orig/kworldwatch/maps/Makefile.in	2005-05-23 18:12:44.000000000 +0200
-+++ kdetoys-3.4.1/kworldwatch/maps/Makefile.in	2005-05-25 08:40:55.261123318 +0200
-@@ -175,6 +175,9 @@
+diff -Nru kdetoys-3.4.2.orig/kworldwatch/maps/Makefile.in kdetoys-3.4.2/kworldwatch/maps/Makefile.in
+--- kdetoys-3.4.2.orig/kworldwatch/maps/Makefile.in	2005-07-20 20:21:10.000000000 +0000
++++ kdetoys-3.4.2/kworldwatch/maps/Makefile.in	2005-07-31 20:14:26.264295648 +0000
+@@ -176,6 +176,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -7882,7 +8719,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -327,7 +330,7 @@
+@@ -328,7 +331,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -7891,7 +8728,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -365,9 +368,9 @@
+@@ -366,9 +369,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -7903,10 +8740,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdetoys-3.4.1.orig/kworldwatch/pics/Makefile.in kdetoys-3.4.1/kworldwatch/pics/Makefile.in
---- kdetoys-3.4.1.orig/kworldwatch/pics/Makefile.in	2005-05-23 18:12:44.000000000 +0200
-+++ kdetoys-3.4.1/kworldwatch/pics/Makefile.in	2005-05-25 08:40:55.289120776 +0200
-@@ -169,6 +169,9 @@
+diff -Nru kdetoys-3.4.2.orig/kworldwatch/pics/Makefile.in kdetoys-3.4.2/kworldwatch/pics/Makefile.in
+--- kdetoys-3.4.2.orig/kworldwatch/pics/Makefile.in	2005-07-20 20:21:10.000000000 +0000
++++ kdetoys-3.4.2/kworldwatch/pics/Makefile.in	2005-07-31 20:14:26.300290176 +0000
+@@ -170,6 +170,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -7916,7 +8753,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -322,7 +325,7 @@
+@@ -323,7 +326,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -7925,7 +8762,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -360,9 +363,9 @@
+@@ -361,9 +364,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -7937,10 +8774,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -rua kdetoys-3.4.1.orig/Makefile.in kdetoys-3.4.1/Makefile.in
---- kdetoys-3.4.1.orig/Makefile.in	2005-05-23 18:12:44.000000000 +0200
-+++ kdetoys-3.4.1/Makefile.in	2005-05-25 08:40:54.678176249 +0200
-@@ -192,6 +192,9 @@
+diff -Nru kdetoys-3.4.2.orig/Makefile.in kdetoys-3.4.2/Makefile.in
+--- kdetoys-3.4.2.orig/Makefile.in	2005-07-20 20:21:10.000000000 +0000
++++ kdetoys-3.4.2/Makefile.in	2005-07-31 20:14:25.178460720 +0000
+@@ -193,6 +193,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -7950,7 +8787,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -350,7 +353,7 @@
+@@ -351,7 +354,7 @@
  .SUFFIXES:
  am--refresh:
  	@:
@@ -7959,7 +8796,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -392,12 +395,12 @@
+@@ -393,12 +396,12 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	$(SHELL) ./config.status --recheck
  
@@ -7974,7 +8811,7 @@
  	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
  
  config.h: stamp-h1
-@@ -409,7 +412,7 @@
+@@ -410,7 +413,7 @@
  stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
  	@rm -f stamp-h1
  	cd $(top_builddir) && $(SHELL) ./config.status config.h
@@ -7983,12 +8820,12 @@
  	cd $(top_srcdir) && $(AUTOHEADER)
  	rm -f stamp-h1
  	touch $@
-@@ -826,7 +829,7 @@
+@@ -827,7 +830,7 @@
  .NOEXPORT:
  
  #>+ 2
 -KDE_DIST=subdirs Makefile.in configure.files config.h.in configure.in aclocal.m4 kdetoys.lsm configure.in.in acinclude.m4 Makefile.am Makefile.am.in 
-+KDE_DIST=stamp-h.in subdirs Makefile.in configure.files config.h.in configure.in aclocal.m4 kdetoys.lsm configure.in.in configure acinclude.m4 Makefile.am Makefile.am.in 
++KDE_DIST=stamp-h.in subdirs Makefile.in configure.files config.h.in configure.in aclocal.m4 kdetoys.lsm configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in 
  
  #>+ 2
  docs-am:




More information about the Pkg-kde-commits mailing list