[Pkg-kde-commits] rev 1405 -
branches/kde-3.4.0/packages/kdeutils/debian/patches
Christopher Martin
chrsmrtn-guest at costa.debian.org
Wed Aug 3 02:44:04 UTC 2005
Author: chrsmrtn-guest
Date: 2005-08-03 02:44:02 +0000 (Wed, 03 Aug 2005)
New Revision: 1405
Modified:
branches/kde-3.4.0/packages/kdeutils/debian/patches/98_buildprep.diff
Log:
And the kdeutils 3.4.2 buildprep update.
Modified: branches/kde-3.4.0/packages/kdeutils/debian/patches/98_buildprep.diff
===================================================================
--- branches/kde-3.4.0/packages/kdeutils/debian/patches/98_buildprep.diff 2005-08-03 02:42:43 UTC (rev 1404)
+++ branches/kde-3.4.0/packages/kdeutils/debian/patches/98_buildprep.diff 2005-08-03 02:44:02 UTC (rev 1405)
@@ -1,7 +1,7 @@
-diff -rua kdeutils-3.4.1.orig/acinclude.m4 kdeutils-3.4.1/acinclude.m4
---- kdeutils-3.4.1.orig/acinclude.m4 2005-05-23 18:14:19.000000000 +0200
-+++ kdeutils-3.4.1/acinclude.m4 2005-05-25 07:52:00.486469127 +0200
-@@ -1690,15 +1690,6 @@
+diff -Nru kdeutils-3.4.2.orig/acinclude.m4 kdeutils-3.4.2/acinclude.m4
+--- kdeutils-3.4.2.orig/acinclude.m4 2005-07-20 20:22:53.000000000 +0000
++++ kdeutils-3.4.2/acinclude.m4 2005-08-02 16:52:27.000000000 +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,24 @@
AC_MSG_RESULT([$SED])
])
-diff -rua kdeutils-3.4.1.orig/aclocal.m4 kdeutils-3.4.1/aclocal.m4
---- kdeutils-3.4.1.orig/aclocal.m4 2005-05-23 18:14:30.000000000 +0200
-+++ kdeutils-3.4.1/aclocal.m4 2005-05-25 07:52:09.583644400 +0200
+diff -Nru kdeutils-3.4.2.orig/aclocal.m4 kdeutils-3.4.2/aclocal.m4
+--- kdeutils-3.4.2.orig/aclocal.m4 2005-07-20 20:23:05.000000000 +0000
++++ kdeutils-3.4.2/aclocal.m4 2005-08-02 16:53:36.000000000 +0000
+@@ -1,4 +1,4 @@
+-# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
++# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ # 2005 Free Software Foundation, Inc.
+@@ -28,7 +28,7 @@
+ # Call AM_AUTOMAKE_VERSION so it can be traced.
+ # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+- [AM_AUTOMAKE_VERSION([1.9.5])])
++ [AM_AUTOMAKE_VERSION([1.9.6])])
+
+ # AM_AUX_DIR_EXPAND -*- Autoconf -*-
+
@@ -501,6 +501,35 @@
rmdir .tst 2>/dev/null
AC_SUBST([am__leading_dot])])
@@ -1482,10 +1570,40 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-diff -rua kdeutils-3.4.1.orig/ark/Makefile.in kdeutils-3.4.1/ark/Makefile.in
---- kdeutils-3.4.1.orig/ark/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/ark/Makefile.in 2005-05-25 07:52:44.308496358 +0200
-@@ -275,6 +275,9 @@
+diff -Nru kdeutils-3.4.2.orig/ark/Makefile.in kdeutils-3.4.2/ark/Makefile.in
+--- kdeutils-3.4.2.orig/ark/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/ark/Makefile.in 2005-08-02 16:59:34.814748232 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,10 +18,6 @@
+
+
+
+-#>- SOURCES = $(ark_la_SOURCES) $(libark_common_la_SOURCES) $(libarkpart_la_SOURCES)
+-#>+ 1
+-SOURCES = $(ark_la_SOURCES) $(libark_common_la_SOURCES) $(libarkpart_la_SOURCES) $(ark_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -133,8 +129,11 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- SOURCES = $(ark_la_SOURCES) $(libark_common_la_SOURCES) \
++#>- $(libarkpart_la_SOURCES)
++#>+ 2
+ SOURCES = $(ark_la_SOURCES) $(libark_common_la_SOURCES) \
+- $(libarkpart_la_SOURCES)
++ $(libarkpart_la_SOURCES) $(ark_SOURCES)
+ #>- DIST_SOURCES = $(ark_la_SOURCES) $(libark_common_la_SOURCES) \
+ #>- $(libarkpart_la_SOURCES)
+ #>+ 2
+@@ -276,6 +275,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -1495,7 +1613,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -520,7 +523,7 @@
+@@ -521,7 +523,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -1504,7 +1622,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -558,9 +561,9 @@
+@@ -559,9 +561,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1516,10 +1634,121 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -rua kdeutils-3.4.1.orig/ark/pics/Makefile.in kdeutils-3.4.1/ark/pics/Makefile.in
---- kdeutils-3.4.1.orig/ark/pics/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/ark/pics/Makefile.in 2005-05-25 07:52:44.316495633 +0200
-@@ -162,6 +162,9 @@
+@@ -1170,18 +1172,18 @@
+ ark_DEPENDENCIES = libkdeinit_ark.la
+
+ #>+ 3
+-tar.moc: $(srcdir)/tar.h
+- $(MOC) $(srcdir)/tar.h -o tar.moc
++arkwidget.moc: $(srcdir)/arkwidget.h
++ $(MOC) $(srcdir)/arkwidget.h -o arkwidget.moc
+
+ #>+ 2
+-mocs: tar.moc
++mocs: arkwidget.moc
+
+ #>+ 3
+-arkwidget.moc: $(srcdir)/arkwidget.h
+- $(MOC) $(srcdir)/arkwidget.h -o arkwidget.moc
++tar.moc: $(srcdir)/tar.h
++ $(MOC) $(srcdir)/tar.h -o tar.moc
+
+ #>+ 2
+-mocs: arkwidget.moc
++mocs: tar.moc
+
+ #>+ 3
+ arch.moc: $(srcdir)/arch.h
+@@ -1205,18 +1207,18 @@
+ mocs: rar.moc
+
+ #>+ 3
+-arktoplevelwindow.moc: $(srcdir)/arktoplevelwindow.h
+- $(MOC) $(srcdir)/arktoplevelwindow.h -o arktoplevelwindow.moc
++shellOutputDlg.moc: $(srcdir)/shellOutputDlg.h
++ $(MOC) $(srcdir)/shellOutputDlg.h -o shellOutputDlg.moc
+
+ #>+ 2
+-mocs: arktoplevelwindow.moc
++mocs: shellOutputDlg.moc
+
+ #>+ 3
+-shellOutputDlg.moc: $(srcdir)/shellOutputDlg.h
+- $(MOC) $(srcdir)/shellOutputDlg.h -o shellOutputDlg.moc
++arktoplevelwindow.moc: $(srcdir)/arktoplevelwindow.h
++ $(MOC) $(srcdir)/arktoplevelwindow.h -o arktoplevelwindow.moc
+
+ #>+ 2
+-mocs: shellOutputDlg.moc
++mocs: arktoplevelwindow.moc
+
+ #>+ 3
+ searchbar.moc: $(srcdir)/searchbar.h
+@@ -1338,10 +1340,10 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f tar.moc arkwidget.moc arch.moc filelistview.moc rar.moc arktoplevelwindow.moc shellOutputDlg.moc searchbar.moc compressedfile.moc ark_part.moc arkviewer.moc extractdlg.moc lha.moc zoo.moc selectDlg.moc ar.moc zip.moc arkapp.moc sevenzip.moc archiveformatdlg.moc
++ -rm -f arkwidget.moc tar.moc arch.moc filelistview.moc rar.moc shellOutputDlg.moc arktoplevelwindow.moc searchbar.moc compressedfile.moc ark_part.moc arkviewer.moc extractdlg.moc lha.moc zoo.moc selectDlg.moc ar.moc zip.moc arkapp.moc sevenzip.moc archiveformatdlg.moc
+
+ #>+ 2
+-KDE_DIST=extraction.ui arkui.rc common_texts.cpp ark.kcfg crsc-app-ark.svgz arkapp.h cr48-app-ark.png cr32-app-ark.png ark_part_readonly.rc cr128-app-ark.png cr16-app-ark.png addition.ui ark_part.desktop settings.kcfgc configure.in.in general.ui ark_part.rc Makefile.in ark.desktop Makefile.am cr64-app-ark.png
++KDE_DIST=extraction.ui arkui.rc common_texts.cpp ark.kcfg crsc-app-ark.svgz arkapp.h cr48-app-ark.png ark_part_readonly.rc cr32-app-ark.png cr128-app-ark.png cr16-app-ark.png addition.ui ark_part.desktop settings.kcfgc configure.in.in general.ui ark_part.rc Makefile.in ark.desktop Makefile.am cr64-app-ark.png
+
+ #>+ 6
+ clean-ui:
+@@ -1364,26 +1366,26 @@
+
+ #>+ 22
+ install-kde-icons:
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
++ $(INSTALL_DATA) $(srcdir)/crsc-app-ark.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/ark.svgz
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/cr32-app-ark.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ark.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/cr48-app-ark.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ark.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/cr128-app-ark.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/ark.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/cr16-app-ark.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ark.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/cr64-app-ark.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ark.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
+- $(INSTALL_DATA) $(srcdir)/crsc-app-ark.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/ark.svgz
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/cr128-app-ark.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/ark.png
+
+ uninstall-kde-icons:
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/ark.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ark.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ark.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/ark.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ark.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ark.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/ark.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/ark.png
+
+ #>+ 15
+ force-reedit:
+@@ -1460,7 +1462,7 @@
+ rm -f libark_common_la.all_cpp.final libark_common_la.all_cpp.files
+
+ #>+ 11
+-libarkpart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ark_part.cpp $(srcdir)/arkfactory.cpp $(srcdir)/zip.cpp $(srcdir)/tar.cpp $(srcdir)/filelistview.cpp $(srcdir)/arch.cpp $(srcdir)/selectDlg.cpp $(srcdir)/lha.cpp $(srcdir)/shellOutputDlg.cpp $(srcdir)/compressedfile.cpp $(srcdir)/zoo.cpp $(srcdir)/rar.cpp $(srcdir)/ar.cpp $(srcdir)/arkutils.cpp $(srcdir)/archiveformatdlg.cpp $(srcdir)/arkwidget.cpp $(srcdir)/searchbar.cpp $(srcdir)/extractdlg.cpp $(srcdir)/arkviewer.cpp $(srcdir)/sevenzip.cpp addition.cpp extraction.cpp general.cpp general.moc arkwidget.moc tar.moc extraction.moc arch.moc filelistview.moc rar.moc shellOutputDlg.moc searchbar.moc compressedfile.moc ark_part.moc arkviewer.moc extractdlg.moc lha.moc addition.moc zoo.moc selectDlg.moc ar.moc zip.moc sevenzip.moc archiveformatdlg.moc
++libarkpart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ark_part.cpp $(srcdir)/arkfactory.cpp $(srcdir)/zip.cpp $(srcdir)/tar.cpp $(srcdir)/filelistview.cpp $(srcdir)/arch.cpp $(srcdir)/selectDlg.cpp $(srcdir)/lha.cpp $(srcdir)/shellOutputDlg.cpp $(srcdir)/compressedfile.cpp $(srcdir)/zoo.cpp $(srcdir)/rar.cpp $(srcdir)/ar.cpp $(srcdir)/arkutils.cpp $(srcdir)/archiveformatdlg.cpp $(srcdir)/arkwidget.cpp $(srcdir)/searchbar.cpp $(srcdir)/extractdlg.cpp $(srcdir)/arkviewer.cpp $(srcdir)/sevenzip.cpp addition.cpp extraction.cpp general.cpp general.moc tar.moc arkwidget.moc extraction.moc arch.moc filelistview.moc rar.moc shellOutputDlg.moc searchbar.moc compressedfile.moc ark_part.moc arkviewer.moc extractdlg.moc lha.moc addition.moc zoo.moc selectDlg.moc ar.moc zip.moc sevenzip.moc archiveformatdlg.moc
+ @echo 'creating libarkpart_la.all_cpp.cpp ...'; \
+ rm -f libarkpart_la.all_cpp.files libarkpart_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libarkpart_la.all_cpp.final; \
+diff -Nru kdeutils-3.4.2.orig/ark/pics/Makefile.in kdeutils-3.4.2/ark/pics/Makefile.in
+--- kdeutils-3.4.2.orig/ark/pics/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/ark/pics/Makefile.in 2005-08-02 16:59:34.964725432 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -163,6 +163,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -1529,7 +1758,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -347,7 +350,7 @@
+@@ -348,7 +351,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -1538,7 +1767,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -385,9 +388,9 @@
+@@ -386,9 +389,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1550,10 +1779,93 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/charselectapplet/Makefile.in kdeutils-3.4.1/charselectapplet/Makefile.in
---- kdeutils-3.4.1.orig/charselectapplet/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/charselectapplet/Makefile.in 2005-05-25 07:52:44.326494726 +0200
-@@ -210,6 +210,9 @@
+@@ -531,7 +534,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=cr22-action-ark_addfile.png cr22-action-ark_delete.png cr22-action-ark_help.png cr22-action-ark_extract.png cr32-action-ark_delete.png cr22-action-ark_adddir.png cr22-action-ark_options.png cr32-action-ark_view.png cr22-action-ark_open.png cr22-action-ark_new.png Makefile.in cr22-action-ark_view.png cr22-action-ark_selectall.png cr32-action-ark_extract.png cr32-action-ark_adddir.png cr32-action-ark_addfile.png Makefile.am
++KDE_DIST=cr22-action-ark_addfile.png cr22-action-ark_delete.png cr22-action-ark_help.png cr22-action-ark_extract.png cr32-action-ark_delete.png cr22-action-ark_adddir.png cr22-action-ark_options.png cr32-action-ark_view.png cr22-action-ark_open.png cr22-action-ark_new.png Makefile.in cr22-action-ark_selectall.png cr22-action-ark_view.png cr32-action-ark_extract.png cr32-action-ark_adddir.png cr32-action-ark_addfile.png Makefile.am
+
+ #>+ 2
+ docs-am:
+@@ -539,39 +542,39 @@
+ #>+ 36
+ install-kde-icons:
+ $(mkinstalldirs) $(DESTDIR)$(icondir)/crystalsvg/22x22/actions
+- $(INSTALL_DATA) $(srcdir)/cr22-action-ark_selectall.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_selectall.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-ark_adddir.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_adddir.png
+- $(mkinstalldirs) $(DESTDIR)$(icondir)/crystalsvg/32x32/actions
+- $(INSTALL_DATA) $(srcdir)/cr32-action-ark_adddir.png $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_adddir.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-ark_help.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_help.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-ark_addfile.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_addfile.png
++ $(mkinstalldirs) $(DESTDIR)$(icondir)/crystalsvg/32x32/actions
+ $(INSTALL_DATA) $(srcdir)/cr32-action-ark_addfile.png $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_addfile.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-ark_new.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_new.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-ark_options.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_options.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-ark_open.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_open.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-ark_delete.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_delete.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-ark_delete.png $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_delete.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-ark_extract.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_extract.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-ark_view.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_view.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-ark_selectall.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_selectall.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-ark_help.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_help.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-ark_extract.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_extract.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-ark_adddir.png $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_adddir.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-ark_options.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_options.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-ark_adddir.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_adddir.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-ark_extract.png $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_extract.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-ark_view.png $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_view.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-ark_delete.png $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_delete.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-ark_delete.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_delete.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-ark_open.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_open.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_selectall.png
+- -rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_adddir.png
+- -rm -f $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_adddir.png
+- -rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_help.png
+ -rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_addfile.png
+ -rm -f $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_addfile.png
+ -rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_new.png
+- -rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_options.png
+- -rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_open.png
+- -rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_delete.png
+- -rm -f $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_delete.png
+- -rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_extract.png
+ -rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_view.png
++ -rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_selectall.png
++ -rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_help.png
++ -rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_extract.png
++ -rm -f $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_adddir.png
++ -rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_options.png
++ -rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_adddir.png
+ -rm -f $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_extract.png
+ -rm -f $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_view.png
++ -rm -f $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_delete.png
++ -rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_delete.png
++ -rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_open.png
+
+ #>+ 15
+ force-reedit:
+diff -Nru kdeutils-3.4.2.orig/charselectapplet/Makefile.in kdeutils-3.4.2/charselectapplet/Makefile.in
+--- kdeutils-3.4.2.orig/charselectapplet/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/charselectapplet/Makefile.in 2005-08-02 16:59:35.043713424 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kcharselect_panelapplet_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -211,6 +209,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -1563,7 +1875,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -404,7 +407,7 @@
+@@ -405,7 +406,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -1572,7 +1884,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -442,9 +445,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1584,15 +1896,28 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -rua kdeutils-3.4.1.orig/configure kdeutils-3.4.1/configure
---- kdeutils-3.4.1.orig/configure 2005-05-23 18:15:17.000000000 +0200
-+++ kdeutils-3.4.1/configure 2005-05-25 07:52:47.649193504 +0200
+diff -Nru kdeutils-3.4.2.orig/config.h.in kdeutils-3.4.2/config.h.in
+--- kdeutils-3.4.2.orig/config.h.in 2005-07-20 20:23:12.000000000 +0000
++++ kdeutils-3.4.2/config.h.in 2005-08-02 16:54:05.000000000 +0000
+@@ -394,9 +394,6 @@
+ #endif
+
+
+-/* define to 1 if -fvisibility is supported */
+-#undef __KDE_HAVE_GCC_VISIBILITY
+-
+
+ #if defined(__SVR4) && !defined(__svr4__)
+ #define __svr4__ 1
+diff -Nru kdeutils-3.4.2.orig/configure kdeutils-3.4.2/configure
+--- kdeutils-3.4.2.orig/configure 2005-07-20 20:23:56.000000000 +0000
++++ kdeutils-3.4.2/configure 2005-08-02 17:00:19.173004752 +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 include_kmilo_powerbook_TRUE include_kmilo_powerbook_FALSE include_kmilo_pbb_TRUE include_kmilo_pbb_FALSE include_kmilo_delli8k_TRUE include_kmilo_delli8k_FALSE include_kmilo_kvaio_TRUE include_kmilo_kvaio_FALSE KEYBOARD_LIBS supports_i8k_TRUE supports_i8k_FALSE include_nv_TRUE include_nv_FALSE LIB_DEVSTAT LIBSNMP include_ksim_monitors_snmp_TRUE include_ksim_monitors_snmp_FALSE TOPSUBDIRS ark_SUBDIR_included_TRUE ark_SUBDIR_included_FALSE charselectapplet_SUBDIR_included_TRUE charselectapplet_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kcalc_SUBDIR_included_TRUE kcalc_SUBDIR_included_FALSE kcharselect_SUBDIR_included_TRUE kcharselect_SUBDIR_included_FALSE kdelirc_SUBDIR_included_TRUE kdelirc_SUBDIR_included_FALSE kdessh_SUBDIR_included_TRUE kdessh_SUBDIR_included_FALSE kdf_SUBDIR_included_TRUE kdf_SUBDIR_included_FALSE kedit_SUBDIR_included_TRUE kedit_SUBDIR_included_FALSE kfloppy_SUBDIR_included_TRUE kfloppy_SUBDIR_included_FALSE kgpg_SUBDIR_included_TRUE kgpg_SUBDIR_included_FALSE khexedit_SUBDIR_included_TRUE khexedit_SUBDIR_included_FALSE kjots_SUBDIR_included_TRUE kjots_SUBDIR_included_FALSE klaptopdaemon_SUBDIR_included_TRUE klaptopdaemon_SUBDIR_included_FALSE kmilo_SUBDIR_included_TRUE kmilo_SUBDIR_included_FALSE kregexpeditor_SUBDIR_included_TRUE kregexpeditor_SUBDIR_included_FALSE ksim_SUBDIR_included_TRUE ksim_SUBDIR_included_FALSE ktimer_SUBDIR_included_TRUE ktimer_SUBDIR_included_FALSE kwallet_SUBDIR_included_TRUE kwallet_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 include_kmilo_powerbook_TRUE include_kmilo_powerbook_FALSE include_kmilo_pbb_TRUE include_kmilo_pbb_FALSE include_kmilo_delli8k_TRUE include_kmilo_delli8k_FALSE include_kmilo_kvaio_TRUE include_kmilo_kvaio_FALSE KEYBOARD_LIBS supports_i8k_TRUE supports_i8k_FALSE include_nv_TRUE include_nv_FALSE LIB_DEVSTAT LIBSNMP include_ksim_monitors_snmp_TRUE include_ksim_monitors_snmp_FALSE TOPSUBDIRS ark_SUBDIR_included_TRUE ark_SUBDIR_included_FALSE charselectapplet_SUBDIR_included_TRUE charselectapplet_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kcalc_SUBDIR_included_TRUE kcalc_SUBDIR_included_FALSE kcharselect_SUBDIR_included_TRUE kcharselect_SUBDIR_included_FALSE kdelirc_SUBDIR_included_TRUE kdelirc_SUBDIR_included_FALSE kdessh_SUBDIR_included_TRUE kdessh_SUBDIR_included_FALSE kdf_SUBDIR_included_TRUE kdf_SUBDIR_included_FALSE kedit_SUBDIR_included_TRUE kedit_SUBDIR_included_FALSE kfloppy_SUBDIR_included_TRUE kfloppy_SUBDIR_included_FALSE kgpg_SUBDIR_included_TRUE kgpg_SUBDIR_included_FALSE khexedit_SUBDIR_included_TRUE khexedit_SUBDIR_included_FALSE kjots_SUBDIR_included_TRUE kjots_SUBDIR_included_FALSE klaptopdaemon_SUBDIR_included_TRUE klaptopdaemon_SUBDIR_included_FALSE kmilo_SUBDIR_included_TRUE kmilo_SUBDIR_included_FALSE kregexpeditor_SUBDIR_included_TRUE kregexpeditor_SUBDIR_included_FALSE ksim_SUBDIR_included_TRUE ksim_SUBDIR_included_FALSE ktimer_SUBDIR_included_TRUE ktimer_SUBDIR_included_FALSE kwallet_SUBDIR_included_TRUE kwallet_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 include_kmilo_powerbook_TRUE include_kmilo_powerbook_FALSE include_kmilo_pbb_TRUE include_kmilo_pbb_FALSE include_kmilo_delli8k_TRUE include_kmilo_delli8k_FALSE include_kmilo_kvaio_TRUE include_kmilo_kvaio_FALSE KEYBOARD_LIBS supports_i8k_TRUE supports_i8k_FALSE include_nv_TRUE include_nv_FALSE LIB_DEVSTAT LIBSNMP include_ksim_monitors_snmp_TRUE include_ksim_monitors_snmp_FALSE TOPSUBDIRS ark_SUBDIR_included_TRUE ark_SUBDIR_included_FALSE charselectapplet_SUBDIR_included_TRUE charselectapplet_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kcalc_SUBDIR_included_TRUE kcalc_SUBDIR_included_FALSE kcharselect_SUBDIR_included_TRUE kcharselect_SUBDIR_included_FALSE kdelirc_SUBDIR_included_TRUE kdelirc_SUBDIR_included_FALSE kdessh_SUBDIR_included_TRUE kdessh_SUBDIR_included_FALSE kdf_SUBDIR_included_TRUE kdf_SUBDIR_included_FALSE kedit_SUBDIR_included_TRUE kedit_SUBDIR_included_FALSE kfloppy_SUBDIR_included_TRUE kfloppy_SUBDIR_included_FALSE kgpg_SUBDIR_included_TRUE kgpg_SUBDIR_included_FALSE khexedit_SUBDIR_included_TRUE khexedit_SUBDIR_included_FALSE kjots_SUBDIR_included_TRUE kjots_SUBDIR_included_FALSE klaptopdaemon_SUBDIR_included_TRUE klaptopdaemon_SUBDIR_included_FALSE kmilo_SUBDIR_included_TRUE kmilo_SUBDIR_included_FALSE kregexpeditor_SUBDIR_included_TRUE kregexpeditor_SUBDIR_included_FALSE ksim_SUBDIR_included_TRUE ksim_SUBDIR_included_FALSE ktimer_SUBDIR_included_TRUE ktimer_SUBDIR_included_FALSE kwallet_SUBDIR_included_TRUE kwallet_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 include_kmilo_powerbook_TRUE include_kmilo_powerbook_FALSE include_kmilo_pbb_TRUE include_kmilo_pbb_FALSE include_kmilo_delli8k_TRUE include_kmilo_delli8k_FALSE include_kmilo_kvaio_TRUE include_kmilo_kvaio_FALSE KEYBOARD_LIBS supports_i8k_TRUE supports_i8k_FALSE include_nv_TRUE include_nv_FALSE LIB_DEVSTAT LIBSNMP include_ksim_monitors_snmp_TRUE include_ksim_monitors_snmp_FALSE TOPSUBDIRS ark_SUBDIR_included_TRUE ark_SUBDIR_included_FALSE charselectapplet_SUBDIR_included_TRUE charselectapplet_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kcalc_SUBDIR_included_TRUE kcalc_SUBDIR_included_FALSE kcharselect_SUBDIR_included_TRUE kcharselect_SUBDIR_included_FALSE kdelirc_SUBDIR_included_TRUE kdelirc_SUBDIR_included_FALSE kdessh_SUBDIR_included_TRUE kdessh_SUBDIR_included_FALSE kdf_SUBDIR_included_TRUE kdf_SUBDIR_included_FALSE kedit_SUBDIR_included_TRUE kedit_SUBDIR_included_FALSE kfloppy_SUBDIR_included_TRUE kfloppy_SUBDIR_included_FALSE kgpg_SUBDIR_included_TRUE kgpg_SUBDIR_included_FALSE khexedit_SUBDIR_included_TRUE khexedit_SUBDIR_included_FALSE kjots_SUBDIR_included_TRUE kjots_SUBDIR_included_FALSE klaptopdaemon_SUBDIR_included_TRUE klaptopdaemon_SUBDIR_included_FALSE kmilo_SUBDIR_included_TRUE kmilo_SUBDIR_included_FALSE kregexpeditor_SUBDIR_included_TRUE kregexpeditor_SUBDIR_included_FALSE ksim_SUBDIR_included_TRUE ksim_SUBDIR_included_FALSE ktimer_SUBDIR_included_TRUE ktimer_SUBDIR_included_FALSE kwallet_SUBDIR_included_TRUE kwallet_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -6460,7 +6785,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); } &&
@@ -6470,7 +6795,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); } &&
@@ -6480,7 +6805,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); } &&
@@ -6490,7 +6815,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); } &&
@@ -6500,7 +6825,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); } &&
@@ -6510,7 +6835,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); } &&
@@ -6520,7 +6845,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); } &&
@@ -6530,7 +6855,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); } &&
@@ -6540,7 +6865,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); } &&
@@ -6550,25 +6875,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); } &&
@@ -6578,103 +6903,354 @@
{ (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 @@
+- { (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
+
+
+@@ -32599,8 +32228,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
+- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32673,8 +32582,7 @@
+@@ -32672,8 +32300,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=$?
-@@ -32775,8 +32683,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32848,8 +32755,7 @@
+@@ -32727,8 +32354,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6684,7 +7260,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32903,8 +32809,7 @@
+@@ -32799,8 +32425,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6694,7 +7270,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32975,8 +32880,7 @@
+@@ -32854,8 +32479,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6704,7 +7280,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33030,8 +32934,7 @@
+@@ -32922,8 +32546,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6714,7 +7290,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33098,8 +33001,7 @@
+@@ -33097,8 +32720,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6724,7 +7300,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33274,8 +33176,7 @@
+@@ -33241,8 +32863,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6734,7 +7310,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33412,9 +33313,6 @@
+@@ -33296,9 +32917,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -6744,7 +7320,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33445,8 +33343,7 @@
+@@ -33329,8 +32947,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6754,7 +7330,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33547,8 +33444,7 @@
+@@ -33431,8 +33048,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6764,7 +7340,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33627,9 +33523,6 @@
+@@ -33511,9 +33127,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -6774,7 +7350,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33660,8 +33553,7 @@
+@@ -33544,8 +33157,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6784,7 +7360,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33762,8 +33654,7 @@
+@@ -33646,8 +33258,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6794,7 +7370,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33890,9 +33781,6 @@
+@@ -33774,9 +33385,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -6804,7 +7380,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33927,8 +33815,7 @@
+@@ -33811,8 +33419,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6814,7 +7390,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34035,8 +33922,7 @@
+@@ -33919,8 +33526,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6824,7 +7400,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34128,8 +34014,7 @@
+@@ -34012,8 +33618,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6834,7 +7410,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34314,8 +34199,7 @@
+@@ -34198,8 +33803,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6844,7 +7420,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34469,8 +34353,7 @@
+@@ -34353,8 +33957,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6854,7 +7430,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34545,8 +34428,7 @@
+@@ -34429,8 +34032,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6864,7 +7440,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34635,8 +34517,7 @@
+@@ -34519,8 +34121,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6874,7 +7450,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34709,8 +34590,7 @@
+@@ -34593,8 +34194,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6884,7 +7460,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34783,8 +34663,7 @@
+@@ -34667,8 +34267,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6894,7 +7470,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34864,8 +34743,7 @@
+@@ -34748,8 +34347,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6904,7 +7480,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34907,8 +34785,7 @@
+@@ -34791,8 +34389,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6914,7 +7490,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34965,8 +34842,7 @@
+@@ -34849,8 +34446,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6924,7 +7500,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35168,8 +35044,7 @@
+@@ -35052,8 +34648,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6934,7 +7510,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35345,8 +35220,7 @@
+@@ -35229,8 +34824,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6944,7 +7520,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35433,8 +35307,7 @@
+@@ -35317,8 +34911,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6954,7 +7530,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35548,8 +35421,7 @@
+@@ -35432,8 +35025,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6964,7 +7540,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35742,8 +35614,7 @@
+@@ -35626,8 +35218,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6974,7 +7550,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35820,8 +35691,7 @@
+@@ -35704,8 +35295,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6984,7 +7560,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35908,8 +35778,7 @@
+@@ -35792,8 +35382,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6994,7 +7570,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36081,8 +35950,7 @@
+@@ -35965,8 +35554,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7004,7 +7580,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36151,8 +36019,7 @@
+@@ -36035,8 +35623,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7014,7 +7590,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36231,8 +36098,7 @@
+@@ -36113,8 +35700,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7024,7 +7600,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36416,8 +36282,7 @@
+@@ -36260,8 +35846,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7034,17 +7610,27 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36495,8 +36360,7 @@
+@@ -36363,8 +35948,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -36442,8 +36026,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=$?
-@@ -36668,8 +36532,7 @@
+@@ -36615,8 +36198,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7054,7 +7640,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36758,8 +36621,7 @@
+@@ -36705,8 +36287,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7064,7 +7650,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37340,6 +37202,13 @@
+@@ -37287,6 +36868,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -7078,7 +7664,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
-@@ -38229,6 +38098,9 @@
+@@ -38176,6 +37764,9 @@
s, at AMTAR@,$AMTAR,;t t
s, at am__tar@,$am__tar,;t t
s, at am__untar@,$am__untar,;t t
@@ -7088,7 +7674,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
-@@ -38620,11 +38492,6 @@
+@@ -38568,11 +38159,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
@@ -7100,7 +7686,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. */
-@@ -38663,6 +38530,12 @@
+@@ -38611,6 +38197,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
@@ -7113,22 +7699,28 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
-diff -rua kdeutils-3.4.1.orig/configure.in kdeutils-3.4.1/configure.in
---- kdeutils-3.4.1.orig/configure.in 2005-05-23 18:14:21.000000000 +0200
-+++ kdeutils-3.4.1/configure.in 2005-05-25 07:52:01.174406760 +0200
+diff -Nru kdeutils-3.4.2.orig/configure.in kdeutils-3.4.2/configure.in
+--- kdeutils-3.4.2.orig/configure.in 2005-07-20 20:22:55.000000000 +0000
++++ kdeutils-3.4.2/configure.in 2005-08-02 16:52:33.000000000 +0000
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdeutils, "3.4.1") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdeutils, "3.4.2") dnl searches for some needed programs
+AM_MAINTAINER_MODE
+
KDE_SET_PREFIX
dnl generate the config header
-diff -rua kdeutils-3.4.1.orig/doc/ark/Makefile.in kdeutils-3.4.1/doc/ark/Makefile.in
---- kdeutils-3.4.1.orig/doc/ark/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/doc/ark/Makefile.in 2005-05-25 07:52:44.349492641 +0200
-@@ -162,6 +162,9 @@
+diff -Nru kdeutils-3.4.2.orig/doc/ark/Makefile.in kdeutils-3.4.2/doc/ark/Makefile.in
+--- kdeutils-3.4.2.orig/doc/ark/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/doc/ark/Makefile.in 2005-08-02 16:59:35.216687128 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -163,6 +163,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7138,7 +7730,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -347,7 +350,7 @@
+@@ -348,7 +351,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7147,7 +7739,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -385,9 +388,9 @@
+@@ -386,9 +389,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7159,10 +7751,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/doc/kcalc/Makefile.in kdeutils-3.4.1/doc/kcalc/Makefile.in
---- kdeutils-3.4.1.orig/doc/kcalc/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/doc/kcalc/Makefile.in 2005-05-25 07:52:44.355492097 +0200
-@@ -162,6 +162,9 @@
+diff -Nru kdeutils-3.4.2.orig/doc/kcalc/Makefile.in kdeutils-3.4.2/doc/kcalc/Makefile.in
+--- kdeutils-3.4.2.orig/doc/kcalc/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/doc/kcalc/Makefile.in 2005-08-02 16:59:35.344667672 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -163,6 +163,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7172,7 +7770,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -347,7 +350,7 @@
+@@ -348,7 +351,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7181,7 +7779,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -385,9 +388,9 @@
+@@ -386,9 +389,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7193,10 +7791,49 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/doc/kcharselect/Makefile.in kdeutils-3.4.1/doc/kcharselect/Makefile.in
---- kdeutils-3.4.1.orig/doc/kcharselect/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/doc/kcharselect/Makefile.in 2005-05-25 07:52:44.361491553 +0200
-@@ -162,6 +162,9 @@
+@@ -536,7 +539,7 @@
+ KDE_DIST=index.docbook kcalc_on_OSF.txt index.cache.bz2 kcalc_on_Aix.txt Makefile.in Makefile.am
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook kcalc_on_Aix.txt kcalc_on_OSF.txt
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kcalc_on_Aix.txt kcalc_on_OSF.txt 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
+@@ -563,20 +566,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcalc
+- @for base in index.docbook kcalc_on_Aix.txt kcalc_on_OSF.txt ; do \
++ @for base in kcalc_on_Aix.txt kcalc_on_OSF.txt index.docbook ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcalc/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcalc/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in index.docbook kcalc_on_Aix.txt kcalc_on_OSF.txt ; do \
++ for base in kcalc_on_Aix.txt kcalc_on_OSF.txt index.docbook ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcalc/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in index.docbook kcalc_on_Aix.txt kcalc_on_OSF.txt ; do \
++ for file in kcalc_on_Aix.txt kcalc_on_OSF.txt index.docbook ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
+diff -Nru kdeutils-3.4.2.orig/doc/kcharselect/Makefile.in kdeutils-3.4.2/doc/kcharselect/Makefile.in
+--- kdeutils-3.4.2.orig/doc/kcharselect/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/doc/kcharselect/Makefile.in 2005-08-02 16:59:35.388660984 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -163,6 +163,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7206,7 +7843,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -347,7 +350,7 @@
+@@ -348,7 +351,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7215,7 +7852,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -385,9 +388,9 @@
+@@ -386,9 +389,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7227,10 +7864,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/doc/kcontrol/kcmlowbatcrit/Makefile.in kdeutils-3.4.1/doc/kcontrol/kcmlowbatcrit/Makefile.in
---- kdeutils-3.4.1.orig/doc/kcontrol/kcmlowbatcrit/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/doc/kcontrol/kcmlowbatcrit/Makefile.in 2005-05-25 07:52:44.375490284 +0200
-@@ -162,6 +162,9 @@
+diff -Nru kdeutils-3.4.2.orig/doc/kcontrol/kcmlowbatcrit/Makefile.in kdeutils-3.4.2/doc/kcontrol/kcmlowbatcrit/Makefile.in
+--- kdeutils-3.4.2.orig/doc/kcontrol/kcmlowbatcrit/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/doc/kcontrol/kcmlowbatcrit/Makefile.in 2005-08-02 16:59:35.493645024 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -163,6 +163,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7240,7 +7883,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -347,7 +350,7 @@
+@@ -348,7 +351,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7249,7 +7892,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -385,9 +388,9 @@
+@@ -386,9 +389,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7261,10 +7904,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/doc/kcontrol/kcmlowbatwarn/Makefile.in kdeutils-3.4.1/doc/kcontrol/kcmlowbatwarn/Makefile.in
---- kdeutils-3.4.1.orig/doc/kcontrol/kcmlowbatwarn/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/doc/kcontrol/kcmlowbatwarn/Makefile.in 2005-05-25 07:52:44.382489650 +0200
-@@ -162,6 +162,9 @@
+diff -Nru kdeutils-3.4.2.orig/doc/kcontrol/kcmlowbatwarn/Makefile.in kdeutils-3.4.2/doc/kcontrol/kcmlowbatwarn/Makefile.in
+--- kdeutils-3.4.2.orig/doc/kcontrol/kcmlowbatwarn/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/doc/kcontrol/kcmlowbatwarn/Makefile.in 2005-08-02 16:59:35.785600640 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -163,6 +163,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7274,7 +7923,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -347,7 +350,7 @@
+@@ -348,7 +351,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7283,7 +7932,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -385,9 +388,9 @@
+@@ -386,9 +389,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7295,10 +7944,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/doc/kcontrol/laptop/Makefile.in kdeutils-3.4.1/doc/kcontrol/laptop/Makefile.in
---- kdeutils-3.4.1.orig/doc/kcontrol/laptop/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/doc/kcontrol/laptop/Makefile.in 2005-05-25 07:52:44.388489106 +0200
-@@ -162,6 +162,9 @@
+diff -Nru kdeutils-3.4.2.orig/doc/kcontrol/laptop/Makefile.in kdeutils-3.4.2/doc/kcontrol/laptop/Makefile.in
+--- kdeutils-3.4.2.orig/doc/kcontrol/laptop/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/doc/kcontrol/laptop/Makefile.in 2005-08-02 16:59:35.903582704 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -163,6 +163,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7308,7 +7963,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -347,7 +350,7 @@
+@@ -348,7 +351,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7317,7 +7972,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -385,9 +388,9 @@
+@@ -386,9 +389,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7329,10 +7984,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/doc/kcontrol/Makefile.in kdeutils-3.4.1/doc/kcontrol/Makefile.in
---- kdeutils-3.4.1.orig/doc/kcontrol/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/doc/kcontrol/Makefile.in 2005-05-25 07:52:44.369490828 +0200
-@@ -178,6 +178,9 @@
+diff -Nru kdeutils-3.4.2.orig/doc/kcontrol/Makefile.in kdeutils-3.4.2/doc/kcontrol/Makefile.in
+--- kdeutils-3.4.2.orig/doc/kcontrol/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/doc/kcontrol/Makefile.in 2005-08-02 16:59:35.438653384 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -179,6 +179,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7342,7 +8003,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -366,7 +369,7 @@
+@@ -359,7 +362,7 @@
+ xdg_menudir = @xdg_menudir@
+ #>- SUBDIRS = $(AUTODIRS)
+ #>+ 1
+-SUBDIRS =. laptop powerctrl kcmlowbatcrit kcmlowbatwarn
++SUBDIRS =. powerctrl laptop kcmlowbatcrit kcmlowbatwarn
+ KDE_LANG = en
+ KDE_DOCS = AUTO
+ #>- all: all-recursive
+@@ -367,7 +370,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -7351,7 +8021,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -404,9 +407,9 @@
+@@ -405,9 +408,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7363,10 +8033,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/doc/kcontrol/powerctrl/Makefile.in kdeutils-3.4.1/doc/kcontrol/powerctrl/Makefile.in
---- kdeutils-3.4.1.orig/doc/kcontrol/powerctrl/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/doc/kcontrol/powerctrl/Makefile.in 2005-05-25 07:52:44.394488562 +0200
-@@ -162,6 +162,9 @@
+diff -Nru kdeutils-3.4.2.orig/doc/kcontrol/powerctrl/Makefile.in kdeutils-3.4.2/doc/kcontrol/powerctrl/Makefile.in
+--- kdeutils-3.4.2.orig/doc/kcontrol/powerctrl/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/doc/kcontrol/powerctrl/Makefile.in 2005-08-02 16:59:36.098553064 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -163,6 +163,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7376,7 +8052,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -347,7 +350,7 @@
+@@ -348,7 +351,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7385,7 +8061,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -385,9 +388,9 @@
+@@ -386,9 +389,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7397,10 +8073,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/doc/kdelirc/irkick/Makefile.in kdeutils-3.4.1/doc/kdelirc/irkick/Makefile.in
---- kdeutils-3.4.1.orig/doc/kdelirc/irkick/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/doc/kdelirc/irkick/Makefile.in 2005-05-25 07:52:44.407487384 +0200
-@@ -162,6 +162,9 @@
+diff -Nru kdeutils-3.4.2.orig/doc/kdelirc/irkick/Makefile.in kdeutils-3.4.2/doc/kdelirc/irkick/Makefile.in
+--- kdeutils-3.4.2.orig/doc/kdelirc/irkick/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/doc/kdelirc/irkick/Makefile.in 2005-08-02 16:59:36.261528288 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -163,6 +163,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7410,7 +8092,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -347,7 +350,7 @@
+@@ -348,7 +351,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7419,7 +8101,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -385,9 +388,9 @@
+@@ -386,9 +389,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7431,10 +8113,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/doc/kdelirc/kcmlirc/Makefile.in kdeutils-3.4.1/doc/kdelirc/kcmlirc/Makefile.in
---- kdeutils-3.4.1.orig/doc/kdelirc/kcmlirc/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/doc/kdelirc/kcmlirc/Makefile.in 2005-05-25 07:52:44.414486749 +0200
-@@ -162,6 +162,9 @@
+diff -Nru kdeutils-3.4.2.orig/doc/kdelirc/kcmlirc/Makefile.in kdeutils-3.4.2/doc/kdelirc/kcmlirc/Makefile.in
+--- kdeutils-3.4.2.orig/doc/kdelirc/kcmlirc/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/doc/kdelirc/kcmlirc/Makefile.in 2005-08-02 16:59:36.306521448 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -163,6 +163,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7444,7 +8132,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -347,7 +350,7 @@
+@@ -348,7 +351,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7453,7 +8141,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -385,9 +388,9 @@
+@@ -386,9 +389,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7465,10 +8153,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/doc/kdelirc/Makefile.in kdeutils-3.4.1/doc/kdelirc/Makefile.in
---- kdeutils-3.4.1.orig/doc/kdelirc/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/doc/kdelirc/Makefile.in 2005-05-25 07:52:44.401487928 +0200
-@@ -178,6 +178,9 @@
+diff -Nru kdeutils-3.4.2.orig/doc/kdelirc/Makefile.in kdeutils-3.4.2/doc/kdelirc/Makefile.in
+--- kdeutils-3.4.2.orig/doc/kdelirc/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/doc/kdelirc/Makefile.in 2005-08-02 16:59:36.222534216 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -179,6 +179,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7478,7 +8172,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -366,7 +369,7 @@
+@@ -367,7 +370,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -7487,7 +8181,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -404,9 +407,9 @@
+@@ -405,9 +408,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7499,10 +8193,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/doc/kdf/Makefile.in kdeutils-3.4.1/doc/kdf/Makefile.in
---- kdeutils-3.4.1.orig/doc/kdf/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/doc/kdf/Makefile.in 2005-05-25 07:52:44.420486205 +0200
-@@ -162,6 +162,9 @@
+diff -Nru kdeutils-3.4.2.orig/doc/kdf/Makefile.in kdeutils-3.4.2/doc/kdf/Makefile.in
+--- kdeutils-3.4.2.orig/doc/kdf/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/doc/kdf/Makefile.in 2005-08-02 16:59:36.344515672 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -163,6 +163,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7512,7 +8212,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -347,7 +350,7 @@
+@@ -348,7 +351,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7521,7 +8221,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -385,9 +388,9 @@
+@@ -386,9 +389,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7533,10 +8233,49 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/doc/kedit/Makefile.in kdeutils-3.4.1/doc/kedit/Makefile.in
---- kdeutils-3.4.1.orig/doc/kedit/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/doc/kedit/Makefile.in 2005-05-25 07:52:44.426485661 +0200
-@@ -162,6 +162,9 @@
+@@ -536,7 +539,7 @@
+ KDE_DIST=index.docbook kdf_config.png index.cache.bz2 kdf.png Makefile.in Makefile.am
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook kdf.png kdf_config.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kdf.png kdf_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
+@@ -563,20 +566,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdf
+- @for base in index.docbook kdf.png kdf_config.png ; do \
++ @for base in kdf.png kdf_config.png index.docbook ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdf/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdf/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in index.docbook kdf.png kdf_config.png ; do \
++ for base in kdf.png kdf_config.png index.docbook ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdf/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in index.docbook kdf.png kdf_config.png ; do \
++ for file in kdf.png kdf_config.png index.docbook ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
+diff -Nru kdeutils-3.4.2.orig/doc/kedit/Makefile.in kdeutils-3.4.2/doc/kedit/Makefile.in
+--- kdeutils-3.4.2.orig/doc/kedit/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/doc/kedit/Makefile.in 2005-08-02 16:59:36.385509440 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -163,6 +163,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7546,7 +8285,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -347,7 +350,7 @@
+@@ -348,7 +351,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7555,7 +8294,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -385,9 +388,9 @@
+@@ -386,9 +389,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7567,10 +8306,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/doc/kfloppy/Makefile.in kdeutils-3.4.1/doc/kfloppy/Makefile.in
---- kdeutils-3.4.1.orig/doc/kfloppy/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/doc/kfloppy/Makefile.in 2005-05-25 07:52:44.433485027 +0200
-@@ -162,6 +162,9 @@
+diff -Nru kdeutils-3.4.2.orig/doc/kfloppy/Makefile.in kdeutils-3.4.2/doc/kfloppy/Makefile.in
+--- kdeutils-3.4.2.orig/doc/kfloppy/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/doc/kfloppy/Makefile.in 2005-08-02 16:59:36.434501992 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -163,6 +163,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7580,7 +8325,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -347,7 +350,7 @@
+@@ -348,7 +351,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7589,7 +8334,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -385,9 +388,9 @@
+@@ -386,9 +389,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7601,10 +8346,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/doc/kgpg/Makefile.in kdeutils-3.4.1/doc/kgpg/Makefile.in
---- kdeutils-3.4.1.orig/doc/kgpg/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/doc/kgpg/Makefile.in 2005-05-25 07:52:44.439484483 +0200
-@@ -162,6 +162,9 @@
+diff -Nru kdeutils-3.4.2.orig/doc/kgpg/Makefile.in kdeutils-3.4.2/doc/kgpg/Makefile.in
+--- kdeutils-3.4.2.orig/doc/kgpg/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/doc/kgpg/Makefile.in 2005-08-02 16:59:36.472496216 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -163,6 +163,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7614,7 +8365,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -347,7 +350,7 @@
+@@ -348,7 +351,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7623,7 +8374,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -385,9 +388,9 @@
+@@ -386,9 +389,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7635,10 +8386,53 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/doc/khexedit/Makefile.in kdeutils-3.4.1/doc/khexedit/Makefile.in
---- kdeutils-3.4.1.orig/doc/khexedit/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/doc/khexedit/Makefile.in 2005-05-25 07:52:44.446483848 +0200
-@@ -162,6 +162,9 @@
+@@ -533,10 +536,10 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=index.docbook options.png kicker.png keygen.png keymanage.png index.cache.bz2 keys.png Makefile.in editor.png Makefile.am
++KDE_DIST=index.docbook options.png kicker.png keymanage.png keygen.png index.cache.bz2 keys.png Makefile.in editor.png Makefile.am
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) keymanage.png keygen.png index.docbook editor.png kicker.png keys.png options.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) options.png kicker.png keygen.png keymanage.png editor.png index.docbook keys.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
+@@ -563,20 +566,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kgpg
+- @for base in keymanage.png keygen.png index.docbook editor.png kicker.png keys.png options.png ; do \
++ @for base in options.png kicker.png keygen.png keymanage.png editor.png index.docbook keys.png ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kgpg/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kgpg/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in keymanage.png keygen.png index.docbook editor.png kicker.png keys.png options.png ; do \
++ for base in options.png kicker.png keygen.png keymanage.png editor.png index.docbook keys.png ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kgpg/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in keymanage.png keygen.png index.docbook editor.png kicker.png keys.png options.png ; do \
++ for file in options.png kicker.png keygen.png keymanage.png editor.png index.docbook keys.png ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
+diff -Nru kdeutils-3.4.2.orig/doc/khexedit/Makefile.in kdeutils-3.4.2/doc/khexedit/Makefile.in
+--- kdeutils-3.4.2.orig/doc/khexedit/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/doc/khexedit/Makefile.in 2005-08-02 16:59:36.521488768 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -163,6 +163,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7648,7 +8442,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -347,7 +350,7 @@
+@@ -348,7 +351,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7657,7 +8451,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -385,9 +388,9 @@
+@@ -386,9 +389,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7669,10 +8463,49 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/doc/kinfocenter/blockdevices/Makefile.in kdeutils-3.4.1/doc/kinfocenter/blockdevices/Makefile.in
---- kdeutils-3.4.1.orig/doc/kinfocenter/blockdevices/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/doc/kinfocenter/blockdevices/Makefile.in 2005-05-25 07:52:44.459482670 +0200
-@@ -162,6 +162,9 @@
+@@ -536,7 +539,7 @@
+ KDE_DIST=index.docbook index.cache.bz2 Makefile.in khexedit1.png Makefile.am
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook khexedit1.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) khexedit1.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
+@@ -563,20 +566,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khexedit
+- @for base in index.docbook khexedit1.png ; do \
++ @for base in khexedit1.png index.docbook ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khexedit/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khexedit/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in index.docbook khexedit1.png ; do \
++ for base in khexedit1.png index.docbook ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khexedit/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in index.docbook khexedit1.png ; do \
++ for file in khexedit1.png index.docbook ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
+diff -Nru kdeutils-3.4.2.orig/doc/kinfocenter/blockdevices/Makefile.in kdeutils-3.4.2/doc/kinfocenter/blockdevices/Makefile.in
+--- kdeutils-3.4.2.orig/doc/kinfocenter/blockdevices/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/doc/kinfocenter/blockdevices/Makefile.in 2005-08-02 16:59:36.610475240 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -163,6 +163,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7682,7 +8515,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -347,7 +350,7 @@
+@@ -348,7 +351,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7691,7 +8524,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -385,9 +388,9 @@
+@@ -386,9 +389,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7703,10 +8536,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/doc/kinfocenter/Makefile.in kdeutils-3.4.1/doc/kinfocenter/Makefile.in
---- kdeutils-3.4.1.orig/doc/kinfocenter/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/doc/kinfocenter/Makefile.in 2005-05-25 07:52:44.453483214 +0200
-@@ -178,6 +178,9 @@
+diff -Nru kdeutils-3.4.2.orig/doc/kinfocenter/Makefile.in kdeutils-3.4.2/doc/kinfocenter/Makefile.in
+--- kdeutils-3.4.2.orig/doc/kinfocenter/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/doc/kinfocenter/Makefile.in 2005-08-02 16:59:36.582479496 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -179,6 +179,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7716,7 +8555,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -366,7 +369,7 @@
+@@ -367,7 +370,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -7725,7 +8564,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -404,9 +407,9 @@
+@@ -405,9 +408,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7737,10 +8576,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/doc/kjots/Makefile.in kdeutils-3.4.1/doc/kjots/Makefile.in
---- kdeutils-3.4.1.orig/doc/kjots/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/doc/kjots/Makefile.in 2005-05-25 07:52:44.465482126 +0200
-@@ -162,6 +162,9 @@
+diff -Nru kdeutils-3.4.2.orig/doc/kjots/Makefile.in kdeutils-3.4.2/doc/kjots/Makefile.in
+--- kdeutils-3.4.2.orig/doc/kjots/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/doc/kjots/Makefile.in 2005-08-02 16:59:36.647469616 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -163,6 +163,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7750,7 +8595,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -347,7 +350,7 @@
+@@ -348,7 +351,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7759,7 +8604,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -385,9 +388,9 @@
+@@ -386,9 +389,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7771,10 +8616,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/doc/KRegExpEditor/Makefile.in kdeutils-3.4.1/doc/KRegExpEditor/Makefile.in
---- kdeutils-3.4.1.orig/doc/KRegExpEditor/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/doc/KRegExpEditor/Makefile.in 2005-05-25 07:52:44.334494001 +0200
-@@ -162,6 +162,9 @@
+diff -Nru kdeutils-3.4.2.orig/doc/KRegExpEditor/Makefile.in kdeutils-3.4.2/doc/KRegExpEditor/Makefile.in
+--- kdeutils-3.4.2.orig/doc/KRegExpEditor/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/doc/KRegExpEditor/Makefile.in 2005-08-02 16:59:35.089706432 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -163,6 +163,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7784,7 +8635,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -348,7 +351,7 @@
+@@ -349,7 +352,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7793,7 +8644,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -386,9 +389,9 @@
+@@ -387,9 +390,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7805,10 +8656,53 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/doc/ksim/Makefile.in kdeutils-3.4.1/doc/ksim/Makefile.in
---- kdeutils-3.4.1.orig/doc/ksim/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/doc/ksim/Makefile.in 2005-05-25 07:52:44.472481492 +0200
-@@ -162,6 +162,9 @@
+@@ -534,10 +537,10 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=repeattool.png begline.png lookaheadtools.png index.docbook characters.png wordboundary.png neglookahead.png compound.png poslookahead.png charactertool.png repeat.png select.png compoundtool.png index.cache.bz2 theEditor.png altntool.png anychartool.png endline.png linestartendtool.png texttool.png boundarytools.png Makefile.in anychar.png nonwordboundary.png text.png altn.png Makefile.am
++KDE_DIST=repeattool.png begline.png lookaheadtools.png index.docbook characters.png wordboundary.png neglookahead.png poslookahead.png compound.png charactertool.png repeat.png select.png compoundtool.png index.cache.bz2 theEditor.png altntool.png anychartool.png endline.png linestartendtool.png texttool.png boundarytools.png Makefile.in anychar.png nonwordboundary.png text.png altn.png Makefile.am
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook altntool.png altn.png boundarytools.png begline.png lookaheadtools.png poslookahead.png endline.png repeattool.png characters.png select.png wordboundary.png repeat.png neglookahead.png compoundtool.png texttool.png anychartool.png compound.png text.png anychar.png theEditor.png linestartendtool.png charactertool.png nonwordboundary.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) characters.png repeattool.png linestartendtool.png charactertool.png begline.png lookaheadtools.png anychar.png neglookahead.png compound.png anychartool.png boundarytools.png select.png text.png poslookahead.png compoundtool.png repeat.png texttool.png altntool.png wordboundary.png nonwordboundary.png endline.png index.docbook altn.png theEditor.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
+@@ -564,20 +567,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/KRegExpEditor
+- @for base in index.docbook altntool.png altn.png boundarytools.png begline.png lookaheadtools.png poslookahead.png endline.png repeattool.png characters.png select.png wordboundary.png repeat.png neglookahead.png compoundtool.png texttool.png anychartool.png compound.png text.png anychar.png theEditor.png linestartendtool.png charactertool.png nonwordboundary.png ; do \
++ @for base in characters.png repeattool.png linestartendtool.png charactertool.png begline.png lookaheadtools.png anychar.png neglookahead.png compound.png anychartool.png boundarytools.png select.png text.png poslookahead.png compoundtool.png repeat.png texttool.png altntool.png wordboundary.png nonwordboundary.png endline.png index.docbook altn.png theEditor.png ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/KRegExpEditor/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/KRegExpEditor/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in index.docbook altntool.png altn.png boundarytools.png begline.png lookaheadtools.png poslookahead.png endline.png repeattool.png characters.png select.png wordboundary.png repeat.png neglookahead.png compoundtool.png texttool.png anychartool.png compound.png text.png anychar.png theEditor.png linestartendtool.png charactertool.png nonwordboundary.png ; do \
++ for base in characters.png repeattool.png linestartendtool.png charactertool.png begline.png lookaheadtools.png anychar.png neglookahead.png compound.png anychartool.png boundarytools.png select.png text.png poslookahead.png compoundtool.png repeat.png texttool.png altntool.png wordboundary.png nonwordboundary.png endline.png index.docbook altn.png theEditor.png ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/KRegExpEditor/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in index.docbook altntool.png altn.png boundarytools.png begline.png lookaheadtools.png poslookahead.png endline.png repeattool.png characters.png select.png wordboundary.png repeat.png neglookahead.png compoundtool.png texttool.png anychartool.png compound.png text.png anychar.png theEditor.png linestartendtool.png charactertool.png nonwordboundary.png ; do \
++ for file in characters.png repeattool.png linestartendtool.png charactertool.png begline.png lookaheadtools.png anychar.png neglookahead.png compound.png anychartool.png boundarytools.png select.png text.png poslookahead.png compoundtool.png repeat.png texttool.png altntool.png wordboundary.png nonwordboundary.png endline.png index.docbook altn.png theEditor.png ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
+diff -Nru kdeutils-3.4.2.orig/doc/ksim/Makefile.in kdeutils-3.4.2/doc/ksim/Makefile.in
+--- kdeutils-3.4.2.orig/doc/ksim/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/doc/ksim/Makefile.in 2005-08-02 16:59:36.691462928 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -163,6 +163,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7818,7 +8712,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -347,7 +350,7 @@
+@@ -348,7 +351,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7827,7 +8721,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -385,9 +388,9 @@
+@@ -386,9 +389,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7839,10 +8733,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/doc/ktimer/Makefile.in kdeutils-3.4.1/doc/ktimer/Makefile.in
---- kdeutils-3.4.1.orig/doc/ktimer/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/doc/ktimer/Makefile.in 2005-05-25 07:52:44.478480948 +0200
-@@ -162,6 +162,9 @@
+diff -Nru kdeutils-3.4.2.orig/doc/ktimer/Makefile.in kdeutils-3.4.2/doc/ktimer/Makefile.in
+--- kdeutils-3.4.2.orig/doc/ktimer/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/doc/ktimer/Makefile.in 2005-08-02 16:59:36.741455328 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -163,6 +163,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7852,7 +8752,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -347,7 +350,7 @@
+@@ -348,7 +351,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7861,7 +8761,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -385,9 +388,9 @@
+@@ -386,9 +389,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7873,10 +8773,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/doc/kwallet/Makefile.in kdeutils-3.4.1/doc/kwallet/Makefile.in
---- kdeutils-3.4.1.orig/doc/kwallet/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/doc/kwallet/Makefile.in 2005-05-25 07:52:44.484480404 +0200
-@@ -162,6 +162,9 @@
+diff -Nru kdeutils-3.4.2.orig/doc/kwallet/Makefile.in kdeutils-3.4.2/doc/kwallet/Makefile.in
+--- kdeutils-3.4.2.orig/doc/kwallet/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/doc/kwallet/Makefile.in 2005-08-02 16:59:36.779449552 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -163,6 +163,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7886,7 +8792,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -347,7 +350,7 @@
+@@ -348,7 +351,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7895,7 +8801,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -385,9 +388,9 @@
+@@ -386,9 +389,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7907,10 +8813,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/doc/Makefile.in kdeutils-3.4.1/doc/Makefile.in
---- kdeutils-3.4.1.orig/doc/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/doc/Makefile.in 2005-05-25 07:52:44.342493276 +0200
-@@ -178,6 +178,9 @@
+diff -Nru kdeutils-3.4.2.orig/doc/Makefile.in kdeutils-3.4.2/doc/Makefile.in
+--- kdeutils-3.4.2.orig/doc/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/doc/Makefile.in 2005-08-02 16:59:35.171693968 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -179,6 +179,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7920,7 +8832,14 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -366,7 +369,7 @@
+@@ -361,13 +364,13 @@
+ KDE_DOCS = AUTO
+ #>- SUBDIRS = $(AUTODIRS)
+ #>+ 1
+-SUBDIRS =. kfloppy kgpg kcharselect kjots ktimer kcontrol kedit ksim kwallet kdf khexedit kinfocenter KRegExpEditor kdelirc kcalc ark
++SUBDIRS =. ark kdf kgpg ksim kdelirc kfloppy khexedit kcalc kedit kjots kwallet kcontrol ktimer kcharselect KRegExpEditor kinfocenter
+ #>- all: all-recursive
+ #>+ 1
all: docs-am all-recursive
.SUFFIXES:
@@ -7929,7 +8848,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -404,9 +407,9 @@
+@@ -405,9 +408,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7941,10 +8860,38 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/kcalc/Makefile.in kdeutils-3.4.1/kcalc/Makefile.in
---- kdeutils-3.4.1.orig/kcalc/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/kcalc/Makefile.in 2005-05-25 07:52:44.557473787 +0200
-@@ -233,6 +233,9 @@
+diff -Nru kdeutils-3.4.2.orig/kcalc/Makefile.in kdeutils-3.4.2/kcalc/Makefile.in
+--- kdeutils-3.4.2.orig/kcalc/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/kcalc/Makefile.in 2005-08-02 16:59:37.314368232 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,10 +18,6 @@
+
+
+
+-#>- SOURCES = $(kcalc_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kcalc_la_SOURCES) $(kcalc_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -108,7 +104,9 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(kcalc_la_SOURCES)
++#>- SOURCES = $(kcalc_la_SOURCES)
++#>+ 1
++SOURCES = $(kcalc_la_SOURCES) $(kcalc_SOURCES)
+ #>- DIST_SOURCES = $(kcalc_la_SOURCES)
+ #>+ 1
+ DIST_SOURCES = $(kcalc_la_SOURCES) $(kcalc_SOURCES)
+@@ -234,6 +232,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7954,7 +8901,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -449,7 +452,7 @@
+@@ -450,7 +451,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -7963,7 +8910,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -487,9 +490,9 @@
+@@ -488,9 +489,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7975,10 +8922,89 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -rua kdeutils-3.4.1.orig/kcharselect/Makefile.in kdeutils-3.4.1/kcharselect/Makefile.in
---- kdeutils-3.4.1.orig/kcharselect/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/kcharselect/Makefile.in 2005-05-25 07:52:44.568472789 +0200
-@@ -214,6 +214,9 @@
+@@ -941,18 +942,18 @@
+ mocs: kcalc_const_button.moc
+
+ #>+ 3
+-dlabel.moc: $(srcdir)/dlabel.h
+- $(MOC) $(srcdir)/dlabel.h -o dlabel.moc
++kcalc_const_menu.moc: $(srcdir)/kcalc_const_menu.h
++ $(MOC) $(srcdir)/kcalc_const_menu.h -o kcalc_const_menu.moc
+
+ #>+ 2
+-mocs: dlabel.moc
++mocs: kcalc_const_menu.moc
+
+ #>+ 3
+-kcalc_const_menu.moc: $(srcdir)/kcalc_const_menu.h
+- $(MOC) $(srcdir)/kcalc_const_menu.h -o kcalc_const_menu.moc
++dlabel.moc: $(srcdir)/dlabel.h
++ $(MOC) $(srcdir)/dlabel.h -o dlabel.moc
+
+ #>+ 2
+-mocs: kcalc_const_menu.moc
++mocs: dlabel.moc
+
+ #>+ 3
+ kcalc_button.moc: $(srcdir)/kcalc_button.h
+@@ -963,7 +964,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f kcalc.moc kcalcdisplay.moc kcalc_const_button.moc dlabel.moc kcalc_const_menu.moc kcalc_button.moc
++ -rm -f kcalc.moc kcalcdisplay.moc kcalc_const_button.moc kcalc_const_menu.moc dlabel.moc kcalc_button.moc
+
+ #>+ 2
+ KDE_DIST=cr32-app-kcalc.png cr48-app-kcalc.png cr64-app-kcalc.png kcalc.kcfg kcalc.desktop confvalues.h colors.ui kcalcui.rc constants.ui configure.in.in kcalcrc.upd general.ui kcalc_settings.kcfgc Makefile.in cr16-app-kcalc.png ToDo crsc-app-kcalc.svgz version.h Makefile.am
+@@ -985,23 +986,23 @@
+
+ #>+ 19
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+- $(INSTALL_DATA) $(srcdir)/cr64-app-kcalc.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcalc.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/cr48-app-kcalc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcalc.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
+- $(INSTALL_DATA) $(srcdir)/crsc-app-kcalc.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcalc.svgz
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/cr32-app-kcalc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcalc.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/cr16-app-kcalc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcalc.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
++ $(INSTALL_DATA) $(srcdir)/cr64-app-kcalc.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcalc.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
++ $(INSTALL_DATA) $(srcdir)/crsc-app-kcalc.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcalc.svgz
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcalc.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcalc.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcalc.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcalc.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcalc.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcalc.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcalc.svgz
+
+ #>+ 15
+ force-reedit:
+diff -Nru kdeutils-3.4.2.orig/kcharselect/Makefile.in kdeutils-3.4.2/kcharselect/Makefile.in
+--- kdeutils-3.4.2.orig/kcharselect/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/kcharselect/Makefile.in 2005-08-02 16:59:37.398355464 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(kcharselect_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -215,6 +213,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7988,7 +9014,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -410,7 +411,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -7997,7 +9023,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -448,9 +449,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8009,10 +9035,34 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -rua kdeutils-3.4.1.orig/kdelirc/icons/Makefile.in kdeutils-3.4.1/kdelirc/icons/Makefile.in
---- kdeutils-3.4.1.orig/kdelirc/icons/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/kdelirc/icons/Makefile.in 2005-05-25 07:52:44.583471430 +0200
-@@ -162,6 +162,9 @@
+@@ -783,14 +784,14 @@
+
+ #>+ 10
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kcharselect.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcharselect.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/cr48-app-kcharselect.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcharselect.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kcharselect.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcharselect.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcharselect.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcharselect.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcharselect.png
+
+ #>+ 15
+ force-reedit:
+diff -Nru kdeutils-3.4.2.orig/kdelirc/icons/Makefile.in kdeutils-3.4.2/kdelirc/icons/Makefile.in
+--- kdeutils-3.4.2.orig/kdelirc/icons/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/kdelirc/icons/Makefile.in 2005-08-02 16:59:37.497340416 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -163,6 +163,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8022,7 +9072,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -347,7 +350,7 @@
+@@ -348,7 +351,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8031,7 +9081,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -385,9 +388,9 @@
+@@ -386,9 +389,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8043,10 +9093,90 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/kdelirc/irkick/icons/Makefile.in kdeutils-3.4.1/kdelirc/irkick/icons/Makefile.in
---- kdeutils-3.4.1.orig/kdelirc/irkick/icons/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/kdelirc/irkick/icons/Makefile.in 2005-05-25 07:52:44.610468982 +0200
-@@ -162,6 +162,9 @@
+@@ -531,7 +534,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=hi32-action-ledblue.png hi16-action-ledlightblue.png hi32-action-ledlightblue.png hi32-action-ledred.png hi16-action-ledorange.png hi16-action-ledred.png hi16-action-ledyellow.png hi32-action-ledorange.png hi16-action-ledpurple.png hi32-action-ledlightgreen.png hi32-action-ledpurple.png hi32-action-ledyellow.png hi16-action-ledlightgreen.png Makefile.in hi16-action-ledgreen.png hi32-action-ledgreen.png Makefile.am hi16-action-ledblue.png
++KDE_DIST=hi32-action-ledblue.png hi16-action-ledlightblue.png hi32-action-ledlightblue.png hi32-action-ledred.png hi16-action-ledorange.png hi16-action-ledred.png hi16-action-ledyellow.png hi32-action-ledorange.png hi16-action-ledpurple.png hi32-action-ledlightgreen.png hi32-action-ledpurple.png hi16-action-ledlightgreen.png hi32-action-ledyellow.png Makefile.in hi16-action-ledgreen.png hi32-action-ledgreen.png Makefile.am hi16-action-ledblue.png
+
+ #>+ 2
+ docs-am:
+@@ -539,41 +542,41 @@
+ #>+ 38
+ install-kde-icons:
+ $(mkinstalldirs) $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions
+- $(INSTALL_DATA) $(srcdir)/hi32-action-ledpurple.png $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledpurple.png
+- $(mkinstalldirs) $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions
+- $(INSTALL_DATA) $(srcdir)/hi16-action-ledblue.png $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledblue.png
++ $(INSTALL_DATA) $(srcdir)/hi32-action-ledlightblue.png $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledlightblue.png
+ $(INSTALL_DATA) $(srcdir)/hi32-action-ledgreen.png $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledgreen.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-ledlightgreen.png $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledlightgreen.png
++ $(mkinstalldirs) $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions
++ $(INSTALL_DATA) $(srcdir)/hi16-action-ledorange.png $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledorange.png
++ $(INSTALL_DATA) $(srcdir)/hi32-action-ledblue.png $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledblue.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-ledred.png $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledred.png
+ $(INSTALL_DATA) $(srcdir)/hi16-action-ledgreen.png $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledgreen.png
+- $(INSTALL_DATA) $(srcdir)/hi32-action-ledlightgreen.png $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledlightgreen.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-ledpurple.png $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledpurple.png
+- $(INSTALL_DATA) $(srcdir)/hi32-action-ledred.png $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledred.png
+- $(INSTALL_DATA) $(srcdir)/hi32-action-ledorange.png $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledorange.png
+ $(INSTALL_DATA) $(srcdir)/hi32-action-ledyellow.png $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledyellow.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-ledred.png $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledred.png
++ $(INSTALL_DATA) $(srcdir)/hi32-action-ledpurple.png $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledpurple.png
++ $(INSTALL_DATA) $(srcdir)/hi32-action-ledred.png $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledred.png
+ $(INSTALL_DATA) $(srcdir)/hi16-action-ledyellow.png $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledyellow.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-ledorange.png $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledorange.png
+- $(INSTALL_DATA) $(srcdir)/hi32-action-ledlightblue.png $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledlightblue.png
+ $(INSTALL_DATA) $(srcdir)/hi16-action-ledlightblue.png $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledlightblue.png
+- $(INSTALL_DATA) $(srcdir)/hi32-action-ledblue.png $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledblue.png
++ $(INSTALL_DATA) $(srcdir)/hi32-action-ledlightgreen.png $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledlightgreen.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-ledblue.png $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledblue.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-ledlightgreen.png $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledlightgreen.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-ledpurple.png $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledpurple.png
++ $(INSTALL_DATA) $(srcdir)/hi32-action-ledorange.png $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledorange.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledpurple.png
+- -rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledblue.png
++ -rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledlightblue.png
+ -rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledgreen.png
+- -rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledlightgreen.png
++ -rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledorange.png
++ -rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledblue.png
++ -rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledred.png
+ -rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledgreen.png
+- -rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledlightgreen.png
+- -rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledpurple.png
+- -rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledred.png
+- -rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledorange.png
+ -rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledyellow.png
+- -rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledred.png
++ -rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledpurple.png
++ -rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledred.png
+ -rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledyellow.png
+- -rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledorange.png
+- -rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledlightblue.png
+ -rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledlightblue.png
+- -rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledblue.png
++ -rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledlightgreen.png
++ -rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledblue.png
++ -rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledlightgreen.png
++ -rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledpurple.png
++ -rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledorange.png
+
+ #>+ 15
+ force-reedit:
+diff -Nru kdeutils-3.4.2.orig/kdelirc/irkick/icons/Makefile.in kdeutils-3.4.2/kdelirc/irkick/icons/Makefile.in
+--- kdeutils-3.4.2.orig/kdelirc/irkick/icons/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/kdelirc/irkick/icons/Makefile.in 2005-08-02 16:59:37.660315640 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -163,6 +163,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8056,7 +9186,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -347,7 +350,7 @@
+@@ -348,7 +351,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8065,7 +9195,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -385,9 +388,9 @@
+@@ -386,9 +389,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8077,10 +9207,38 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/kdelirc/irkick/Makefile.in kdeutils-3.4.1/kdelirc/irkick/Makefile.in
---- kdeutils-3.4.1.orig/kdelirc/irkick/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/kdelirc/irkick/Makefile.in 2005-05-25 07:52:44.604469526 +0200
-@@ -253,6 +253,9 @@
+diff -Nru kdeutils-3.4.2.orig/kdelirc/irkick/Makefile.in kdeutils-3.4.2/kdelirc/irkick/Makefile.in
+--- kdeutils-3.4.2.orig/kdelirc/irkick/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/kdelirc/irkick/Makefile.in 2005-08-02 16:59:37.614322632 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,10 +18,6 @@
+
+
+
+-#>- SOURCES = $(irkick_la_SOURCES) $(libirkick_common_la_SOURCES)
+-#>+ 1
+-SOURCES = $(irkick_la_SOURCES) $(libirkick_common_la_SOURCES) $(irkick_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -116,7 +112,9 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(irkick_la_SOURCES) $(libirkick_common_la_SOURCES)
++#>- SOURCES = $(irkick_la_SOURCES) $(libirkick_common_la_SOURCES)
++#>+ 1
++SOURCES = $(irkick_la_SOURCES) $(libirkick_common_la_SOURCES) $(irkick_SOURCES)
+ #>- DIST_SOURCES = $(irkick_la_SOURCES) $(libirkick_common_la_SOURCES)
+ #>+ 1
+ DIST_SOURCES = $(irkick_la_SOURCES) $(libirkick_common_la_SOURCES) $(irkick_SOURCES)
+@@ -254,6 +252,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8090,7 +9248,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -468,7 +471,7 @@
+@@ -469,7 +470,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8099,7 +9257,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -506,9 +509,9 @@
+@@ -507,9 +508,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8111,10 +9269,54 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -rua kdeutils-3.4.1.orig/kdelirc/kcmlirc/Makefile.in kdeutils-3.4.1/kdelirc/kcmlirc/Makefile.in
---- kdeutils-3.4.1.orig/kdelirc/kcmlirc/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/kdelirc/kcmlirc/Makefile.in 2005-05-25 07:52:44.633466897 +0200
-@@ -216,6 +216,9 @@
+@@ -1057,22 +1058,22 @@
+
+ #>+ 19
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/hi22-app-irkick.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/irkick.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-irkick.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/irkick.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-irkick.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/irkick.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/lo32-app-irkick.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/irkick.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-irkick.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/irkick.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-irkick.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/irkick.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/lo16-app-irkick.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/irkick.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/irkick.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/irkick.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/irkick.png
+ -rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/irkick.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/irkick.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/irkick.png
+ -rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/irkick.png
+
+ #>+ 15
+diff -Nru kdeutils-3.4.2.orig/kdelirc/kcmlirc/Makefile.in kdeutils-3.4.2/kdelirc/kcmlirc/Makefile.in
+--- kdeutils-3.4.2.orig/kdelirc/kcmlirc/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/kdelirc/kcmlirc/Makefile.in 2005-08-02 16:59:37.800294360 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kcm_kcmlirc_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -217,6 +215,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8124,7 +9326,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -414,7 +417,7 @@
+@@ -415,7 +416,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8133,7 +9335,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -452,9 +455,9 @@
+@@ -453,9 +454,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8145,10 +9347,68 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -rua kdeutils-3.4.1.orig/kdelirc/kdelirc/Makefile.in kdeutils-3.4.1/kdelirc/kdelirc/Makefile.in
---- kdeutils-3.4.1.orig/kdelirc/kdelirc/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/kdelirc/kdelirc/Makefile.in 2005-05-25 07:52:44.644465900 +0200
-@@ -205,6 +205,9 @@
+@@ -761,18 +762,18 @@
+ mocs: editmode.moc
+
+ #>+ 3
+-kcmlirc.moc: $(srcdir)/kcmlirc.h
+- $(MOC) $(srcdir)/kcmlirc.h -o kcmlirc.moc
++editaction.moc: $(srcdir)/editaction.h
++ $(MOC) $(srcdir)/editaction.h -o editaction.moc
+
+ #>+ 2
+-mocs: kcmlirc.moc
++mocs: editaction.moc
+
+ #>+ 3
+-editaction.moc: $(srcdir)/editaction.h
+- $(MOC) $(srcdir)/editaction.h -o editaction.moc
++kcmlirc.moc: $(srcdir)/kcmlirc.h
++ $(MOC) $(srcdir)/kcmlirc.h -o kcmlirc.moc
+
+ #>+ 2
+-mocs: editaction.moc
++mocs: kcmlirc.moc
+
+ #>+ 3
+ modeslist.moc: $(srcdir)/modeslist.h
+@@ -790,7 +791,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f editmode.moc kcmlirc.moc editaction.moc modeslist.moc addaction.moc
++ -rm -f editmode.moc editaction.moc kcmlirc.moc modeslist.moc addaction.moc
+
+ #>+ 2
+ KDE_DIST=newmode.ui selectprofile.ui newmode.ui.h editmodebase.ui kcmlirc.desktop editaction.h addactionbase.ui kcmlircbase.ui editactionbase.ui Makefile.in kcmlircbase.ui.h modeslist.h editmode.h Makefile.am
+@@ -856,7 +857,7 @@
+
+
+ #>+ 11
+-kcm_kcmlirc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmlirc.cpp $(srcdir)/addaction.cpp $(srcdir)/editmode.cpp $(srcdir)/editaction.cpp $(srcdir)/modeslist.cpp kcmlirc_skel.cpp selectprofile.cpp newmode.cpp kcmlircbase.cpp addactionbase.cpp editactionbase.cpp editmodebase.cpp editmode.moc modeslist.moc newmode.moc addaction.moc addactionbase.moc kcmlirc.moc editaction.moc editactionbase.moc selectprofile.moc kcmlircbase.moc editmodebase.moc
++kcm_kcmlirc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmlirc.cpp $(srcdir)/addaction.cpp $(srcdir)/editmode.cpp $(srcdir)/editaction.cpp $(srcdir)/modeslist.cpp kcmlirc_skel.cpp selectprofile.cpp newmode.cpp kcmlircbase.cpp addactionbase.cpp editactionbase.cpp editmodebase.cpp editmode.moc modeslist.moc newmode.moc addaction.moc addactionbase.moc editaction.moc kcmlirc.moc editactionbase.moc selectprofile.moc kcmlircbase.moc editmodebase.moc
+ @echo 'creating kcm_kcmlirc_la.all_cpp.cpp ...'; \
+ rm -f kcm_kcmlirc_la.all_cpp.files kcm_kcmlirc_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kcm_kcmlirc_la.all_cpp.final; \
+diff -Nru kdeutils-3.4.2.orig/kdelirc/kdelirc/Makefile.in kdeutils-3.4.2/kdelirc/kdelirc/Makefile.in
+--- kdeutils-3.4.2.orig/kdelirc/kdelirc/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/kdelirc/kdelirc/Makefile.in 2005-08-02 16:59:37.911277488 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkdelirc_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -206,6 +204,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8158,7 +9418,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -424,7 +427,7 @@
+@@ -425,7 +426,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8167,7 +9427,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -462,9 +465,9 @@
+@@ -463,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8179,10 +9439,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -rua kdeutils-3.4.1.orig/kdelirc/Makefile.in kdeutils-3.4.1/kdelirc/Makefile.in
---- kdeutils-3.4.1.orig/kdelirc/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/kdelirc/Makefile.in 2005-05-25 07:52:44.575472155 +0200
-@@ -179,6 +179,9 @@
+diff -Nru kdeutils-3.4.2.orig/kdelirc/Makefile.in kdeutils-3.4.2/kdelirc/Makefile.in
+--- kdeutils-3.4.2.orig/kdelirc/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/kdelirc/Makefile.in 2005-08-02 16:59:37.440349080 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -180,6 +180,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8192,7 +9458,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -363,7 +366,7 @@
+@@ -364,7 +367,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -8201,7 +9467,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -401,9 +404,9 @@
+@@ -402,9 +405,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8213,10 +9479,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/kdelirc/profiles/Makefile.in kdeutils-3.4.1/kdelirc/profiles/Makefile.in
---- kdeutils-3.4.1.orig/kdelirc/profiles/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/kdelirc/profiles/Makefile.in 2005-05-25 07:52:44.650465356 +0200
-@@ -172,6 +172,9 @@
+diff -Nru kdeutils-3.4.2.orig/kdelirc/profiles/Makefile.in kdeutils-3.4.2/kdelirc/profiles/Makefile.in
+--- kdeutils-3.4.2.orig/kdelirc/profiles/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/kdelirc/profiles/Makefile.in 2005-08-02 16:59:37.957270496 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -173,6 +173,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8226,7 +9498,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -358,7 +361,7 @@
+@@ -359,7 +362,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8235,7 +9507,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -396,9 +399,9 @@
+@@ -397,9 +400,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8247,10 +9519,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/kdelirc/remotes/Makefile.in kdeutils-3.4.1/kdelirc/remotes/Makefile.in
---- kdeutils-3.4.1.orig/kdelirc/remotes/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/kdelirc/remotes/Makefile.in 2005-05-25 07:52:44.656464812 +0200
-@@ -172,6 +172,9 @@
+@@ -559,7 +562,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=konqueror.profile.xml noatun.profile.xml profile.dtd Makefile.in klauncher.profile.xml Makefile.am
++KDE_DIST=konqueror.profile.xml noatun.profile.xml profile.dtd Makefile.in Makefile.am klauncher.profile.xml
+
+ #>+ 2
+ docs-am:
+diff -Nru kdeutils-3.4.2.orig/kdelirc/remotes/Makefile.in kdeutils-3.4.2/kdelirc/remotes/Makefile.in
+--- kdeutils-3.4.2.orig/kdelirc/remotes/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/kdelirc/remotes/Makefile.in 2005-08-02 16:59:37.997264416 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -173,6 +173,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8260,7 +9547,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -360,7 +363,7 @@
+@@ -361,7 +364,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8269,7 +9556,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -398,9 +401,9 @@
+@@ -399,9 +402,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8281,10 +9568,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/kdessh/Makefile.in kdeutils-3.4.1/kdessh/Makefile.in
---- kdeutils-3.4.1.orig/kdessh/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/kdessh/Makefile.in 2005-05-25 07:52:44.665463997 +0200
-@@ -204,6 +204,9 @@
+diff -Nru kdeutils-3.4.2.orig/kdessh/Makefile.in kdeutils-3.4.2/kdessh/Makefile.in
+--- kdeutils-3.4.2.orig/kdessh/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/kdessh/Makefile.in 2005-08-02 16:59:38.078252104 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(kdessh_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -205,6 +203,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8294,7 +9596,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -395,7 +398,7 @@
+@@ -396,7 +397,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8303,7 +9605,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -433,9 +436,9 @@
+@@ -434,9 +435,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8315,10 +9617,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -rua kdeutils-3.4.1.orig/kdf/Makefile.in kdeutils-3.4.1/kdf/Makefile.in
---- kdeutils-3.4.1.orig/kdf/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/kdf/Makefile.in 2005-05-25 07:52:44.693461458 +0200
-@@ -251,6 +251,9 @@
+diff -Nru kdeutils-3.4.2.orig/kdf/Makefile.in kdeutils-3.4.2/kdf/Makefile.in
+--- kdeutils-3.4.2.orig/kdf/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/kdf/Makefile.in 2005-08-02 16:59:38.242227176 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+
+
+
+-SOURCES = $(kcm_kdf_la_SOURCES) $(libkdf_common_la_SOURCES) $(kdf_SOURCES) $(kwikdisk_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -252,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8328,7 +9645,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,7 +463,7 @@
+@@ -461,7 +462,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8337,7 +9654,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -498,9 +501,9 @@
+@@ -499,9 +500,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8349,10 +9666,62 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -rua kdeutils-3.4.1.orig/kdf/pics/Makefile.in kdeutils-3.4.1/kdf/pics/Makefile.in
---- kdeutils-3.4.1.orig/kdf/pics/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/kdf/pics/Makefile.in 2005-05-25 07:52:44.702460643 +0200
-@@ -172,6 +172,9 @@
+@@ -1001,13 +1002,6 @@
+ mocs: disks.moc
+
+ #>+ 3
+-kdfconfig.moc: $(srcdir)/kdfconfig.h
+- $(MOC) $(srcdir)/kdfconfig.h -o kdfconfig.moc
+-
+-#>+ 2
+-mocs: kdfconfig.moc
+-
+-#>+ 3
+ listview.moc: $(srcdir)/listview.h
+ $(MOC) $(srcdir)/listview.h -o listview.moc
+
+@@ -1022,6 +1016,13 @@
+ mocs: kcmdf.moc
+
+ #>+ 3
++kdfconfig.moc: $(srcdir)/kdfconfig.h
++ $(MOC) $(srcdir)/kdfconfig.h -o kdfconfig.moc
++
++#>+ 2
++mocs: kdfconfig.moc
++
++#>+ 3
+ kdf.moc: $(srcdir)/kdf.h
+ $(MOC) $(srcdir)/kdf.h -o kdf.moc
+
+@@ -1044,7 +1045,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f kdfwidget.moc disklist.moc mntconfig.moc disks.moc kdfconfig.moc listview.moc kcmdf.moc kdf.moc kwikdisk.moc optiondialog.moc
++ -rm -f kdfwidget.moc disklist.moc mntconfig.moc disks.moc listview.moc kcmdf.moc kdfconfig.moc kdf.moc kwikdisk.moc optiondialog.moc
+
+ #>+ 2
+ KDE_DIST=kdfui.rc kconftest.cpp kwikdisk.desktop kdf.desktop Makefile.in kcmdf.desktop Makefile.am
+@@ -1095,7 +1096,7 @@
+
+
+ #>+ 11
+-libkdf_common_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kdfwidget.cpp $(srcdir)/kdfconfig.cpp $(srcdir)/mntconfig.cpp $(srcdir)/disklist.cpp $(srcdir)/disks.cpp $(srcdir)/listview.cpp $(srcdir)/optiondialog.cpp $(srcdir)/stdoption.cpp kdfwidget.moc disklist.moc mntconfig.moc disks.moc kdfconfig.moc listview.moc optiondialog.moc
++libkdf_common_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kdfwidget.cpp $(srcdir)/kdfconfig.cpp $(srcdir)/mntconfig.cpp $(srcdir)/disklist.cpp $(srcdir)/disks.cpp $(srcdir)/listview.cpp $(srcdir)/optiondialog.cpp $(srcdir)/stdoption.cpp kdfwidget.moc disklist.moc mntconfig.moc disks.moc listview.moc kdfconfig.moc optiondialog.moc
+ @echo 'creating libkdf_common_la.all_cpp.cpp ...'; \
+ rm -f libkdf_common_la.all_cpp.files libkdf_common_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkdf_common_la.all_cpp.final; \
+diff -Nru kdeutils-3.4.2.orig/kdf/pics/Makefile.in kdeutils-3.4.2/kdf/pics/Makefile.in
+--- kdeutils-3.4.2.orig/kdf/pics/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/kdf/pics/Makefile.in 2005-08-02 16:59:38.304217752 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -173,6 +173,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8362,7 +9731,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -358,7 +361,7 @@
+@@ -359,7 +362,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8371,7 +9740,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -396,9 +399,9 @@
+@@ -397,9 +400,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8383,10 +9752,107 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/kedit/Makefile.in kdeutils-3.4.1/kedit/Makefile.in
---- kdeutils-3.4.1.orig/kedit/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/kedit/Makefile.in 2005-05-25 07:52:44.734457742 +0200
-@@ -250,6 +250,9 @@
+@@ -562,47 +565,47 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=cr32-app-kcmdf.png delete.png cr48-app-kdf.png cr16-app-kcmdf.png cr128-app-kwikdisk.png cr22-app-kwikdisk.png cr128-app-kdf.png mini-root.png cr48-app-kwikdisk.png cr32-app-kwikdisk.png cr16-app-kdf.png cr64-app-kdf.png Makefile.in cr64-app-kwikdisk.png tick.png cr16-app-kwikdisk.png cr32-app-kdf.png Makefile.am
++KDE_DIST=cr32-app-kcmdf.png delete.png cr48-app-kdf.png cr16-app-kcmdf.png cr128-app-kwikdisk.png cr22-app-kwikdisk.png cr128-app-kdf.png cr48-app-kwikdisk.png mini-root.png cr32-app-kwikdisk.png cr16-app-kdf.png cr64-app-kdf.png Makefile.in tick.png cr64-app-kwikdisk.png cr16-app-kwikdisk.png cr32-app-kdf.png Makefile.am
+
+ #>+ 2
+ docs-am:
+
+ #>+ 36
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdf.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmdf.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/cr64-app-kdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kdf.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kwikdisk.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwikdisk.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/cr128-app-kwikdisk.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kwikdisk.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdf.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/cr22-app-kwikdisk.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kwikdisk.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kwikdisk.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kwikdisk.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdf.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-kwikdisk.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwikdisk.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kwikdisk.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwikdisk.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdf.png
+ $(INSTALL_DATA) $(srcdir)/cr64-app-kwikdisk.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kwikdisk.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmdf.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kwikdisk.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kwikdisk.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+ $(INSTALL_DATA) $(srcdir)/cr128-app-kdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdf.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdf.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-kdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdf.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-kwikdisk.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kwikdisk.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdf.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/cr22-app-kwikdisk.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kwikdisk.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdf.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmdf.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kdf.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdf.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kwikdisk.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwikdisk.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwikdisk.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kwikdisk.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmdf.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kwikdisk.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kwikdisk.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdf.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdf.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwikdisk.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdf.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kwikdisk.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdf.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdf.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kwikdisk.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdf.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kwikdisk.png
+
+ #>+ 15
+ force-reedit:
+diff -Nru kdeutils-3.4.2.orig/kedit/Makefile.in kdeutils-3.4.2/kedit/Makefile.in
+--- kdeutils-3.4.2.orig/kedit/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/kedit/Makefile.in 2005-08-02 16:59:38.444196472 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -25,10 +25,6 @@
+
+
+
+-#>- SOURCES = $(kedit_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kedit_la_SOURCES) $(kedit_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -112,7 +108,9 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(kedit_la_SOURCES)
++#>- SOURCES = $(kedit_la_SOURCES)
++#>+ 1
++SOURCES = $(kedit_la_SOURCES) $(kedit_SOURCES)
+ #>- DIST_SOURCES = $(kedit_la_SOURCES)
+ #>+ 1
+ DIST_SOURCES = $(kedit_la_SOURCES) $(kedit_SOURCES)
+@@ -251,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8396,7 +9862,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -457,7 +460,7 @@
+@@ -458,7 +459,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8405,7 +9871,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -495,9 +498,9 @@
+@@ -496,9 +497,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8417,10 +9883,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -rua kdeutils-3.4.1.orig/kedit/pixmaps/Makefile.in kdeutils-3.4.1/kedit/pixmaps/Makefile.in
---- kdeutils-3.4.1.orig/kedit/pixmaps/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/kedit/pixmaps/Makefile.in 2005-05-25 07:52:44.741457107 +0200
-@@ -162,6 +162,9 @@
+diff -Nru kdeutils-3.4.2.orig/kedit/pixmaps/Makefile.in kdeutils-3.4.2/kedit/pixmaps/Makefile.in
+--- kdeutils-3.4.2.orig/kedit/pixmaps/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/kedit/pixmaps/Makefile.in 2005-08-02 16:59:38.476191608 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -163,6 +163,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8430,7 +9902,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -346,7 +349,7 @@
+@@ -347,7 +350,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8439,7 +9911,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -384,9 +387,9 @@
+@@ -385,9 +388,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8451,10 +9923,52 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/kfloppy/Makefile.in kdeutils-3.4.1/kfloppy/Makefile.in
---- kdeutils-3.4.1.orig/kfloppy/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/kfloppy/Makefile.in 2005-05-25 07:52:44.760455385 +0200
-@@ -213,6 +213,9 @@
+@@ -537,20 +540,20 @@
+
+ #>+ 16
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kedit.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kedit.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/cr16-app-kedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kedit.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/cr64-app-kedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kedit.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kedit.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kedit.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kedit.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kedit.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kedit.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kedit.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kedit.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kedit.png
+
+ #>+ 15
+ force-reedit:
+diff -Nru kdeutils-3.4.2.orig/kfloppy/Makefile.in kdeutils-3.4.2/kfloppy/Makefile.in
+--- kdeutils-3.4.2.orig/kfloppy/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/kfloppy/Makefile.in 2005-08-02 16:59:38.642166376 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kfloppy_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -214,6 +212,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8464,7 +9978,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -406,7 +407,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8473,7 +9987,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -444,9 +445,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8485,10 +9999,47 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -rua kdeutils-3.4.1.orig/kgpg/icons/Makefile.in kdeutils-3.4.1/kgpg/icons/Makefile.in
---- kdeutils-3.4.1.orig/kgpg/icons/Makefile.in 2005-05-23 18:15:14.000000000 +0200
-+++ kdeutils-3.4.1/kgpg/icons/Makefile.in 2005-05-25 07:52:45.028431091 +0200
-@@ -162,6 +162,9 @@
+@@ -743,7 +744,7 @@
+ -rm -f format.moc floppy.moc
+
+ #>+ 2
+-KDE_DIST=cr48-app-kfloppy.png format.h cr32-app-kfloppy.png cr64-app-kfloppy.png debug.h cr16-app-kfloppy.png Makefile.in KFloppy.desktop cr128-app-kfloppy.png Makefile.am
++KDE_DIST=cr48-app-kfloppy.png format.h cr32-app-kfloppy.png cr64-app-kfloppy.png debug.h cr16-app-kfloppy.png KFloppy.desktop Makefile.in cr128-app-kfloppy.png Makefile.am
+
+ #>+ 2
+ docs-am:
+@@ -754,18 +755,18 @@
+ $(INSTALL_DATA) $(srcdir)/cr128-app-kfloppy.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kfloppy.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/cr64-app-kfloppy.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kfloppy.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kfloppy.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfloppy.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/cr32-app-kfloppy.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfloppy.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kfloppy.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfloppy.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/cr16-app-kfloppy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfloppy.png
+
+ uninstall-kde-icons:
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kfloppy.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kfloppy.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfloppy.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfloppy.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfloppy.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfloppy.png
+
+ #>+ 15
+diff -Nru kdeutils-3.4.2.orig/kgpg/icons/Makefile.in kdeutils-3.4.2/kgpg/icons/Makefile.in
+--- kdeutils-3.4.2.orig/kgpg/icons/Makefile.in 2005-07-20 20:23:53.000000000 +0000
++++ kdeutils-3.4.2/kgpg/icons/Makefile.in 2005-08-02 16:59:40.178932752 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -163,6 +163,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8498,7 +10049,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -347,7 +350,7 @@
+@@ -348,7 +351,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8507,7 +10058,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -385,9 +388,9 @@
+@@ -386,9 +389,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8519,10 +10070,77 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/kgpg/Makefile.in kdeutils-3.4.1/kgpg/Makefile.in
---- kdeutils-3.4.1.orig/kgpg/Makefile.in 2005-05-23 18:15:14.000000000 +0200
-+++ kdeutils-3.4.1/kgpg/Makefile.in 2005-05-25 07:52:45.020431817 +0200
-@@ -244,6 +244,9 @@
+@@ -539,37 +542,37 @@
+ #>+ 34
+ install-kde-icons:
+ $(mkinstalldirs) $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions
+- $(INSTALL_DATA) $(srcdir)/cr22-action-kgpg_identity.png $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_identity.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-kgpg_edit.png $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_edit.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-kgpg_term.png $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_term.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-kgpg_gen.png $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_gen.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-kgpg_photo.png $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_photo.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-kgpg_import.png $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_import.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-kgpg_identity.png $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_identity.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-kgpg_info.png $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_info.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-kgpg_photo.png $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_photo.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-kgpg_edit.png $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_edit.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-kgpg_export.png $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_export.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-kgpg_show.png $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_show.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-kgpg_sign.png $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_sign.png
+ $(mkinstalldirs) $(DESTDIR)$(kgpgiconsdir)/crystalsvg/16x16/actions
+ $(INSTALL_DATA) $(srcdir)/cr16-action-kgpg_key1.png $(DESTDIR)$(kgpgiconsdir)/crystalsvg/16x16/actions/kgpg_key1.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-kgpg_key2.png $(DESTDIR)$(kgpgiconsdir)/crystalsvg/16x16/actions/kgpg_key2.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-kgpg_key3.png $(DESTDIR)$(kgpgiconsdir)/crystalsvg/16x16/actions/kgpg_key3.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-kgpg_key4.png $(DESTDIR)$(kgpgiconsdir)/crystalsvg/16x16/actions/kgpg_key4.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-kgpg_show.png $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_show.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-kgpg_sign.png $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_sign.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-kgpg_export.png $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_export.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-kgpg_term.png $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_term.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_identity.png
+- -rm -f $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_edit.png
+- -rm -f $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_term.png
+ -rm -f $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_gen.png
+- -rm -f $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_photo.png
+ -rm -f $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_import.png
++ -rm -f $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_identity.png
+ -rm -f $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_info.png
++ -rm -f $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_photo.png
++ -rm -f $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_edit.png
++ -rm -f $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_export.png
++ -rm -f $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_show.png
++ -rm -f $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_sign.png
+ -rm -f $(DESTDIR)$(kgpgiconsdir)/crystalsvg/16x16/actions/kgpg_key1.png
+ -rm -f $(DESTDIR)$(kgpgiconsdir)/crystalsvg/16x16/actions/kgpg_key2.png
+ -rm -f $(DESTDIR)$(kgpgiconsdir)/crystalsvg/16x16/actions/kgpg_key3.png
+ -rm -f $(DESTDIR)$(kgpgiconsdir)/crystalsvg/16x16/actions/kgpg_key4.png
+- -rm -f $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_show.png
+- -rm -f $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_sign.png
+- -rm -f $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_export.png
++ -rm -f $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_term.png
+
+ #>+ 15
+ force-reedit:
+diff -Nru kdeutils-3.4.2.orig/kgpg/Makefile.in kdeutils-3.4.2/kgpg/Makefile.in
+--- kdeutils-3.4.2.orig/kgpg/Makefile.in 2005-07-20 20:23:53.000000000 +0000
++++ kdeutils-3.4.2/kgpg/Makefile.in 2005-08-02 16:59:40.062950384 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(kgpg_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -245,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8532,7 +10150,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,7 +463,7 @@
+@@ -461,7 +462,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8541,7 +10159,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -498,9 +501,9 @@
+@@ -499,9 +500,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8553,10 +10171,99 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -rua kdeutils-3.4.1.orig/khexedit/lib/codecs/Makefile.in kdeutils-3.4.1/khexedit/lib/codecs/Makefile.in
---- kdeutils-3.4.1.orig/khexedit/lib/codecs/Makefile.in 2005-05-23 18:15:14.000000000 +0200
-+++ kdeutils-3.4.1/khexedit/lib/codecs/Makefile.in 2005-05-25 07:52:45.271409064 +0200
-@@ -206,6 +206,9 @@
+@@ -1058,18 +1059,18 @@
+ mocs: kgpgview.moc
+
+ #>+ 3
+-popuppublic.moc: $(srcdir)/popuppublic.h
+- $(MOC) $(srcdir)/popuppublic.h -o popuppublic.moc
++keyinfowidget.moc: $(srcdir)/keyinfowidget.h
++ $(MOC) $(srcdir)/keyinfowidget.h -o keyinfowidget.moc
+
+ #>+ 2
+-mocs: popuppublic.moc
++mocs: keyinfowidget.moc
+
+ #>+ 3
+-keyinfowidget.moc: $(srcdir)/keyinfowidget.h
+- $(MOC) $(srcdir)/keyinfowidget.h -o keyinfowidget.moc
++popuppublic.moc: $(srcdir)/popuppublic.h
++ $(MOC) $(srcdir)/popuppublic.h -o popuppublic.moc
+
+ #>+ 2
+-mocs: keyinfowidget.moc
++mocs: popuppublic.moc
+
+ #>+ 3
+ keyservers.moc: $(srcdir)/keyservers.h
+@@ -1080,10 +1081,10 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f kgpglibrary.moc keygener.moc kgpg.moc kgpgoptions.moc kgpginterface.moc kgpgeditor.moc listkeys.moc kgpgview.moc popuppublic.moc keyinfowidget.moc keyservers.moc
++ -rm -f kgpglibrary.moc keygener.moc kgpg.moc kgpgoptions.moc kgpginterface.moc kgpgeditor.moc listkeys.moc kgpgview.moc keyinfowidget.moc popuppublic.moc keyservers.moc
+
+ #>+ 2
+-KDE_DIST=kgpg_docked.png listkeys.rc sourceselect.ui kgpg_blank.png conf_servers.ui conf_ui2.ui kgpglibrary.h kgpg.rc kgpg_docked.gif conf_encryption.ui.h keyserver.ui kgpgsettings_addons.h searchres.ui kgpg_anim.gif kgpg_fill.png encryptfolder.desktop kgpgrevokewidget.ui encryptfile.desktop kgpgwizard.ui kgpginterface.h cr22-app-kgpg.png listkeys.h tips newkey.ui.h cr32-app-kgpg.png conf_gpg.ui groupedit.ui kgpg.h kgpgoptions.h kgpg.kcfg kgpgrevokewidget.ui.h cr16-app-kgpg.png keyproperties.ui dcopiface.h conf_misc.ui keyservers.h adduid.ui kgpgview.h keygener.h Makefile.in keyinfowidget.h keyexport.ui.h conf_encryption.ui newkey.ui kgpgeditor.h cr16-app-kgpg2.png kgpg.desktop conf_decryption.ui Makefile.am popuppublic.h detailedconsole.h cr48-app-kgpg.png kgpgsettings.kcfgc keyexport.ui
++KDE_DIST=kgpg_docked.png listkeys.rc sourceselect.ui kgpg_blank.png conf_servers.ui conf_ui2.ui kgpglibrary.h kgpg.rc kgpg_docked.gif conf_encryption.ui.h keyserver.ui kgpgsettings_addons.h searchres.ui kgpg_anim.gif kgpg_fill.png encryptfolder.desktop kgpgrevokewidget.ui encryptfile.desktop kgpgwizard.ui kgpginterface.h cr22-app-kgpg.png listkeys.h tips newkey.ui.h cr32-app-kgpg.png conf_gpg.ui groupedit.ui kgpg.h kgpgoptions.h kgpg.kcfg kgpgrevokewidget.ui.h cr16-app-kgpg.png keyproperties.ui conf_misc.ui dcopiface.h keyservers.h adduid.ui kgpgview.h keygener.h Makefile.in keyinfowidget.h keyexport.ui.h conf_encryption.ui newkey.ui kgpgeditor.h cr16-app-kgpg2.png kgpg.desktop conf_decryption.ui detailedconsole.h Makefile.am popuppublic.h kgpgsettings.kcfgc cr48-app-kgpg.png keyexport.ui
+
+ #>+ 4
+ clean-idl:
+@@ -1120,20 +1121,20 @@
+
+ #>+ 16
+ install-kde-icons:
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kgpg.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kgpg.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kgpg.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kgpg.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/cr22-app-kgpg.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kgpg.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/cr32-app-kgpg.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kgpg.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kgpg.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kgpg.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kgpg.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kgpg.png
+
+ uninstall-kde-icons:
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kgpg.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kgpg.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kgpg.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kgpg.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kgpg.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kgpg.png
+
+ #>+ 15
+ force-reedit:
+@@ -1174,7 +1175,7 @@
+
+
+ #>+ 11
+-kgpg.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kgpgoptions.cpp $(srcdir)/listkeys.cpp $(srcdir)/popuppublic.cpp $(srcdir)/kgpgview.cpp $(srcdir)/kgpg.cpp $(srcdir)/main.cpp $(srcdir)/keygener.cpp $(srcdir)/kgpginterface.cpp $(srcdir)/keyservers.cpp $(srcdir)/kgpgeditor.cpp $(srcdir)/detailedconsole.cpp $(srcdir)/kgpglibrary.cpp $(srcdir)/keyinfowidget.cpp dcopiface_skel.cpp keyserver.cpp searchres.cpp kgpgwizard.cpp keyproperties.cpp conf_encryption.cpp conf_decryption.cpp conf_gpg.cpp groupedit.cpp kgpgrevokewidget.cpp newkey.cpp adduid.cpp keyexport.cpp sourceselect.cpp conf_servers.cpp conf_ui2.cpp conf_misc.cpp kgpgsettings.cpp keyserver.moc keygener.moc conf_misc.moc kgpgrevokewidget.moc searchres.moc kgpgview.moc listkeys.moc sourceselect.moc adduid.moc keyinfowidget.moc popuppublic.moc newkey.moc keyproperties.moc conf_gpg.moc keyexport.moc kgpglibrary.moc conf_decryption.moc kgpg.moc kgpgoptions.moc kgpginterface.moc kgpgeditor.moc conf_encryption.moc conf_servers.moc groupedit.moc keyservers.moc conf_ui2.moc kgpgwizard.moc
++kgpg.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kgpgoptions.cpp $(srcdir)/listkeys.cpp $(srcdir)/popuppublic.cpp $(srcdir)/kgpgview.cpp $(srcdir)/kgpg.cpp $(srcdir)/main.cpp $(srcdir)/keygener.cpp $(srcdir)/kgpginterface.cpp $(srcdir)/keyservers.cpp $(srcdir)/kgpgeditor.cpp $(srcdir)/detailedconsole.cpp $(srcdir)/kgpglibrary.cpp $(srcdir)/keyinfowidget.cpp dcopiface_skel.cpp keyserver.cpp searchres.cpp kgpgwizard.cpp keyproperties.cpp conf_encryption.cpp conf_decryption.cpp conf_gpg.cpp groupedit.cpp kgpgrevokewidget.cpp newkey.cpp adduid.cpp keyexport.cpp sourceselect.cpp conf_servers.cpp conf_ui2.cpp conf_misc.cpp kgpgsettings.cpp keyserver.moc keygener.moc conf_misc.moc kgpgrevokewidget.moc searchres.moc kgpgview.moc listkeys.moc sourceselect.moc adduid.moc popuppublic.moc keyinfowidget.moc newkey.moc keyproperties.moc conf_gpg.moc keyexport.moc kgpglibrary.moc conf_decryption.moc kgpg.moc kgpgoptions.moc kgpginterface.moc kgpgeditor.moc conf_encryption.moc conf_servers.moc groupedit.moc keyservers.moc conf_ui2.moc kgpgwizard.moc
+ @echo 'creating kgpg.all_cpp.cpp ...'; \
+ rm -f kgpg.all_cpp.files kgpg.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kgpg.all_cpp.final; \
+diff -Nru kdeutils-3.4.2.orig/khexedit/lib/codecs/Makefile.in kdeutils-3.4.2/khexedit/lib/codecs/Makefile.in
+--- kdeutils-3.4.2.orig/khexedit/lib/codecs/Makefile.in 2005-07-20 20:23:53.000000000 +0000
++++ kdeutils-3.4.2/khexedit/lib/codecs/Makefile.in 2005-08-02 16:59:42.331605496 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkhecodecs_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -207,6 +205,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8566,7 +10273,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -406,7 +409,7 @@
+@@ -407,7 +408,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8575,7 +10282,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -444,9 +447,9 @@
+@@ -445,9 +446,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8587,10 +10294,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -rua kdeutils-3.4.1.orig/khexedit/lib/controller/Makefile.in kdeutils-3.4.1/khexedit/lib/controller/Makefile.in
---- kdeutils-3.4.1.orig/khexedit/lib/controller/Makefile.in 2005-05-23 18:15:14.000000000 +0200
-+++ kdeutils-3.4.1/khexedit/lib/controller/Makefile.in 2005-05-25 07:52:45.281408158 +0200
-@@ -202,6 +202,9 @@
+diff -Nru kdeutils-3.4.2.orig/khexedit/lib/controller/Makefile.in kdeutils-3.4.2/khexedit/lib/controller/Makefile.in
+--- kdeutils-3.4.2.orig/khexedit/lib/controller/Makefile.in 2005-07-20 20:23:53.000000000 +0000
++++ kdeutils-3.4.2/khexedit/lib/controller/Makefile.in 2005-08-02 16:59:42.404594400 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkcontroller_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -203,6 +201,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8600,7 +10322,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -399,7 +402,7 @@
+@@ -400,7 +401,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8609,7 +10331,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -437,9 +440,9 @@
+@@ -438,9 +439,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8621,10 +10343,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -rua kdeutils-3.4.1.orig/khexedit/lib/Makefile.in kdeutils-3.4.1/khexedit/lib/Makefile.in
---- kdeutils-3.4.1.orig/khexedit/lib/Makefile.in 2005-05-23 18:15:14.000000000 +0200
-+++ kdeutils-3.4.1/khexedit/lib/Makefile.in 2005-05-25 07:52:45.261409971 +0200
-@@ -242,6 +242,9 @@
+diff -Nru kdeutils-3.4.2.orig/khexedit/lib/Makefile.in kdeutils-3.4.2/khexedit/lib/Makefile.in
+--- kdeutils-3.4.2.orig/khexedit/lib/Makefile.in 2005-07-20 20:23:53.000000000 +0000
++++ kdeutils-3.4.2/khexedit/lib/Makefile.in 2005-08-02 16:59:42.038650032 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkhexeditcommon_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -243,6 +241,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8634,7 +10371,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -467,7 +470,7 @@
+@@ -468,7 +469,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8643,7 +10380,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -505,9 +508,9 @@
+@@ -506,9 +507,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8655,10 +10392,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -rua kdeutils-3.4.1.orig/khexedit/Makefile.in kdeutils-3.4.1/khexedit/Makefile.in
---- kdeutils-3.4.1.orig/khexedit/Makefile.in 2005-05-23 18:15:14.000000000 +0200
-+++ kdeutils-3.4.1/khexedit/Makefile.in 2005-05-25 07:52:45.208414775 +0200
-@@ -251,6 +251,9 @@
+diff -Nru kdeutils-3.4.2.orig/khexedit/Makefile.in kdeutils-3.4.2/khexedit/Makefile.in
+--- kdeutils-3.4.2.orig/khexedit/Makefile.in 2005-07-20 20:23:53.000000000 +0000
++++ kdeutils-3.4.2/khexedit/Makefile.in 2005-08-02 16:59:41.439741080 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(khexedit_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -252,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8668,7 +10420,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -459,7 +462,7 @@
+@@ -460,7 +461,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -8677,7 +10429,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -497,9 +500,9 @@
+@@ -498,9 +499,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8689,10 +10441,73 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -rua kdeutils-3.4.1.orig/khexedit/parts/kbytesedit/Makefile.in kdeutils-3.4.1/khexedit/parts/kbytesedit/Makefile.in
---- kdeutils-3.4.1.orig/khexedit/parts/kbytesedit/Makefile.in 2005-05-23 18:15:14.000000000 +0200
-+++ kdeutils-3.4.1/khexedit/parts/kbytesedit/Makefile.in 2005-05-25 07:52:45.299406526 +0200
-@@ -211,6 +211,9 @@
+@@ -982,11 +983,11 @@
+ mocs: listview.moc
+
+ #>+ 3
+-hexmanagerwidget.moc: $(srcdir)/hexmanagerwidget.h
+- $(MOC) $(srcdir)/hexmanagerwidget.h -o hexmanagerwidget.moc
++chartabledialog.moc: $(srcdir)/chartabledialog.h
++ $(MOC) $(srcdir)/chartabledialog.h -o chartabledialog.moc
+
+ #>+ 2
+-mocs: hexmanagerwidget.moc
++mocs: chartabledialog.moc
+
+ #>+ 3
+ searchbar.moc: $(srcdir)/searchbar.h
+@@ -996,11 +997,11 @@
+ mocs: searchbar.moc
+
+ #>+ 3
+-chartabledialog.moc: $(srcdir)/chartabledialog.h
+- $(MOC) $(srcdir)/chartabledialog.h -o chartabledialog.moc
++hexmanagerwidget.moc: $(srcdir)/hexmanagerwidget.h
++ $(MOC) $(srcdir)/hexmanagerwidget.h -o hexmanagerwidget.moc
+
+ #>+ 2
+-mocs: chartabledialog.moc
++mocs: hexmanagerwidget.moc
+
+ #>+ 3
+ optiondialog.moc: $(srcdir)/optiondialog.h
+@@ -1067,7 +1068,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f hexvalidator.moc converterdialog.moc fileinfodialog.moc exportdialog.moc hextoolwidget.moc dialog.moc printdialogpage.moc listview.moc hexmanagerwidget.moc searchbar.moc chartabledialog.moc optiondialog.moc bitswapwidget.moc statusbarprogress.moc hexeditorwidget.moc hexviewwidget.moc hexdrag.moc draglabel.moc toplevel.moc stringdialog.moc
++ -rm -f hexvalidator.moc converterdialog.moc fileinfodialog.moc exportdialog.moc hextoolwidget.moc dialog.moc printdialogpage.moc listview.moc chartabledialog.moc searchbar.moc hexmanagerwidget.moc optiondialog.moc bitswapwidget.moc statusbarprogress.moc hexeditorwidget.moc hexviewwidget.moc hexdrag.moc draglabel.moc toplevel.moc stringdialog.moc
+
+ #>+ 2
+ KDE_DIST=bitswapwidget.h khexedit.desktop stringdialog.h cr16-app-khexedit.png cr32-app-khexedit.png configure.in.in khexeditui.rc Makefile.in cr48-app-khexedit.png version.h Makefile.am
+@@ -1128,7 +1129,7 @@
+
+
+ #>+ 11
+-khexedit.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/main.cc $(srcdir)/toplevel.cc $(srcdir)/hexmanagerwidget.cc $(srcdir)/hexeditorwidget.cc $(srcdir)/hextoolwidget.cc $(srcdir)/hexviewwidget.cc $(srcdir)/hexbuffer.cc $(srcdir)/conversion.cc $(srcdir)/dialog.cc $(srcdir)/hexvalidator.cc $(srcdir)/hexclipboard.cc $(srcdir)/optiondialog.cc $(srcdir)/printdialogpage.cc $(srcdir)/statusbarprogress.cc $(srcdir)/hexprinter.cc $(srcdir)/hexerror.cc $(srcdir)/draglabel.cc $(srcdir)/stringdialog.cc $(srcdir)/bitswapwidget.cc $(srcdir)/chartabledialog.cc $(srcdir)/hexdrag.cc $(srcdir)/exportdialog.cc $(srcdir)/fileinfodialog.cc $(srcdir)/converterdialog.cc $(srcdir)/listview.cc $(srcdir)/searchbar.cc hexvalidator.moc converterdialog.moc fileinfodialog.moc exportdialog.moc hextoolwidget.moc dialog.moc printdialogpage.moc listview.moc chartabledialog.moc searchbar.moc hexmanagerwidget.moc bitswapwidget.moc optiondialog.moc statusbarprogress.moc hexeditorwidget.moc hexviewwidget.moc hexdrag.moc draglabel.moc toplevel.moc stringdialog.moc
++khexedit.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/main.cc $(srcdir)/toplevel.cc $(srcdir)/hexmanagerwidget.cc $(srcdir)/hexeditorwidget.cc $(srcdir)/hextoolwidget.cc $(srcdir)/hexviewwidget.cc $(srcdir)/hexbuffer.cc $(srcdir)/conversion.cc $(srcdir)/dialog.cc $(srcdir)/hexvalidator.cc $(srcdir)/hexclipboard.cc $(srcdir)/optiondialog.cc $(srcdir)/printdialogpage.cc $(srcdir)/statusbarprogress.cc $(srcdir)/hexprinter.cc $(srcdir)/hexerror.cc $(srcdir)/draglabel.cc $(srcdir)/stringdialog.cc $(srcdir)/bitswapwidget.cc $(srcdir)/chartabledialog.cc $(srcdir)/hexdrag.cc $(srcdir)/exportdialog.cc $(srcdir)/fileinfodialog.cc $(srcdir)/converterdialog.cc $(srcdir)/listview.cc $(srcdir)/searchbar.cc hexvalidator.moc converterdialog.moc fileinfodialog.moc exportdialog.moc hextoolwidget.moc dialog.moc printdialogpage.moc listview.moc hexmanagerwidget.moc searchbar.moc chartabledialog.moc bitswapwidget.moc optiondialog.moc statusbarprogress.moc hexeditorwidget.moc hexviewwidget.moc hexdrag.moc draglabel.moc toplevel.moc stringdialog.moc
+ @echo 'creating khexedit.all_cc.cc ...'; \
+ rm -f khexedit.all_cc.files khexedit.all_cc.final; \
+ echo "#define KDE_USE_FINAL 1" >> khexedit.all_cc.final; \
+diff -Nru kdeutils-3.4.2.orig/khexedit/parts/kbytesedit/Makefile.in kdeutils-3.4.2/khexedit/parts/kbytesedit/Makefile.in
+--- kdeutils-3.4.2.orig/khexedit/parts/kbytesedit/Makefile.in 2005-07-20 20:23:53.000000000 +0000
++++ kdeutils-3.4.2/khexedit/parts/kbytesedit/Makefile.in 2005-08-02 16:59:42.528575552 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(libkbyteseditwidget_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -212,6 +210,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8702,7 +10517,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -406,7 +409,7 @@
+@@ -407,7 +408,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8711,7 +10526,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -444,9 +447,9 @@
+@@ -445,9 +446,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8723,10 +10538,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -rua kdeutils-3.4.1.orig/khexedit/parts/kpart/Makefile.in kdeutils-3.4.1/khexedit/parts/kpart/Makefile.in
---- kdeutils-3.4.1.orig/khexedit/parts/kpart/Makefile.in 2005-05-23 18:15:14.000000000 +0200
-+++ kdeutils-3.4.1/khexedit/parts/kpart/Makefile.in 2005-05-25 07:52:45.311405438 +0200
-@@ -218,6 +218,9 @@
+diff -Nru kdeutils-3.4.2.orig/khexedit/parts/kpart/Makefile.in kdeutils-3.4.2/khexedit/parts/kpart/Makefile.in
+--- kdeutils-3.4.2.orig/khexedit/parts/kpart/Makefile.in 2005-07-20 20:23:53.000000000 +0000
++++ kdeutils-3.4.2/khexedit/parts/kpart/Makefile.in 2005-08-02 16:59:42.593565672 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(libkhexedit2part_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -219,6 +217,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8736,7 +10566,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -415,7 +418,7 @@
+@@ -416,7 +417,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8745,7 +10575,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -453,9 +456,9 @@
+@@ -454,9 +455,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8757,10 +10587,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -rua kdeutils-3.4.1.orig/khexedit/parts/Makefile.in kdeutils-3.4.1/khexedit/parts/Makefile.in
---- kdeutils-3.4.1.orig/khexedit/parts/Makefile.in 2005-05-23 18:15:14.000000000 +0200
-+++ kdeutils-3.4.1/khexedit/parts/Makefile.in 2005-05-25 07:52:45.288407523 +0200
-@@ -178,6 +178,9 @@
+diff -Nru kdeutils-3.4.2.orig/khexedit/parts/Makefile.in kdeutils-3.4.2/khexedit/parts/Makefile.in
+--- kdeutils-3.4.2.orig/khexedit/parts/Makefile.in 2005-07-20 20:23:53.000000000 +0000
++++ kdeutils-3.4.2/khexedit/parts/Makefile.in 2005-08-02 16:59:42.454586800 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -179,6 +179,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8770,7 +10606,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -362,7 +365,7 @@
+@@ -363,7 +366,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -8779,7 +10615,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
@@ -8791,10 +10627,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/khexedit/pics/Makefile.in kdeutils-3.4.1/khexedit/pics/Makefile.in
---- kdeutils-3.4.1.orig/khexedit/pics/Makefile.in 2005-05-23 18:15:14.000000000 +0200
-+++ kdeutils-3.4.1/khexedit/pics/Makefile.in 2005-05-25 07:52:45.316404985 +0200
-@@ -172,6 +172,9 @@
+diff -Nru kdeutils-3.4.2.orig/khexedit/pics/Makefile.in kdeutils-3.4.2/khexedit/pics/Makefile.in
+--- kdeutils-3.4.2.orig/khexedit/pics/Makefile.in 2005-07-20 20:23:53.000000000 +0000
++++ kdeutils-3.4.2/khexedit/pics/Makefile.in 2005-08-02 16:59:42.630560048 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -173,6 +173,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8804,7 +10646,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -357,7 +360,7 @@
+@@ -358,7 +361,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8813,7 +10655,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -395,9 +398,9 @@
+@@ -396,9 +399,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8825,10 +10667,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/kjots/icons/Makefile.in kdeutils-3.4.1/kjots/icons/Makefile.in
---- kdeutils-3.4.1.orig/kjots/icons/Makefile.in 2005-05-23 18:15:14.000000000 +0200
-+++ kdeutils-3.4.1/kjots/icons/Makefile.in 2005-05-25 07:52:45.356401359 +0200
-@@ -172,6 +172,9 @@
+diff -Nru kdeutils-3.4.2.orig/kjots/icons/Makefile.in kdeutils-3.4.2/kjots/icons/Makefile.in
+--- kdeutils-3.4.2.orig/kjots/icons/Makefile.in 2005-07-20 20:23:53.000000000 +0000
++++ kdeutils-3.4.2/kjots/icons/Makefile.in 2005-08-02 16:59:42.809532840 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -173,6 +173,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8838,7 +10686,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -358,7 +361,7 @@
+@@ -359,7 +362,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8847,7 +10695,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -396,9 +399,9 @@
+@@ -397,9 +400,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8859,10 +10707,52 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/kjots/Makefile.in kdeutils-3.4.1/kjots/Makefile.in
---- kdeutils-3.4.1.orig/kjots/Makefile.in 2005-05-23 18:15:14.000000000 +0200
-+++ kdeutils-3.4.1/kjots/Makefile.in 2005-05-25 07:52:45.349401994 +0200
-@@ -232,6 +232,9 @@
+@@ -569,20 +572,20 @@
+
+ #>+ 16
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kjots.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kjots.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kjots.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kjots.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/cr64-app-kjots.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kjots.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/cr48-app-kjots.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kjots.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kjots.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kjots.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kjots.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kjots.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kjots.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kjots.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kjots.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kjots.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kjots.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kjots.png
+
+ #>+ 15
+ force-reedit:
+diff -Nru kdeutils-3.4.2.orig/kjots/Makefile.in kdeutils-3.4.2/kjots/Makefile.in
+--- kdeutils-3.4.2.orig/kjots/Makefile.in 2005-07-20 20:23:53.000000000 +0000
++++ kdeutils-3.4.2/kjots/Makefile.in 2005-08-02 16:59:42.756540896 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(kjots_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -233,6 +231,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8872,7 +10762,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -443,7 +446,7 @@
+@@ -444,7 +445,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8881,7 +10771,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -481,9 +484,9 @@
+@@ -482,9 +483,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8893,10 +10783,55 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -rua kdeutils-3.4.1.orig/klaptopdaemon/applnk/Makefile.in kdeutils-3.4.1/klaptopdaemon/applnk/Makefile.in
---- kdeutils-3.4.1.orig/klaptopdaemon/applnk/Makefile.in 2005-05-23 18:15:14.000000000 +0200
-+++ kdeutils-3.4.1/klaptopdaemon/applnk/Makefile.in 2005-05-25 07:52:45.463391660 +0200
-@@ -173,6 +173,9 @@
+@@ -915,22 +916,22 @@
+ mocs: KJotsMain.moc
+
+ #>+ 3
+-kjotsentry.moc: $(srcdir)/kjotsentry.h
+- $(MOC) $(srcdir)/kjotsentry.h -o kjotsentry.moc
++kjotsbookmarks.moc: $(srcdir)/kjotsbookmarks.h
++ $(MOC) $(srcdir)/kjotsbookmarks.h -o kjotsbookmarks.moc
+
+ #>+ 2
+-mocs: kjotsentry.moc
++mocs: kjotsbookmarks.moc
+
+ #>+ 3
+-kjotsbookmarks.moc: $(srcdir)/kjotsbookmarks.h
+- $(MOC) $(srcdir)/kjotsbookmarks.h -o kjotsbookmarks.moc
++kjotsentry.moc: $(srcdir)/kjotsentry.h
++ $(MOC) $(srcdir)/kjotsentry.h -o kjotsentry.moc
+
+ #>+ 2
+-mocs: kjotsbookmarks.moc
++mocs: kjotsentry.moc
+
+ #>+ 3
+ clean-metasources:
+- -rm -f kjotsedit.moc KJotsMain.moc kjotsentry.moc kjotsbookmarks.moc
++ -rm -f kjotsedit.moc KJotsMain.moc kjotsbookmarks.moc kjotsentry.moc
+
+ #>+ 2
+ KDE_DIST=kjotsbookmarks.h kjots.kcfg kjotsedit.h kjotsui.rc ANNOUNCE confpagemisc.ui kjotsentry.h confpagefont.ui KJotsSettings.kcfgc CHANGES KJotsMain.h Makefile.in Kjots.desktop BUGS Makefile.am
+@@ -988,7 +989,7 @@
+
+
+ #>+ 11
+-kjots.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/KJotsMain.cpp $(srcdir)/kjotsentry.cpp $(srcdir)/kjotsedit.cpp $(srcdir)/kjotsbookmarks.cpp confpagefont.cpp confpagemisc.cpp KJotsSettings.cpp kjotsedit.moc KJotsMain.moc confpagemisc.moc confpagefont.moc kjotsbookmarks.moc kjotsentry.moc
++kjots.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/KJotsMain.cpp $(srcdir)/kjotsentry.cpp $(srcdir)/kjotsedit.cpp $(srcdir)/kjotsbookmarks.cpp confpagefont.cpp confpagemisc.cpp KJotsSettings.cpp kjotsedit.moc KJotsMain.moc confpagemisc.moc confpagefont.moc kjotsentry.moc kjotsbookmarks.moc
+ @echo 'creating kjots.all_cpp.cpp ...'; \
+ rm -f kjots.all_cpp.files kjots.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kjots.all_cpp.final; \
+diff -Nru kdeutils-3.4.2.orig/klaptopdaemon/applnk/Makefile.in kdeutils-3.4.2/klaptopdaemon/applnk/Makefile.in
+--- kdeutils-3.4.2.orig/klaptopdaemon/applnk/Makefile.in 2005-07-20 20:23:53.000000000 +0000
++++ kdeutils-3.4.2/klaptopdaemon/applnk/Makefile.in 2005-08-02 16:59:43.440436928 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -174,6 +174,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8906,7 +10841,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -359,7 +362,7 @@
+@@ -360,7 +363,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8915,7 +10850,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -397,9 +400,9 @@
+@@ -398,9 +401,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8927,10 +10862,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/klaptopdaemon/Makefile.in kdeutils-3.4.1/klaptopdaemon/Makefile.in
---- kdeutils-3.4.1.orig/klaptopdaemon/Makefile.in 2005-05-23 18:15:14.000000000 +0200
-+++ kdeutils-3.4.1/klaptopdaemon/Makefile.in 2005-05-25 07:52:45.457392204 +0200
-@@ -271,6 +271,9 @@
+diff -Nru kdeutils-3.4.2.orig/klaptopdaemon/Makefile.in kdeutils-3.4.2/klaptopdaemon/Makefile.in
+--- kdeutils-3.4.2.orig/klaptopdaemon/Makefile.in 2005-07-20 20:23:53.000000000 +0000
++++ kdeutils-3.4.2/klaptopdaemon/Makefile.in 2005-08-02 16:59:43.395443768 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(kcm_laptop_la_SOURCES) $(kded_klaptopdaemon_la_SOURCES) $(libkcmlaptop_la_SOURCES) $(klaptop_acpi_helper_SOURCES) $(klaptop_check_SOURCES) $(makecrc_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -272,6 +270,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8940,7 +10890,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -484,7 +487,7 @@
+@@ -485,7 +486,7 @@
.SUFFIXES:
.SUFFIXES: .c .cc .cpp .lo .o .obj
@@ -8949,7 +10899,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -522,9 +525,9 @@
+@@ -523,9 +524,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8961,10 +10911,79 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -rua kdeutils-3.4.1.orig/klaptopdaemon/pics/actions/Makefile.in kdeutils-3.4.1/klaptopdaemon/pics/actions/Makefile.in
---- kdeutils-3.4.1.orig/klaptopdaemon/pics/actions/Makefile.in 2005-05-23 18:15:14.000000000 +0200
-+++ kdeutils-3.4.1/klaptopdaemon/pics/actions/Makefile.in 2005-05-25 07:52:45.481390028 +0200
-@@ -162,6 +162,9 @@
+@@ -1062,18 +1063,18 @@
+ mocs: profile.moc
+
+ #>+ 3
+-apm.moc: $(srcdir)/apm.h
+- $(MOC) $(srcdir)/apm.h -o apm.moc
++acpi.moc: $(srcdir)/acpi.h
++ $(MOC) $(srcdir)/acpi.h -o acpi.moc
+
+ #>+ 2
+-mocs: apm.moc
++mocs: acpi.moc
+
+ #>+ 3
+-acpi.moc: $(srcdir)/acpi.h
+- $(MOC) $(srcdir)/acpi.h -o acpi.moc
++apm.moc: $(srcdir)/apm.h
++ $(MOC) $(srcdir)/apm.h -o apm.moc
+
+ #>+ 2
+-mocs: acpi.moc
++mocs: apm.moc
+
+ #>+ 3
+ battery.moc: $(srcdir)/battery.h
+@@ -1139,18 +1140,18 @@
+ mocs: main.moc
+
+ #>+ 3
+-pcmcia.moc: $(srcdir)/pcmcia.h
+- $(MOC) $(srcdir)/pcmcia.h -o pcmcia.moc
++warning.moc: $(srcdir)/warning.h
++ $(MOC) $(srcdir)/warning.h -o warning.moc
+
+ #>+ 2
+-mocs: pcmcia.moc
++mocs: warning.moc
+
+ #>+ 3
+-warning.moc: $(srcdir)/warning.h
+- $(MOC) $(srcdir)/warning.h -o warning.moc
++pcmcia.moc: $(srcdir)/pcmcia.h
++ $(MOC) $(srcdir)/pcmcia.h -o pcmcia.moc
+
+ #>+ 2
+-mocs: warning.moc
++mocs: pcmcia.moc
+
+ #>+ 3
+ buttons.moc: $(srcdir)/buttons.h
+@@ -1174,10 +1175,10 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f profile.moc apm.moc acpi.moc battery.moc daemondock.moc xautolock.moc power.moc krichtextlabel.moc laptop_daemon.moc kpcmcia.moc kpcmciainfo.moc main.moc pcmcia.moc warning.moc buttons.moc sony.moc
++ -rm -f profile.moc acpi.moc apm.moc battery.moc daemondock.moc xautolock.moc power.moc krichtextlabel.moc laptop_daemon.moc kpcmcia.moc kpcmciainfo.moc main.moc warning.moc pcmcia.moc buttons.moc sony.moc
+
+ #>+ 2
+-KDE_DIST=configure.in.bot pcmcia.h portable.h power.h daemondock.h laptop_daemon.h kpcmciainfo.h main.h apm.h thinkpad_common.h daemon_state.h krichtextlabel.h buttons.h warning.h checkcrc.h kpcmcia.h smapibios.h configure.in.in acpi.h sony.h Makefile.in battery.h version.h smapidev.h profile.h xautolock.h smapi.h Makefile.am
++KDE_DIST=configure.in.bot pcmcia.h power.h portable.h daemondock.h laptop_daemon.h kpcmciainfo.h main.h apm.h thinkpad_common.h daemon_state.h krichtextlabel.h buttons.h warning.h checkcrc.h kpcmcia.h smapibios.h configure.in.in acpi.h sony.h Makefile.in battery.h version.h smapidev.h profile.h xautolock.h smapi.h Makefile.am
+
+ #>+ 4
+ clean-idl:
+diff -Nru kdeutils-3.4.2.orig/klaptopdaemon/pics/actions/Makefile.in kdeutils-3.4.2/klaptopdaemon/pics/actions/Makefile.in
+--- kdeutils-3.4.2.orig/klaptopdaemon/pics/actions/Makefile.in 2005-07-20 20:23:53.000000000 +0000
++++ kdeutils-3.4.2/klaptopdaemon/pics/actions/Makefile.in 2005-08-02 16:59:43.546420816 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -163,6 +163,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8974,7 +10993,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -347,7 +350,7 @@
+@@ -348,7 +351,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8983,7 +11002,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -385,9 +388,9 @@
+@@ -386,9 +389,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8995,10 +11014,77 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/klaptopdaemon/pics/Makefile.in kdeutils-3.4.1/klaptopdaemon/pics/Makefile.in
---- kdeutils-3.4.1.orig/klaptopdaemon/pics/Makefile.in 2005-05-23 18:15:14.000000000 +0200
-+++ kdeutils-3.4.1/klaptopdaemon/pics/Makefile.in 2005-05-25 07:52:45.472390844 +0200
-@@ -178,6 +178,9 @@
+@@ -539,41 +542,41 @@
+ #>+ 39
+ install-kde-icons:
+ $(mkinstalldirs) $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions
+- $(INSTALL_DATA) $(srcdir)/cr16-action-laptop_charge.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/laptop_charge.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-alt2_laptop_nocharge.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt2_laptop_nocharge.png
++ $(mkinstalldirs) $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/32x32/actions
++ $(INSTALL_DATA) $(srcdir)/cr32-action-power.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/32x32/actions/power.png
+ $(mkinstalldirs) $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/22x22/actions
+- $(INSTALL_DATA) $(srcdir)/cr22-action-laptop_power.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/22x22/actions/laptop_power.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-laptop_nocharge.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/22x22/actions/laptop_nocharge.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-alt3_laptop_power.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt3_laptop_power.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-alt_laptop_nocharge.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt_laptop_nocharge.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-alt2_laptop_nobattery.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt2_laptop_nobattery.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-alt_laptop_power.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt_laptop_power.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-alt3_laptop_nocharge.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt3_laptop_nocharge.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-laptop_charge.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/laptop_charge.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-laptop_nobattery.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/22x22/actions/laptop_nobattery.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-laptop_power.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/22x22/actions/laptop_power.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-laptop_charge.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/22x22/actions/laptop_charge.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-laptop_nobattery.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/laptop_nobattery.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-alt2_laptop_nocharge.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt2_laptop_nocharge.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-alt3_laptop_nocharge.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt3_laptop_nocharge.png
+- $(mkinstalldirs) $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/32x32/actions
+- $(INSTALL_DATA) $(srcdir)/cr32-action-power.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/32x32/actions/power.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-power.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/power.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-alt2_laptop_power.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt2_laptop_power.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-alt3_laptop_power.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt3_laptop_power.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-laptop_nocharge.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/22x22/actions/laptop_nocharge.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-alt_laptop_nocharge.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt_laptop_nocharge.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-laptop_charge.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/22x22/actions/laptop_charge.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-laptop_nocharge.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/laptop_nocharge.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/laptop_charge.png
+- -rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/22x22/actions/laptop_power.png
++ -rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt2_laptop_nocharge.png
++ -rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/32x32/actions/power.png
++ -rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/22x22/actions/laptop_nocharge.png
++ -rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt3_laptop_power.png
++ -rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt_laptop_nocharge.png
+ -rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt2_laptop_nobattery.png
+ -rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt_laptop_power.png
++ -rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt3_laptop_nocharge.png
++ -rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/laptop_charge.png
+ -rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/22x22/actions/laptop_nobattery.png
++ -rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/22x22/actions/laptop_power.png
++ -rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/22x22/actions/laptop_charge.png
+ -rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/laptop_nobattery.png
+- -rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt2_laptop_nocharge.png
+- -rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt3_laptop_nocharge.png
+- -rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/32x32/actions/power.png
+ -rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/power.png
+ -rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt2_laptop_power.png
+- -rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt3_laptop_power.png
+- -rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/22x22/actions/laptop_nocharge.png
+- -rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt_laptop_nocharge.png
+- -rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/22x22/actions/laptop_charge.png
+ -rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/laptop_nocharge.png
+
+ #>+ 15
+diff -Nru kdeutils-3.4.2.orig/klaptopdaemon/pics/Makefile.in kdeutils-3.4.2/klaptopdaemon/pics/Makefile.in
+--- kdeutils-3.4.2.orig/klaptopdaemon/pics/Makefile.in 2005-07-20 20:23:53.000000000 +0000
++++ kdeutils-3.4.2/klaptopdaemon/pics/Makefile.in 2005-08-02 16:59:43.494428720 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -179,6 +179,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9008,7 +11094,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -366,7 +369,7 @@
+@@ -367,7 +370,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -9017,7 +11103,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -404,9 +407,9 @@
+@@ -405,9 +408,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9029,10 +11115,76 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/kmilo/asus/Makefile.in kdeutils-3.4.1/kmilo/asus/Makefile.in
---- kdeutils-3.4.1.orig/kmilo/asus/Makefile.in 2005-05-23 18:15:14.000000000 +0200
-+++ kdeutils-3.4.1/kmilo/asus/Makefile.in 2005-05-25 07:52:45.497388578 +0200
-@@ -232,6 +232,9 @@
+@@ -705,32 +708,32 @@
+
+ #>+ 28
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/cr32-app-laptop_battery.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/laptop_battery.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/cr48-app-laptop_battery.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/laptop_battery.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
++ $(INSTALL_DATA) $(srcdir)/crsc-app-laptop_battery.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/laptop_battery.svgz
++ $(INSTALL_DATA) $(srcdir)/cr48-app-laptop_pcmcia.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/laptop_pcmcia.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/cr16-app-laptop_battery.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/laptop_battery.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-laptop_pcmcia.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/laptop_pcmcia.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-laptop_pcmcia.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/laptop_pcmcia.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+- $(INSTALL_DATA) $(srcdir)/cr64-app-laptop_battery.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/laptop_battery.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/cr32-app-laptop_battery.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/laptop_battery.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+ $(INSTALL_DATA) $(srcdir)/cr128-app-laptop_battery.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/laptop_battery.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
+- $(INSTALL_DATA) $(srcdir)/crsc-app-laptop_battery.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/laptop_battery.svgz
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/cr48-app-laptop_battery.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/laptop_battery.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-laptop_pcmcia.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/laptop_pcmcia.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
++ $(INSTALL_DATA) $(srcdir)/cr64-app-laptop_battery.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/laptop_battery.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-laptop_pcmcia.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/laptop_pcmcia.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-laptop_battery.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/laptop_battery.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/laptop_battery.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/laptop_battery.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/laptop_pcmcia.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/laptop_pcmcia.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/laptop_battery.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/laptop_battery.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/laptop_battery.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/laptop_battery.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/laptop_battery.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/laptop_pcmcia.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/laptop_pcmcia.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/laptop_battery.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/laptop_battery.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/laptop_battery.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/laptop_pcmcia.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/laptop_battery.png
+
+ #>+ 15
+ force-reedit:
+diff -Nru kdeutils-3.4.2.orig/kmilo/asus/Makefile.in kdeutils-3.4.2/kmilo/asus/Makefile.in
+--- kdeutils-3.4.2.orig/kmilo/asus/Makefile.in 2005-07-20 20:23:53.000000000 +0000
++++ kdeutils-3.4.2/kmilo/asus/Makefile.in 2005-08-02 16:59:43.666402576 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -38,8 +38,6 @@
+
+
+
+-SOURCES = $(kmilo_asus_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -233,6 +231,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9042,7 +11194,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -425,7 +428,7 @@
+@@ -426,7 +427,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9051,7 +11203,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -463,9 +466,9 @@
+@@ -464,9 +465,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9063,10 +11215,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -rua kdeutils-3.4.1.orig/kmilo/delli8k/Makefile.in kdeutils-3.4.1/kmilo/delli8k/Makefile.in
---- kdeutils-3.4.1.orig/kmilo/delli8k/Makefile.in 2005-05-23 18:15:14.000000000 +0200
-+++ kdeutils-3.4.1/kmilo/delli8k/Makefile.in 2005-05-25 07:52:45.507387671 +0200
-@@ -230,6 +230,9 @@
+diff -Nru kdeutils-3.4.2.orig/kmilo/delli8k/Makefile.in kdeutils-3.4.2/kmilo/delli8k/Makefile.in
+--- kdeutils-3.4.2.orig/kmilo/delli8k/Makefile.in 2005-07-20 20:23:53.000000000 +0000
++++ kdeutils-3.4.2/kmilo/delli8k/Makefile.in 2005-08-02 16:59:43.740391328 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -36,8 +36,6 @@
+
+
+
+-SOURCES = $(kmilo_delli8k_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -231,6 +229,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9076,7 +11243,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -423,7 +426,7 @@
+@@ -424,7 +425,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9085,7 +11252,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -461,9 +464,9 @@
+@@ -462,9 +463,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9097,10 +11264,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -rua kdeutils-3.4.1.orig/kmilo/demo/Makefile.in kdeutils-3.4.1/kmilo/demo/Makefile.in
---- kdeutils-3.4.1.orig/kmilo/demo/Makefile.in 2005-05-23 18:15:14.000000000 +0200
-+++ kdeutils-3.4.1/kmilo/demo/Makefile.in 2005-05-25 07:52:45.517386765 +0200
-@@ -229,6 +229,9 @@
+diff -Nru kdeutils-3.4.2.orig/kmilo/demo/Makefile.in kdeutils-3.4.2/kmilo/demo/Makefile.in
+--- kdeutils-3.4.2.orig/kmilo/demo/Makefile.in 2005-07-20 20:23:53.000000000 +0000
++++ kdeutils-3.4.2/kmilo/demo/Makefile.in 2005-08-02 16:59:43.821379016 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -35,8 +35,6 @@
+
+
+
+-SOURCES = $(kmilo_demo_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -230,6 +228,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9110,7 +11292,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -423,7 +424,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9119,7 +11301,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -461,9 +462,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9131,10 +11313,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -rua kdeutils-3.4.1.orig/kmilo/generic/Makefile.in kdeutils-3.4.1/kmilo/generic/Makefile.in
---- kdeutils-3.4.1.orig/kmilo/generic/Makefile.in 2005-05-23 18:15:14.000000000 +0200
-+++ kdeutils-3.4.1/kmilo/generic/Makefile.in 2005-05-25 07:52:45.528385768 +0200
-@@ -229,6 +229,9 @@
+diff -Nru kdeutils-3.4.2.orig/kmilo/generic/Makefile.in kdeutils-3.4.2/kmilo/generic/Makefile.in
+--- kdeutils-3.4.2.orig/kmilo/generic/Makefile.in 2005-07-20 20:23:53.000000000 +0000
++++ kdeutils-3.4.2/kmilo/generic/Makefile.in 2005-08-02 16:59:43.919364120 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -35,8 +35,6 @@
+
+
+
+-SOURCES = $(kmilo_generic_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -230,6 +228,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9144,7 +11341,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -423,7 +424,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9153,7 +11350,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -461,9 +462,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9165,10 +11362,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -rua kdeutils-3.4.1.orig/kmilo/kmilod/Makefile.in kdeutils-3.4.1/kmilo/kmilod/Makefile.in
---- kdeutils-3.4.1.orig/kmilo/kmilod/Makefile.in 2005-05-23 18:15:14.000000000 +0200
-+++ kdeutils-3.4.1/kmilo/kmilod/Makefile.in 2005-05-25 07:52:45.566382323 +0200
-@@ -241,6 +241,9 @@
+diff -Nru kdeutils-3.4.2.orig/kmilo/kmilod/Makefile.in kdeutils-3.4.2/kmilo/kmilod/Makefile.in
+--- kdeutils-3.4.2.orig/kmilo/kmilod/Makefile.in 2005-07-20 20:23:54.000000000 +0000
++++ kdeutils-3.4.2/kmilo/kmilod/Makefile.in 2005-08-02 16:59:44.221318216 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -35,8 +35,6 @@
+
+
+
+-SOURCES = $(kded_kmilod_la_SOURCES) $(libkmilo_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -242,6 +240,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9178,7 +11390,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -447,7 +450,7 @@
+@@ -448,7 +449,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9187,7 +11399,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -485,9 +488,9 @@
+@@ -486,9 +487,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9199,10 +11411,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -rua kdeutils-3.4.1.orig/kmilo/kmilo_kvaio/kcmkvaio/Makefile.in kdeutils-3.4.1/kmilo/kmilo_kvaio/kcmkvaio/Makefile.in
---- kdeutils-3.4.1.orig/kmilo/kmilo_kvaio/kcmkvaio/Makefile.in 2005-05-23 18:15:14.000000000 +0200
-+++ kdeutils-3.4.1/kmilo/kmilo_kvaio/kcmkvaio/Makefile.in 2005-05-25 07:52:45.551383683 +0200
-@@ -211,6 +211,9 @@
+diff -Nru kdeutils-3.4.2.orig/kmilo/kmilo_kvaio/kcmkvaio/Makefile.in kdeutils-3.4.2/kmilo/kmilo_kvaio/kcmkvaio/Makefile.in
+--- kdeutils-3.4.2.orig/kmilo/kmilo_kvaio/kcmkvaio/Makefile.in 2005-07-20 20:23:53.000000000 +0000
++++ kdeutils-3.4.2/kmilo/kmilo_kvaio/kcmkvaio/Makefile.in 2005-08-02 16:59:44.107335544 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(kcm_kvaio_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -212,6 +210,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9212,7 +11439,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -404,7 +407,7 @@
+@@ -405,7 +406,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9221,7 +11448,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -442,9 +445,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9233,10 +11460,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -rua kdeutils-3.4.1.orig/kmilo/kmilo_kvaio/Makefile.in kdeutils-3.4.1/kmilo/kmilo_kvaio/Makefile.in
---- kdeutils-3.4.1.orig/kmilo/kmilo_kvaio/Makefile.in 2005-05-23 18:15:14.000000000 +0200
-+++ kdeutils-3.4.1/kmilo/kmilo_kvaio/Makefile.in 2005-05-25 07:52:45.541384589 +0200
-@@ -245,6 +245,9 @@
+diff -Nru kdeutils-3.4.2.orig/kmilo/kmilo_kvaio/Makefile.in kdeutils-3.4.2/kmilo/kmilo_kvaio/Makefile.in
+--- kdeutils-3.4.2.orig/kmilo/kmilo_kvaio/Makefile.in 2005-07-20 20:23:53.000000000 +0000
++++ kdeutils-3.4.2/kmilo/kmilo_kvaio/Makefile.in 2005-08-02 16:59:44.040345728 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -35,8 +35,6 @@
+
+
+
+-SOURCES = $(kmilo_kvaio_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -246,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9246,7 +11488,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -440,7 +443,7 @@
+@@ -441,7 +442,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9255,7 +11497,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -478,9 +481,9 @@
+@@ -479,9 +480,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9267,10 +11509,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -rua kdeutils-3.4.1.orig/kmilo/Makefile.in kdeutils-3.4.1/kmilo/Makefile.in
---- kdeutils-3.4.1.orig/kmilo/Makefile.in 2005-05-23 18:15:14.000000000 +0200
-+++ kdeutils-3.4.1/kmilo/Makefile.in 2005-05-25 07:52:45.487389484 +0200
-@@ -179,6 +179,9 @@
+diff -Nru kdeutils-3.4.2.orig/kmilo/Makefile.in kdeutils-3.4.2/kmilo/Makefile.in
+--- kdeutils-3.4.2.orig/kmilo/Makefile.in 2005-07-20 20:23:53.000000000 +0000
++++ kdeutils-3.4.2/kmilo/Makefile.in 2005-08-02 16:59:43.599412760 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -180,6 +180,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9280,7 +11528,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -367,7 +370,7 @@
+@@ -368,7 +371,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -9289,7 +11537,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
@@ -9301,10 +11549,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/kmilo/powerbook/Makefile.in kdeutils-3.4.1/kmilo/powerbook/Makefile.in
---- kdeutils-3.4.1.orig/kmilo/powerbook/Makefile.in 2005-05-23 18:15:14.000000000 +0200
-+++ kdeutils-3.4.1/kmilo/powerbook/Makefile.in 2005-05-25 07:52:45.576381417 +0200
-@@ -229,6 +229,9 @@
+diff -Nru kdeutils-3.4.2.orig/kmilo/powerbook/Makefile.in kdeutils-3.4.2/kmilo/powerbook/Makefile.in
+--- kdeutils-3.4.2.orig/kmilo/powerbook/Makefile.in 2005-07-20 20:23:54.000000000 +0000
++++ kdeutils-3.4.2/kmilo/powerbook/Makefile.in 2005-08-02 16:59:44.288308032 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -35,8 +35,6 @@
+
+
+
+-SOURCES = $(kmilo_powerbook_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -230,6 +228,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9314,7 +11577,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -423,7 +424,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9323,7 +11586,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -461,9 +462,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9335,10 +11598,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -rua kdeutils-3.4.1.orig/kmilo/powerbook2/Makefile.in kdeutils-3.4.1/kmilo/powerbook2/Makefile.in
---- kdeutils-3.4.1.orig/kmilo/powerbook2/Makefile.in 2005-05-23 18:15:14.000000000 +0200
-+++ kdeutils-3.4.1/kmilo/powerbook2/Makefile.in 2005-05-25 07:52:45.586380510 +0200
-@@ -229,6 +229,9 @@
+diff -Nru kdeutils-3.4.2.orig/kmilo/powerbook2/Makefile.in kdeutils-3.4.2/kmilo/powerbook2/Makefile.in
+--- kdeutils-3.4.2.orig/kmilo/powerbook2/Makefile.in 2005-07-20 20:23:54.000000000 +0000
++++ kdeutils-3.4.2/kmilo/powerbook2/Makefile.in 2005-08-02 16:59:44.387292984 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -35,8 +35,6 @@
+
+
+
+-SOURCES = $(kmilo_powerbook_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -230,6 +228,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9348,7 +11626,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -423,7 +424,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9357,7 +11635,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -461,9 +462,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9369,10 +11647,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -rua kdeutils-3.4.1.orig/kmilo/thinkpad/kcmthinkpad/Makefile.in kdeutils-3.4.1/kmilo/thinkpad/kcmthinkpad/Makefile.in
---- kdeutils-3.4.1.orig/kmilo/thinkpad/kcmthinkpad/Makefile.in 2005-05-23 18:15:14.000000000 +0200
-+++ kdeutils-3.4.1/kmilo/thinkpad/kcmthinkpad/Makefile.in 2005-05-25 07:52:45.607378606 +0200
-@@ -210,6 +210,9 @@
+diff -Nru kdeutils-3.4.2.orig/kmilo/thinkpad/kcmthinkpad/Makefile.in kdeutils-3.4.2/kmilo/thinkpad/kcmthinkpad/Makefile.in
+--- kdeutils-3.4.2.orig/kmilo/thinkpad/kcmthinkpad/Makefile.in 2005-07-20 20:23:54.000000000 +0000
++++ kdeutils-3.4.2/kmilo/thinkpad/kcmthinkpad/Makefile.in 2005-08-02 16:59:44.645253768 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(kcm_thinkpad_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -211,6 +209,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9382,7 +11675,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -403,7 +406,7 @@
+@@ -404,7 +405,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9391,7 +11684,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -441,9 +444,9 @@
+@@ -442,9 +443,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9403,10 +11696,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -rua kdeutils-3.4.1.orig/kmilo/thinkpad/Makefile.in kdeutils-3.4.1/kmilo/thinkpad/Makefile.in
---- kdeutils-3.4.1.orig/kmilo/thinkpad/Makefile.in 2005-05-23 18:15:14.000000000 +0200
-+++ kdeutils-3.4.1/kmilo/thinkpad/Makefile.in 2005-05-25 07:52:45.597379513 +0200
-@@ -243,6 +243,9 @@
+diff -Nru kdeutils-3.4.2.orig/kmilo/thinkpad/Makefile.in kdeutils-3.4.2/kmilo/thinkpad/Makefile.in
+--- kdeutils-3.4.2.orig/kmilo/thinkpad/Makefile.in 2005-07-20 20:23:54.000000000 +0000
++++ kdeutils-3.4.2/kmilo/thinkpad/Makefile.in 2005-08-02 16:59:44.507274744 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -35,8 +35,6 @@
+
+
+
+-SOURCES = $(kmilo_thinkpad_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -244,6 +242,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9416,7 +11724,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -437,7 +440,7 @@
+@@ -438,7 +439,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9425,7 +11733,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -475,9 +478,9 @@
+@@ -476,9 +477,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9437,10 +11745,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -rua kdeutils-3.4.1.orig/kregexpeditor/KMultiFormListBox/Makefile.in kdeutils-3.4.1/kregexpeditor/KMultiFormListBox/Makefile.in
---- kdeutils-3.4.1.orig/kregexpeditor/KMultiFormListBox/Makefile.in 2005-05-23 18:15:14.000000000 +0200
-+++ kdeutils-3.4.1/kregexpeditor/KMultiFormListBox/Makefile.in 2005-05-25 07:52:45.620377428 +0200
-@@ -217,6 +217,9 @@
+diff -Nru kdeutils-3.4.2.orig/kregexpeditor/KMultiFormListBox/Makefile.in kdeutils-3.4.2/kregexpeditor/KMultiFormListBox/Makefile.in
+--- kdeutils-3.4.2.orig/kregexpeditor/KMultiFormListBox/Makefile.in 2005-07-20 20:23:54.000000000 +0000
++++ kdeutils-3.4.2/kregexpeditor/KMultiFormListBox/Makefile.in 2005-08-02 16:59:45.772082464 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkmultiformlistbox_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -218,6 +216,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9450,7 +11773,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -416,7 +419,7 @@
+@@ -417,7 +418,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9459,7 +11782,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -454,9 +457,9 @@
+@@ -455,9 +456,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9471,10 +11794,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -rua kdeutils-3.4.1.orig/kregexpeditor/KWidgetStreamer/Makefile.in kdeutils-3.4.1/kregexpeditor/KWidgetStreamer/Makefile.in
---- kdeutils-3.4.1.orig/kregexpeditor/KWidgetStreamer/Makefile.in 2005-05-23 18:15:14.000000000 +0200
-+++ kdeutils-3.4.1/kregexpeditor/KWidgetStreamer/Makefile.in 2005-05-25 07:52:45.629376612 +0200
-@@ -205,6 +205,9 @@
+diff -Nru kdeutils-3.4.2.orig/kregexpeditor/KWidgetStreamer/Makefile.in kdeutils-3.4.2/kregexpeditor/KWidgetStreamer/Makefile.in
+--- kdeutils-3.4.2.orig/kregexpeditor/KWidgetStreamer/Makefile.in 2005-07-20 20:23:54.000000000 +0000
++++ kdeutils-3.4.2/kregexpeditor/KWidgetStreamer/Makefile.in 2005-08-02 16:59:45.957054344 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkwidgetstreamer_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -206,6 +204,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9484,7 +11822,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -395,7 +398,7 @@
+@@ -396,7 +397,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9493,7 +11831,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -433,9 +436,9 @@
+@@ -434,9 +435,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9505,10 +11843,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -rua kdeutils-3.4.1.orig/kregexpeditor/Makefile.in kdeutils-3.4.1/kregexpeditor/Makefile.in
---- kdeutils-3.4.1.orig/kregexpeditor/Makefile.in 2005-05-23 18:15:14.000000000 +0200
-+++ kdeutils-3.4.1/kregexpeditor/Makefile.in 2005-05-25 07:52:45.677372261 +0200
-@@ -280,6 +280,9 @@
+diff -Nru kdeutils-3.4.2.orig/kregexpeditor/Makefile.in kdeutils-3.4.2/kregexpeditor/Makefile.in
+--- kdeutils-3.4.2.orig/kregexpeditor/Makefile.in 2005-07-20 20:23:54.000000000 +0000
++++ kdeutils-3.4.2/kregexpeditor/Makefile.in 2005-08-02 16:59:48.863612480 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+
+
+
+-SOURCES = $(libkregexpeditorcommon_la_SOURCES) $(libkregexpeditorgui_la_SOURCES) $(kregexpeditor_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -281,6 +279,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9518,7 +11871,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -512,7 +515,7 @@
+@@ -513,7 +514,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -9527,7 +11880,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -550,9 +553,9 @@
+@@ -551,9 +552,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9539,10 +11892,148 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -rua kdeutils-3.4.1.orig/kregexpeditor/picts/Makefile.in kdeutils-3.4.1/kregexpeditor/picts/Makefile.in
---- kdeutils-3.4.1.orig/kregexpeditor/picts/Makefile.in 2005-05-23 18:15:14.000000000 +0200
-+++ kdeutils-3.4.1/kregexpeditor/picts/Makefile.in 2005-05-25 07:52:45.684371627 +0200
-@@ -172,6 +172,9 @@
+@@ -1117,13 +1118,6 @@
+
+
+ #>+ 3
+-kregexpeditorprivate.moc: $(srcdir)/kregexpeditorprivate.h
+- $(MOC) $(srcdir)/kregexpeditorprivate.h -o kregexpeditorprivate.moc
+-
+-#>+ 2
+-mocs: kregexpeditorprivate.moc
+-
+-#>+ 3
+ textwidget.moc: $(srcdir)/textwidget.h
+ $(MOC) $(srcdir)/textwidget.h -o textwidget.moc
+
+@@ -1138,6 +1132,13 @@
+ mocs: verifier.moc
+
+ #>+ 3
++kregexpeditorprivate.moc: $(srcdir)/kregexpeditorprivate.h
++ $(MOC) $(srcdir)/kregexpeditorprivate.h -o kregexpeditorprivate.moc
++
++#>+ 2
++mocs: kregexpeditorprivate.moc
++
++#>+ 3
+ regexpwidget.moc: $(srcdir)/regexpwidget.h
+ $(MOC) $(srcdir)/regexpwidget.h -o regexpwidget.moc
+
+@@ -1152,18 +1153,18 @@
+ mocs: kregexpeditorgui.moc
+
+ #>+ 3
+-verifybuttons.moc: $(srcdir)/verifybuttons.h
+- $(MOC) $(srcdir)/verifybuttons.h -o verifybuttons.moc
++singlecontainerwidget.moc: $(srcdir)/singlecontainerwidget.h
++ $(MOC) $(srcdir)/singlecontainerwidget.h -o singlecontainerwidget.moc
+
+ #>+ 2
+-mocs: verifybuttons.moc
++mocs: singlecontainerwidget.moc
+
+ #>+ 3
+-singlecontainerwidget.moc: $(srcdir)/singlecontainerwidget.h
+- $(MOC) $(srcdir)/singlecontainerwidget.h -o singlecontainerwidget.moc
++verifybuttons.moc: $(srcdir)/verifybuttons.h
++ $(MOC) $(srcdir)/verifybuttons.h -o verifybuttons.moc
+
+ #>+ 2
+-mocs: singlecontainerwidget.moc
++mocs: verifybuttons.moc
+
+ #>+ 3
+ compoundwidget.moc: $(srcdir)/compoundwidget.h
+@@ -1180,18 +1181,18 @@
+ mocs: scrollededitorwindow.moc
+
+ #>+ 3
+-editorwindow.moc: $(srcdir)/editorwindow.h
+- $(MOC) $(srcdir)/editorwindow.h -o editorwindow.moc
++charselector.moc: $(srcdir)/charselector.h
++ $(MOC) $(srcdir)/charselector.h -o charselector.moc
+
+ #>+ 2
+-mocs: editorwindow.moc
++mocs: charselector.moc
+
+ #>+ 3
+-charselector.moc: $(srcdir)/charselector.h
+- $(MOC) $(srcdir)/charselector.h -o charselector.moc
++editorwindow.moc: $(srcdir)/editorwindow.h
++ $(MOC) $(srcdir)/editorwindow.h -o editorwindow.moc
+
+ #>+ 2
+-mocs: charselector.moc
++mocs: editorwindow.moc
+
+ #>+ 3
+ userdefinedregexps.moc: $(srcdir)/userdefinedregexps.h
+@@ -1260,7 +1261,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f kregexpeditorprivate.moc textwidget.moc verifier.moc regexpwidget.moc kregexpeditorgui.moc verifybuttons.moc singlecontainerwidget.moc compoundwidget.moc scrollededitorwindow.moc editorwindow.moc charselector.moc userdefinedregexps.moc lookaheadwidget.moc auxbuttons.moc dcbutton.moc characterswidget.moc repeatwidget.moc selectablelineedit.moc regexpbuttons.moc
++ -rm -f textwidget.moc verifier.moc kregexpeditorprivate.moc regexpwidget.moc kregexpeditorgui.moc singlecontainerwidget.moc verifybuttons.moc compoundwidget.moc scrollededitorwindow.moc charselector.moc editorwindow.moc userdefinedregexps.moc lookaheadwidget.moc auxbuttons.moc dcbutton.moc characterswidget.moc repeatwidget.moc selectablelineedit.moc regexpbuttons.moc
+
+ #>+ 2
+ KDE_DIST=gen_qregexpparser.hh kregexpeditor.svgz kregexpeditor.desktop qregexpparser.l cr48-app-kregexpeditor.png cr32-app-kregexpeditor.png altnwidget.h extractrc-from-regexp cr16-app-kregexpeditor.png Comments Makefile.in qregexpparser.y kregexpeditorgui.desktop Makefile.am cr64-app-kregexpeditor.png cr128-app-kregexpeditor.png
+@@ -1274,23 +1275,23 @@
+
+ #>+ 19
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kregexpeditor.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kregexpeditor.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kregexpeditor.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kregexpeditor.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/cr128-app-kregexpeditor.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kregexpeditor.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kregexpeditor.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kregexpeditor.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/cr64-app-kregexpeditor.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kregexpeditor.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kregexpeditor.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kregexpeditor.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/cr128-app-kregexpeditor.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kregexpeditor.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kregexpeditor.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kregexpeditor.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kregexpeditor.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kregexpeditor.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kregexpeditor.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kregexpeditor.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kregexpeditor.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kregexpeditor.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kregexpeditor.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kregexpeditor.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kregexpeditor.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kregexpeditor.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kregexpeditor.png
+
+ #>+ 15
+ force-reedit:
+@@ -1331,7 +1332,7 @@
+
+
+ #>+ 11
+-libkregexpeditorcommon_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kregexpeditorgui.cpp $(srcdir)/editorwindow.cpp $(srcdir)/regexpwidget.cpp $(srcdir)/drag.cpp $(srcdir)/concwidget.cpp $(srcdir)/zerowidgets.cpp $(srcdir)/dragaccepter.cpp $(srcdir)/repeatwidget.cpp $(srcdir)/characterswidget.cpp $(srcdir)/altnwidget.cpp $(srcdir)/limitedcharlineedit.cpp $(srcdir)/textregexp.cpp $(srcdir)/textrangeregexp.cpp $(srcdir)/concregexp.cpp $(srcdir)/altnregexp.cpp $(srcdir)/positionregexp.cpp $(srcdir)/dotregexp.cpp $(srcdir)/repeatregexp.cpp $(srcdir)/textwidget.cpp $(srcdir)/selectablelineedit.cpp $(srcdir)/multicontainerwidget.cpp $(srcdir)/scrollededitorwindow.cpp $(srcdir)/compoundwidget.cpp $(srcdir)/singlecontainerwidget.cpp $(srcdir)/widgetfactory.cpp $(srcdir)/dcbutton.cpp $(srcdir)/gen_qregexplexer.cpp $(srcdir)/charselector.cpp $(srcdir)/lookaheadregexp.cpp $(srcdir)/lookaheadwidget.cpp $(srcdir)/regexp.cpp $(srcdir)/infopage.cpp $(srcdir)/kregexpeditorprivate.cpp $(srcdir)/compoundregexp.cpp $(srcdir)/auxbuttons.cpp $(srcdir)/myfontmetrics.cpp $(srcdir)/regexpbuttons.cpp $(srcdir)/userdefinedregexps.cpp $(srcdir)/verifier.cpp $(srcdir)/verifybuttons.cpp $(srcdir)/errormap.cpp $(srcdir)/qtregexphighlighter.cpp $(srcdir)/regexpconverter.cpp $(srcdir)/qtregexpconverter.cpp $(srcdir)/emacsregexpconverter.cpp $(srcdir)/regexphighlighter.cpp $(srcdir)/util.cpp verifier.moc textwidget.moc kregexpeditorprivate.moc kregexpeditorgui.moc regexpwidget.moc verifybuttons.moc singlecontainerwidget.moc compoundwidget.moc scrollededitorwindow.moc charselector.moc editorwindow.moc userdefinedregexps.moc lookaheadwidget.moc auxbuttons.moc dcbutton.moc characterswidget.moc repeatwidget.moc selectablelineedit.moc regexpbuttons.moc
++libkregexpeditorcommon_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kregexpeditorgui.cpp $(srcdir)/editorwindow.cpp $(srcdir)/regexpwidget.cpp $(srcdir)/drag.cpp $(srcdir)/concwidget.cpp $(srcdir)/zerowidgets.cpp $(srcdir)/dragaccepter.cpp $(srcdir)/repeatwidget.cpp $(srcdir)/characterswidget.cpp $(srcdir)/altnwidget.cpp $(srcdir)/limitedcharlineedit.cpp $(srcdir)/textregexp.cpp $(srcdir)/textrangeregexp.cpp $(srcdir)/concregexp.cpp $(srcdir)/altnregexp.cpp $(srcdir)/positionregexp.cpp $(srcdir)/dotregexp.cpp $(srcdir)/repeatregexp.cpp $(srcdir)/textwidget.cpp $(srcdir)/selectablelineedit.cpp $(srcdir)/multicontainerwidget.cpp $(srcdir)/scrollededitorwindow.cpp $(srcdir)/compoundwidget.cpp $(srcdir)/singlecontainerwidget.cpp $(srcdir)/widgetfactory.cpp $(srcdir)/dcbutton.cpp $(srcdir)/gen_qregexplexer.cpp $(srcdir)/charselector.cpp $(srcdir)/lookaheadregexp.cpp $(srcdir)/lookaheadwidget.cpp $(srcdir)/regexp.cpp $(srcdir)/infopage.cpp $(srcdir)/kregexpeditorprivate.cpp $(srcdir)/compoundregexp.cpp $(srcdir)/auxbuttons.cpp $(srcdir)/myfontmetrics.cpp $(srcdir)/regexpbuttons.cpp $(srcdir)/userdefinedregexps.cpp $(srcdir)/verifier.cpp $(srcdir)/verifybuttons.cpp $(srcdir)/errormap.cpp $(srcdir)/qtregexphighlighter.cpp $(srcdir)/regexpconverter.cpp $(srcdir)/qtregexpconverter.cpp $(srcdir)/emacsregexpconverter.cpp $(srcdir)/regexphighlighter.cpp $(srcdir)/util.cpp kregexpeditorprivate.moc verifier.moc textwidget.moc kregexpeditorgui.moc regexpwidget.moc singlecontainerwidget.moc verifybuttons.moc compoundwidget.moc scrollededitorwindow.moc editorwindow.moc charselector.moc userdefinedregexps.moc lookaheadwidget.moc auxbuttons.moc dcbutton.moc characterswidget.moc repeatwidget.moc selectablelineedit.moc regexpbuttons.moc
+ @echo 'creating libkregexpeditorcommon_la.all_cpp.cpp ...'; \
+ rm -f libkregexpeditorcommon_la.all_cpp.files libkregexpeditorcommon_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkregexpeditorcommon_la.all_cpp.final; \
+diff -Nru kdeutils-3.4.2.orig/kregexpeditor/picts/Makefile.in kdeutils-3.4.2/kregexpeditor/picts/Makefile.in
+--- kdeutils-3.4.2.orig/kregexpeditor/picts/Makefile.in 2005-07-20 20:23:54.000000000 +0000
++++ kdeutils-3.4.2/kregexpeditor/picts/Makefile.in 2005-08-02 16:59:48.942600472 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -173,6 +173,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9552,7 +12043,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -357,7 +360,7 @@
+@@ -358,7 +361,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9561,7 +12052,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -395,9 +398,9 @@
+@@ -396,9 +399,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9573,10 +12064,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/kregexpeditor/predefined/General/Makefile.in kdeutils-3.4.1/kregexpeditor/predefined/General/Makefile.in
---- kdeutils-3.4.1.orig/kregexpeditor/predefined/General/Makefile.in 2005-05-23 18:15:14.000000000 +0200
-+++ kdeutils-3.4.1/kregexpeditor/predefined/General/Makefile.in 2005-05-25 07:52:45.690371083 +0200
-@@ -172,6 +172,9 @@
+@@ -557,7 +560,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=autoverify.png begline.png characters.png wordboundary.png neglookahead.png compound.png poslookahead.png repeat.png select.png verify.png error.png endline.png Makefile.in anychar.png nonwordboundary.png text.png altn.png Makefile.am
++KDE_DIST=autoverify.png begline.png characters.png wordboundary.png neglookahead.png poslookahead.png compound.png repeat.png select.png verify.png error.png endline.png Makefile.in anychar.png nonwordboundary.png text.png altn.png Makefile.am
+
+ #>+ 2
+ docs-am:
+diff -Nru kdeutils-3.4.2.orig/kregexpeditor/predefined/General/Makefile.in kdeutils-3.4.2/kregexpeditor/predefined/General/Makefile.in
+--- kdeutils-3.4.2.orig/kregexpeditor/predefined/General/Makefile.in 2005-07-20 20:23:54.000000000 +0000
++++ kdeutils-3.4.2/kregexpeditor/predefined/General/Makefile.in 2005-08-02 16:59:49.056583144 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -173,6 +173,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9586,7 +12092,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -358,7 +361,7 @@
+@@ -359,7 +362,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9595,7 +12101,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -396,9 +399,9 @@
+@@ -397,9 +400,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9607,10 +12113,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/kregexpeditor/predefined/Makefile.in kdeutils-3.4.1/kregexpeditor/predefined/Makefile.in
---- kdeutils-3.4.1.orig/kregexpeditor/predefined/Makefile.in 2005-05-23 18:15:14.000000000 +0200
-+++ kdeutils-3.4.1/kregexpeditor/predefined/Makefile.in 2005-05-25 07:52:45.696370539 +0200
-@@ -178,6 +178,9 @@
+diff -Nru kdeutils-3.4.2.orig/kregexpeditor/predefined/Makefile.in kdeutils-3.4.2/kregexpeditor/predefined/Makefile.in
+--- kdeutils-3.4.2.orig/kregexpeditor/predefined/Makefile.in 2005-07-20 20:23:54.000000000 +0000
++++ kdeutils-3.4.2/kregexpeditor/predefined/Makefile.in 2005-08-02 16:59:49.181564144 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -179,6 +179,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9620,7 +12132,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -362,7 +365,7 @@
+@@ -363,7 +366,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -9629,7 +12141,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
@@ -9641,10 +12153,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/kregexpeditor/test-without-dl/Makefile.in kdeutils-3.4.1/kregexpeditor/test-without-dl/Makefile.in
---- kdeutils-3.4.1.orig/kregexpeditor/test-without-dl/Makefile.in 2005-05-23 18:15:14.000000000 +0200
-+++ kdeutils-3.4.1/kregexpeditor/test-without-dl/Makefile.in 2005-05-25 07:52:45.704369814 +0200
-@@ -195,6 +195,9 @@
+diff -Nru kdeutils-3.4.2.orig/kregexpeditor/test-without-dl/Makefile.in kdeutils-3.4.2/kregexpeditor/test-without-dl/Makefile.in
+--- kdeutils-3.4.2.orig/kregexpeditor/test-without-dl/Makefile.in 2005-07-20 20:23:54.000000000 +0000
++++ kdeutils-3.4.2/kregexpeditor/test-without-dl/Makefile.in 2005-08-02 16:59:49.216558824 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -14,8 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-SOURCES = $(regexptest_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -196,6 +194,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9654,7 +12181,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -385,7 +388,7 @@
+@@ -386,7 +387,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9663,7 +12190,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -423,9 +426,9 @@
+@@ -424,9 +425,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9675,10 +12202,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-diff -rua kdeutils-3.4.1.orig/ksim/library/Makefile.in kdeutils-3.4.1/ksim/library/Makefile.in
---- kdeutils-3.4.1.orig/ksim/library/Makefile.in 2005-05-23 18:15:14.000000000 +0200
-+++ kdeutils-3.4.1/ksim/library/Makefile.in 2005-05-25 07:52:45.736366913 +0200
-@@ -214,6 +214,9 @@
+diff -Nru kdeutils-3.4.2.orig/ksim/library/Makefile.in kdeutils-3.4.2/ksim/library/Makefile.in
+--- kdeutils-3.4.2.orig/ksim/library/Makefile.in 2005-07-20 20:23:54.000000000 +0000
++++ kdeutils-3.4.2/ksim/library/Makefile.in 2005-08-02 16:59:50.772322312 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libksimcore_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -215,6 +213,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9688,7 +12230,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -419,7 +422,7 @@
+@@ -420,7 +421,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9697,7 +12239,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -457,9 +460,9 @@
+@@ -458,9 +459,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9709,10 +12251,64 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -rua kdeutils-3.4.1.orig/ksim/Makefile.in kdeutils-3.4.1/ksim/Makefile.in
---- kdeutils-3.4.1.orig/ksim/Makefile.in 2005-05-23 18:15:14.000000000 +0200
-+++ kdeutils-3.4.1/ksim/Makefile.in 2005-05-25 07:52:45.722368182 +0200
-@@ -239,6 +239,9 @@
+@@ -779,22 +780,22 @@
+ mocs: progress.moc
+
+ #>+ 3
+-label.moc: $(srcdir)/label.h
+- $(MOC) $(srcdir)/label.h -o label.moc
++pluginmodule.moc: $(srcdir)/pluginmodule.h
++ $(MOC) $(srcdir)/pluginmodule.h -o pluginmodule.moc
+
+ #>+ 2
+-mocs: label.moc
++mocs: pluginmodule.moc
+
+ #>+ 3
+-pluginmodule.moc: $(srcdir)/pluginmodule.h
+- $(MOC) $(srcdir)/pluginmodule.h -o pluginmodule.moc
++label.moc: $(srcdir)/label.h
++ $(MOC) $(srcdir)/label.h -o label.moc
+
+ #>+ 2
+-mocs: pluginmodule.moc
++mocs: label.moc
+
+ #>+ 3
+ clean-metasources:
+- -rm -f chart.moc led.moc pluginloader.moc progress.moc label.moc pluginmodule.moc
++ -rm -f chart.moc led.moc pluginloader.moc progress.moc pluginmodule.moc label.moc
+
+ #>+ 2
+ KDE_DIST=Makefile.in Makefile.am
+@@ -845,7 +846,7 @@
+
+
+ #>+ 11
+-libksimcore_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/common.cpp $(srcdir)/themeloader.cpp $(srcdir)/chart.cpp $(srcdir)/label.cpp $(srcdir)/led.cpp $(srcdir)/progress.cpp $(srcdir)/pluginglobal.cpp $(srcdir)/pluginloader.cpp $(srcdir)/pluginmodule.cpp $(srcdir)/ksimconfig.cpp chart.moc led.moc progress.moc pluginloader.moc pluginmodule.moc label.moc
++libksimcore_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/common.cpp $(srcdir)/themeloader.cpp $(srcdir)/chart.cpp $(srcdir)/label.cpp $(srcdir)/led.cpp $(srcdir)/progress.cpp $(srcdir)/pluginglobal.cpp $(srcdir)/pluginloader.cpp $(srcdir)/pluginmodule.cpp $(srcdir)/ksimconfig.cpp chart.moc led.moc progress.moc pluginloader.moc label.moc pluginmodule.moc
+ @echo 'creating libksimcore_la.all_cpp.cpp ...'; \
+ rm -f libksimcore_la.all_cpp.files libksimcore_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libksimcore_la.all_cpp.final; \
+diff -Nru kdeutils-3.4.2.orig/ksim/Makefile.in kdeutils-3.4.2/ksim/Makefile.in
+--- kdeutils-3.4.2.orig/ksim/Makefile.in 2005-07-20 20:23:54.000000000 +0000
++++ kdeutils-3.4.2/ksim/Makefile.in 2005-08-02 16:59:50.218406520 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(ksim_panelextension_la_SOURCES) $(libsysteminfo_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -240,6 +238,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9722,7 +12318,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -451,7 +454,7 @@
+@@ -452,7 +453,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9731,7 +12327,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -489,9 +492,9 @@
+@@ -490,9 +491,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9743,10 +12339,34 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -rua kdeutils-3.4.1.orig/ksim/monitors/cpu/Makefile.in kdeutils-3.4.1/ksim/monitors/cpu/Makefile.in
---- kdeutils-3.4.1.orig/ksim/monitors/cpu/Makefile.in 2005-05-23 18:15:14.000000000 +0200
-+++ kdeutils-3.4.1/ksim/monitors/cpu/Makefile.in 2005-05-25 07:52:45.754365281 +0200
-@@ -205,6 +205,9 @@
+@@ -1017,7 +1018,7 @@
+ -rm -f ksim.moc ksimpref.moc themeprefs.moc generalprefs.moc ksimframe.moc ksimview.moc ksimsysinfo.moc monitorprefs.moc
+
+ #>+ 2
+-KDE_DIST=systeminfo.h ksimframe.h ksimpref.h ksim.h baselist.h ksimsysinfo.h configure.in.in ksim_panelextensionrc monitorprefs.h Makefile.in BUGS generalprefs.h themeprefs.h ksimview.h Makefile.am
++KDE_DIST=systeminfo.h ksimframe.h ksimpref.h ksim.h baselist.h ksimsysinfo.h configure.in.in monitorprefs.h ksim_panelextensionrc Makefile.in BUGS generalprefs.h themeprefs.h ksimview.h Makefile.am
+
+ #>+ 5
+ clean-idl:
+diff -Nru kdeutils-3.4.2.orig/ksim/monitors/cpu/Makefile.in kdeutils-3.4.2/ksim/monitors/cpu/Makefile.in
+--- kdeutils-3.4.2.orig/ksim/monitors/cpu/Makefile.in 2005-07-20 20:23:54.000000000 +0000
++++ kdeutils-3.4.2/ksim/monitors/cpu/Makefile.in 2005-08-02 16:59:50.885305136 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(ksim_cpu_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -206,6 +204,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9756,7 +12376,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -403,7 +406,7 @@
+@@ -404,7 +405,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9765,7 +12385,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -441,9 +444,9 @@
+@@ -442,9 +443,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9777,10 +12397,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -rua kdeutils-3.4.1.orig/ksim/monitors/disk/Makefile.in kdeutils-3.4.1/ksim/monitors/disk/Makefile.in
---- kdeutils-3.4.1.orig/ksim/monitors/disk/Makefile.in 2005-05-23 18:15:14.000000000 +0200
-+++ kdeutils-3.4.1/ksim/monitors/disk/Makefile.in 2005-05-25 07:52:45.764364375 +0200
-@@ -207,6 +207,9 @@
+diff -Nru kdeutils-3.4.2.orig/ksim/monitors/disk/Makefile.in kdeutils-3.4.2/ksim/monitors/disk/Makefile.in
+--- kdeutils-3.4.2.orig/ksim/monitors/disk/Makefile.in 2005-07-20 20:23:54.000000000 +0000
++++ kdeutils-3.4.2/ksim/monitors/disk/Makefile.in 2005-08-02 16:59:50.979290848 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(ksim_disk_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -208,6 +206,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9790,7 +12425,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -404,7 +407,7 @@
+@@ -405,7 +406,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9799,7 +12434,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -442,9 +445,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9811,10 +12446,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -rua kdeutils-3.4.1.orig/ksim/monitors/filesystem/Makefile.in kdeutils-3.4.1/ksim/monitors/filesystem/Makefile.in
---- kdeutils-3.4.1.orig/ksim/monitors/filesystem/Makefile.in 2005-05-23 18:15:14.000000000 +0200
-+++ kdeutils-3.4.1/ksim/monitors/filesystem/Makefile.in 2005-05-25 07:52:45.776363287 +0200
-@@ -210,6 +210,9 @@
+diff -Nru kdeutils-3.4.2.orig/ksim/monitors/filesystem/Makefile.in kdeutils-3.4.2/ksim/monitors/filesystem/Makefile.in
+--- kdeutils-3.4.2.orig/ksim/monitors/filesystem/Makefile.in 2005-07-20 20:23:54.000000000 +0000
++++ kdeutils-3.4.2/ksim/monitors/filesystem/Makefile.in 2005-08-02 16:59:51.168262120 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(ksim_filesystem_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -211,6 +209,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9824,7 +12474,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -412,7 +415,7 @@
+@@ -413,7 +414,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9833,7 +12483,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -450,9 +453,9 @@
+@@ -451,9 +452,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9845,10 +12495,34 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -rua kdeutils-3.4.1.orig/ksim/monitors/i8k/Makefile.in kdeutils-3.4.1/ksim/monitors/i8k/Makefile.in
---- kdeutils-3.4.1.orig/ksim/monitors/i8k/Makefile.in 2005-05-23 18:15:15.000000000 +0200
-+++ kdeutils-3.4.1/ksim/monitors/i8k/Makefile.in 2005-05-25 07:52:45.787362290 +0200
-@@ -205,6 +205,9 @@
+@@ -773,7 +774,7 @@
+ -rm -f filesystemwidget.moc ksimfsystem.moc fsystemconfig.moc
+
+ #>+ 2
+-KDE_DIST=fsystemconfig.h filesystemstats.h fsystemiface.h filesystemwidget.h ksimfsystem.h configure.in.in Makefile.in Makefile.am
++KDE_DIST=fsystemconfig.h fsystemiface.h filesystemstats.h filesystemwidget.h ksimfsystem.h configure.in.in Makefile.in Makefile.am
+
+ #>+ 4
+ clean-idl:
+diff -Nru kdeutils-3.4.2.orig/ksim/monitors/i8k/Makefile.in kdeutils-3.4.2/ksim/monitors/i8k/Makefile.in
+--- kdeutils-3.4.2.orig/ksim/monitors/i8k/Makefile.in 2005-07-20 20:23:54.000000000 +0000
++++ kdeutils-3.4.2/ksim/monitors/i8k/Makefile.in 2005-08-02 16:59:51.260248136 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(ksim_i8k_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -206,6 +204,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9858,7 +12532,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -402,7 +405,7 @@
+@@ -403,7 +404,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9867,7 +12541,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -440,9 +443,9 @@
+@@ -441,9 +442,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9879,10 +12553,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -rua kdeutils-3.4.1.orig/ksim/monitors/lm_sensors/Makefile.in kdeutils-3.4.1/ksim/monitors/lm_sensors/Makefile.in
---- kdeutils-3.4.1.orig/ksim/monitors/lm_sensors/Makefile.in 2005-05-23 18:15:15.000000000 +0200
-+++ kdeutils-3.4.1/ksim/monitors/lm_sensors/Makefile.in 2005-05-25 07:52:45.800361111 +0200
-@@ -228,6 +228,9 @@
+diff -Nru kdeutils-3.4.2.orig/ksim/monitors/lm_sensors/Makefile.in kdeutils-3.4.2/ksim/monitors/lm_sensors/Makefile.in
+--- kdeutils-3.4.2.orig/ksim/monitors/lm_sensors/Makefile.in 2005-07-20 20:23:54.000000000 +0000
++++ kdeutils-3.4.2/ksim/monitors/lm_sensors/Makefile.in 2005-08-02 16:59:51.601196304 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(NVCtrl_la_SOURCES) $(ksim_sensors_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -229,6 +227,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9892,7 +12581,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -433,7 +436,7 @@
+@@ -434,7 +435,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -9901,7 +12590,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -471,9 +474,9 @@
+@@ -472,9 +473,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9913,10 +12602,68 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -rua kdeutils-3.4.1.orig/ksim/monitors/mail/Makefile.in kdeutils-3.4.1/ksim/monitors/mail/Makefile.in
---- kdeutils-3.4.1.orig/ksim/monitors/mail/Makefile.in 2005-05-23 18:15:15.000000000 +0200
-+++ kdeutils-3.4.1/ksim/monitors/mail/Makefile.in 2005-05-25 07:52:45.809360296 +0200
-@@ -207,6 +207,9 @@
+@@ -790,18 +791,18 @@
+ mocs: ksimsensors.moc
+
+ #>+ 3
+-sensorbase.moc: $(srcdir)/sensorbase.h
+- $(MOC) $(srcdir)/sensorbase.h -o sensorbase.moc
++sensorsconfig.moc: $(srcdir)/sensorsconfig.h
++ $(MOC) $(srcdir)/sensorsconfig.h -o sensorsconfig.moc
+
+ #>+ 2
+-mocs: sensorbase.moc
++mocs: sensorsconfig.moc
+
+ #>+ 3
+-sensorsconfig.moc: $(srcdir)/sensorsconfig.h
+- $(MOC) $(srcdir)/sensorsconfig.h -o sensorsconfig.moc
++sensorbase.moc: $(srcdir)/sensorbase.h
++ $(MOC) $(srcdir)/sensorbase.h -o sensorbase.moc
+
+ #>+ 2
+-mocs: sensorsconfig.moc
++mocs: sensorbase.moc
+
+ #>+ 5
+ ksimsensorsiface.kidl: $(srcdir)/ksimsensorsiface.h $(DCOP_DEPENDENCIES)
+@@ -811,7 +812,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f ksimsensors.moc sensorbase.moc sensorsconfig.moc
++ -rm -f ksimsensors.moc sensorsconfig.moc sensorbase.moc
+
+ #>+ 2
+ KDE_DIST=ksimsensorsiface.h sensorsconfig.h NVCtrl.h nv_control.h NVCtrlLib.h Makefile.in ksimsensors.h sensorbase.h Makefile.am
+@@ -863,7 +864,7 @@
+
+
+ #>+ 11
+-ksim_sensors_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ksimsensors.cpp $(srcdir)/sensorsconfig.cpp $(srcdir)/sensorbase.cpp ksimsensorsiface_skel.cpp ksimsensors.moc sensorsconfig.moc sensorbase.moc
++ksim_sensors_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ksimsensors.cpp $(srcdir)/sensorsconfig.cpp $(srcdir)/sensorbase.cpp ksimsensorsiface_skel.cpp ksimsensors.moc sensorbase.moc sensorsconfig.moc
+ @echo 'creating ksim_sensors_la.all_cpp.cpp ...'; \
+ rm -f ksim_sensors_la.all_cpp.files ksim_sensors_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> ksim_sensors_la.all_cpp.final; \
+diff -Nru kdeutils-3.4.2.orig/ksim/monitors/mail/Makefile.in kdeutils-3.4.2/ksim/monitors/mail/Makefile.in
+--- kdeutils-3.4.2.orig/ksim/monitors/mail/Makefile.in 2005-07-20 20:23:54.000000000 +0000
++++ kdeutils-3.4.2/ksim/monitors/mail/Makefile.in 2005-08-02 16:59:51.776169704 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(ksim_mail_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -208,6 +206,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9926,7 +12673,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -402,7 +405,7 @@
+@@ -403,7 +404,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9935,7 +12682,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -440,9 +443,9 @@
+@@ -441,9 +442,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9947,10 +12694,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -rua kdeutils-3.4.1.orig/ksim/monitors/Makefile.in kdeutils-3.4.1/ksim/monitors/Makefile.in
---- kdeutils-3.4.1.orig/ksim/monitors/Makefile.in 2005-05-23 18:15:14.000000000 +0200
-+++ kdeutils-3.4.1/ksim/monitors/Makefile.in 2005-05-25 07:52:45.743366278 +0200
-@@ -178,6 +178,9 @@
+diff -Nru kdeutils-3.4.2.orig/ksim/monitors/Makefile.in kdeutils-3.4.2/ksim/monitors/Makefile.in
+--- kdeutils-3.4.2.orig/ksim/monitors/Makefile.in 2005-07-20 20:23:54.000000000 +0000
++++ kdeutils-3.4.2/ksim/monitors/Makefile.in 2005-08-02 16:59:50.800318056 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -179,6 +179,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9960,7 +12713,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -364,7 +367,7 @@
+@@ -365,7 +368,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -9969,7 +12722,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -402,9 +405,9 @@
+@@ -403,9 +406,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9981,10 +12734,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/ksim/monitors/net/Makefile.in kdeutils-3.4.1/ksim/monitors/net/Makefile.in
---- kdeutils-3.4.1.orig/ksim/monitors/net/Makefile.in 2005-05-23 18:15:15.000000000 +0200
-+++ kdeutils-3.4.1/ksim/monitors/net/Makefile.in 2005-05-25 07:52:45.823359027 +0200
-@@ -210,6 +210,9 @@
+diff -Nru kdeutils-3.4.2.orig/ksim/monitors/net/Makefile.in kdeutils-3.4.2/ksim/monitors/net/Makefile.in
+--- kdeutils-3.4.2.orig/ksim/monitors/net/Makefile.in 2005-07-20 20:23:54.000000000 +0000
++++ kdeutils-3.4.2/ksim/monitors/net/Makefile.in 2005-08-02 16:59:52.028131400 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(ksim_net_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -211,6 +209,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9994,7 +12762,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -403,7 +406,7 @@
+@@ -404,7 +405,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10003,7 +12771,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -441,9 +444,9 @@
+@@ -442,9 +443,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10015,10 +12783,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -rua kdeutils-3.4.1.orig/ksim/monitors/snmp/Makefile.in kdeutils-3.4.1/ksim/monitors/snmp/Makefile.in
---- kdeutils-3.4.1.orig/ksim/monitors/snmp/Makefile.in 2005-05-23 18:15:15.000000000 +0200
-+++ kdeutils-3.4.1/ksim/monitors/snmp/Makefile.in 2005-05-25 07:52:45.845357032 +0200
-@@ -218,6 +218,9 @@
+diff -Nru kdeutils-3.4.2.orig/ksim/monitors/snmp/Makefile.in kdeutils-3.4.2/ksim/monitors/snmp/Makefile.in
+--- kdeutils-3.4.2.orig/ksim/monitors/snmp/Makefile.in 2005-07-20 20:23:54.000000000 +0000
++++ kdeutils-3.4.2/ksim/monitors/snmp/Makefile.in 2005-08-02 16:59:52.328085800 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(ksim_snmp_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -219,6 +217,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10028,7 +12811,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -421,7 +424,7 @@
+@@ -422,7 +423,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10037,7 +12820,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -459,9 +462,9 @@
+@@ -460,9 +461,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10049,10 +12832,55 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -rua kdeutils-3.4.1.orig/ksim/pics/Makefile.in kdeutils-3.4.1/ksim/pics/Makefile.in
---- kdeutils-3.4.1.orig/ksim/pics/Makefile.in 2005-05-23 18:15:15.000000000 +0200
-+++ kdeutils-3.4.1/ksim/pics/Makefile.in 2005-05-25 07:52:45.852356398 +0200
-@@ -178,6 +178,9 @@
+@@ -830,22 +831,22 @@
+ mocs: hostdialog.moc
+
+ #>+ 3
+-chartmonitor.moc: $(srcdir)/chartmonitor.h
+- $(MOC) $(srcdir)/chartmonitor.h -o chartmonitor.moc
++probedialog.moc: $(srcdir)/probedialog.h
++ $(MOC) $(srcdir)/probedialog.h -o probedialog.moc
+
+ #>+ 2
+-mocs: chartmonitor.moc
++mocs: probedialog.moc
+
+ #>+ 3
+-probedialog.moc: $(srcdir)/probedialog.h
+- $(MOC) $(srcdir)/probedialog.h -o probedialog.moc
++chartmonitor.moc: $(srcdir)/chartmonitor.h
++ $(MOC) $(srcdir)/chartmonitor.h -o chartmonitor.moc
+
+ #>+ 2
+-mocs: probedialog.moc
++mocs: chartmonitor.moc
+
+ #>+ 3
+ clean-metasources:
+- -rm -f monitordialog.moc monitor.moc proberesultdialog.moc browsedialog.moc labelmonitor.moc walker.moc view.moc configpage.moc hostdialog.moc chartmonitor.moc probedialog.moc
++ -rm -f monitordialog.moc monitor.moc proberesultdialog.moc browsedialog.moc labelmonitor.moc walker.moc view.moc configpage.moc hostdialog.moc probedialog.moc chartmonitor.moc
+
+ #>+ 2
+ KDE_DIST=snmp.h browsedialogbase.ui identifier.h hostconfig.h plugin.h monitorconfig.h walker.h snmp_p.h value.h labelmonitor.h probedialog.h pdu.h hostdialogbase.ui proberesultdialog.h monitor.h snmplib.h monitordialogbase.ui proberesultdialogbase.ui chartmonitor.h monitordialog.h configure.in.in hostdialog.h value_p.h view.h Makefile.in browsedialog.h configpage.h session.h Snmp.desktop configwidget.ui Makefile.am
+@@ -905,7 +906,7 @@
+
+
+ #>+ 11
+-ksim_snmp_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/plugin.cpp $(srcdir)/view.cpp $(srcdir)/configpage.cpp $(srcdir)/snmp.cpp $(srcdir)/hostdialog.cpp $(srcdir)/value.cpp $(srcdir)/monitor.cpp $(srcdir)/monitordialog.cpp $(srcdir)/labelmonitor.cpp $(srcdir)/chartmonitor.cpp $(srcdir)/identifier.cpp $(srcdir)/monitorconfig.cpp $(srcdir)/hostconfig.cpp $(srcdir)/session.cpp $(srcdir)/probedialog.cpp $(srcdir)/snmplib.cpp $(srcdir)/pdu.cpp $(srcdir)/proberesultdialog.cpp $(srcdir)/browsedialog.cpp $(srcdir)/walker.cpp configwidget.cpp hostdialogbase.cpp monitordialogbase.cpp proberesultdialogbase.cpp browsedialogbase.cpp monitordialog.moc monitor.moc hostdialogbase.moc view.moc browsedialogbase.moc configwidget.moc proberesultdialog.moc browsedialog.moc labelmonitor.moc monitordialogbase.moc proberesultdialogbase.moc walker.moc configpage.moc hostdialog.moc chartmonitor.moc probedialog.moc
++ksim_snmp_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/plugin.cpp $(srcdir)/view.cpp $(srcdir)/configpage.cpp $(srcdir)/snmp.cpp $(srcdir)/hostdialog.cpp $(srcdir)/value.cpp $(srcdir)/monitor.cpp $(srcdir)/monitordialog.cpp $(srcdir)/labelmonitor.cpp $(srcdir)/chartmonitor.cpp $(srcdir)/identifier.cpp $(srcdir)/monitorconfig.cpp $(srcdir)/hostconfig.cpp $(srcdir)/session.cpp $(srcdir)/probedialog.cpp $(srcdir)/snmplib.cpp $(srcdir)/pdu.cpp $(srcdir)/proberesultdialog.cpp $(srcdir)/browsedialog.cpp $(srcdir)/walker.cpp configwidget.cpp hostdialogbase.cpp monitordialogbase.cpp proberesultdialogbase.cpp browsedialogbase.cpp monitordialog.moc monitor.moc hostdialogbase.moc view.moc browsedialogbase.moc configwidget.moc proberesultdialog.moc browsedialog.moc labelmonitor.moc monitordialogbase.moc proberesultdialogbase.moc walker.moc configpage.moc hostdialog.moc probedialog.moc chartmonitor.moc
+ @echo 'creating ksim_snmp_la.all_cpp.cpp ...'; \
+ rm -f ksim_snmp_la.all_cpp.files ksim_snmp_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> ksim_snmp_la.all_cpp.final; \
+diff -Nru kdeutils-3.4.2.orig/ksim/pics/Makefile.in kdeutils-3.4.2/ksim/pics/Makefile.in
+--- kdeutils-3.4.2.orig/ksim/pics/Makefile.in 2005-07-20 20:23:54.000000000 +0000
++++ kdeutils-3.4.2/ksim/pics/Makefile.in 2005-08-02 16:59:52.359081088 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -179,6 +179,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10062,7 +12890,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -363,7 +366,7 @@
+@@ -364,7 +367,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -10071,7 +12899,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -401,9 +404,9 @@
+@@ -402,9 +405,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10083,10 +12911,44 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/ksim/pics/misc/Makefile.in kdeutils-3.4.1/ksim/pics/misc/Makefile.in
---- kdeutils-3.4.1.orig/ksim/pics/misc/Makefile.in 2005-05-23 18:15:15.000000000 +0200
-+++ kdeutils-3.4.1/ksim/pics/misc/Makefile.in 2005-05-25 07:52:45.859355763 +0200
-@@ -172,6 +172,9 @@
+@@ -695,23 +698,23 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=cr16-app-ksim.png cr32-app-ksim.png cr48-app-ksim.png Makefile.in Makefile.am
++KDE_DIST=cr16-app-ksim.png cr48-app-ksim.png cr32-app-ksim.png Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
+ #>+ 13
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/cr48-app-ksim.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ksim.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/cr32-app-ksim.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksim.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/cr48-app-ksim.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ksim.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/cr16-app-ksim.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksim.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ksim.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksim.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ksim.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksim.png
+
+ #>+ 15
+diff -Nru kdeutils-3.4.2.orig/ksim/pics/misc/Makefile.in kdeutils-3.4.2/ksim/pics/misc/Makefile.in
+--- kdeutils-3.4.2.orig/ksim/pics/misc/Makefile.in 2005-07-20 20:23:54.000000000 +0000
++++ kdeutils-3.4.2/ksim/pics/misc/Makefile.in 2005-08-02 16:59:52.383077440 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -173,6 +173,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10096,7 +12958,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -359,7 +362,7 @@
+@@ -360,7 +363,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10105,7 +12967,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -397,9 +400,9 @@
+@@ -398,9 +401,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10117,10 +12979,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/ksim/themes/ksim/host/Makefile.in kdeutils-3.4.1/ksim/themes/ksim/host/Makefile.in
---- kdeutils-3.4.1.orig/ksim/themes/ksim/host/Makefile.in 2005-05-23 18:15:15.000000000 +0200
-+++ kdeutils-3.4.1/ksim/themes/ksim/host/Makefile.in 2005-05-25 07:52:45.879353950 +0200
-@@ -172,6 +172,9 @@
+diff -Nru kdeutils-3.4.2.orig/ksim/themes/ksim/host/Makefile.in kdeutils-3.4.2/ksim/themes/ksim/host/Makefile.in
+--- kdeutils-3.4.2.orig/ksim/themes/ksim/host/Makefile.in 2005-07-20 20:23:54.000000000 +0000
++++ kdeutils-3.4.2/ksim/themes/ksim/host/Makefile.in 2005-08-02 16:59:52.566049624 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -173,6 +173,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10130,7 +12998,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -358,7 +361,7 @@
+@@ -359,7 +362,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10139,7 +13007,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -396,9 +399,9 @@
+@@ -397,9 +400,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10151,10 +13019,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/ksim/themes/ksim/mail/Makefile.in kdeutils-3.4.1/ksim/themes/ksim/mail/Makefile.in
---- kdeutils-3.4.1.orig/ksim/themes/ksim/mail/Makefile.in 2005-05-23 18:15:15.000000000 +0200
-+++ kdeutils-3.4.1/ksim/themes/ksim/mail/Makefile.in 2005-05-25 07:52:45.885353406 +0200
-@@ -172,6 +172,9 @@
+diff -Nru kdeutils-3.4.2.orig/ksim/themes/ksim/mail/Makefile.in kdeutils-3.4.2/ksim/themes/ksim/mail/Makefile.in
+--- kdeutils-3.4.2.orig/ksim/themes/ksim/mail/Makefile.in 2005-07-20 20:23:54.000000000 +0000
++++ kdeutils-3.4.2/ksim/themes/ksim/mail/Makefile.in 2005-08-02 16:59:52.590045976 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -173,6 +173,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10164,7 +13038,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -357,7 +360,7 @@
+@@ -358,7 +361,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10173,7 +13047,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -395,9 +398,9 @@
+@@ -396,9 +399,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10185,10 +13059,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/ksim/themes/ksim/Makefile.in kdeutils-3.4.1/ksim/themes/ksim/Makefile.in
---- kdeutils-3.4.1.orig/ksim/themes/ksim/Makefile.in 2005-05-23 18:15:15.000000000 +0200
-+++ kdeutils-3.4.1/ksim/themes/ksim/Makefile.in 2005-05-25 07:52:45.873354494 +0200
-@@ -189,6 +189,9 @@
+diff -Nru kdeutils-3.4.2.orig/ksim/themes/ksim/Makefile.in kdeutils-3.4.2/ksim/themes/ksim/Makefile.in
+--- kdeutils-3.4.2.orig/ksim/themes/ksim/Makefile.in 2005-07-20 20:23:54.000000000 +0000
++++ kdeutils-3.4.2/ksim/themes/ksim/Makefile.in 2005-08-02 16:59:52.542053272 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -190,6 +190,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10198,7 +13078,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -394,7 +397,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -10207,7 +13087,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -432,9 +435,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10219,10 +13099,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/ksim/themes/Makefile.in kdeutils-3.4.1/ksim/themes/Makefile.in
---- kdeutils-3.4.1.orig/ksim/themes/Makefile.in 2005-05-23 18:15:15.000000000 +0200
-+++ kdeutils-3.4.1/ksim/themes/Makefile.in 2005-05-25 07:52:45.865355219 +0200
-@@ -178,6 +178,9 @@
+diff -Nru kdeutils-3.4.2.orig/ksim/themes/Makefile.in kdeutils-3.4.2/ksim/themes/Makefile.in
+--- kdeutils-3.4.2.orig/ksim/themes/Makefile.in 2005-07-20 20:23:54.000000000 +0000
++++ kdeutils-3.4.2/ksim/themes/Makefile.in 2005-08-02 16:59:52.507058592 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -179,6 +179,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10232,7 +13118,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -362,7 +365,7 @@
+@@ -363,7 +366,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -10241,7 +13127,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
@@ -10253,10 +13139,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/ktimer/Makefile.in kdeutils-3.4.1/ktimer/Makefile.in
---- kdeutils-3.4.1.orig/ktimer/Makefile.in 2005-05-23 18:15:15.000000000 +0200
-+++ kdeutils-3.4.1/ktimer/Makefile.in 2005-05-25 07:52:45.898352228 +0200
-@@ -214,6 +214,9 @@
+diff -Nru kdeutils-3.4.2.orig/ktimer/Makefile.in kdeutils-3.4.2/ktimer/Makefile.in
+--- kdeutils-3.4.2.orig/ktimer/Makefile.in 2005-07-20 20:23:54.000000000 +0000
++++ kdeutils-3.4.2/ktimer/Makefile.in 2005-08-02 16:59:52.942992320 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(ktimer_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -215,6 +213,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10266,7 +13167,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -410,7 +411,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10275,7 +13176,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -448,9 +449,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10287,10 +13188,37 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -rua kdeutils-3.4.1.orig/kwallet/icons/Makefile.in kdeutils-3.4.1/kwallet/icons/Makefile.in
---- kdeutils-3.4.1.orig/kwallet/icons/Makefile.in 2005-05-23 18:15:15.000000000 +0200
-+++ kdeutils-3.4.1/kwallet/icons/Makefile.in 2005-05-25 07:52:45.936348783 +0200
-@@ -162,6 +162,9 @@
+@@ -756,17 +757,17 @@
+ install-kde-icons:
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/cr32-app-ktimer.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ktimer.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/cr16-app-ktimer.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ktimer.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+ $(INSTALL_DATA) $(srcdir)/cr128-app-ktimer.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/ktimer.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/cr16-app-ktimer.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ktimer.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/cr48-app-ktimer.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ktimer.png
+
+ uninstall-kde-icons:
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ktimer.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ktimer.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/ktimer.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ktimer.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ktimer.png
+
+ #>+ 15
+diff -Nru kdeutils-3.4.2.orig/kwallet/icons/Makefile.in kdeutils-3.4.2/kwallet/icons/Makefile.in
+--- kdeutils-3.4.2.orig/kwallet/icons/Makefile.in 2005-07-20 20:23:54.000000000 +0000
++++ kdeutils-3.4.2/kwallet/icons/Makefile.in 2005-08-02 16:59:53.232948240 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -163,6 +163,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10300,7 +13228,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -348,7 +351,7 @@
+@@ -349,7 +352,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10309,7 +13237,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -386,9 +389,9 @@
+@@ -387,9 +390,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10321,10 +13249,46 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeutils-3.4.1.orig/kwallet/konfigurator/Makefile.in kdeutils-3.4.1/kwallet/konfigurator/Makefile.in
---- kdeutils-3.4.1.orig/kwallet/konfigurator/Makefile.in 2005-05-23 18:15:15.000000000 +0200
-+++ kdeutils-3.4.1/kwallet/konfigurator/Makefile.in 2005-05-25 07:52:45.948347696 +0200
-@@ -211,6 +211,9 @@
+@@ -540,16 +543,16 @@
+ #>+ 13
+ install-kde-icons:
+ $(mkinstalldirs) $(DESTDIR)$(picsdir)/crystalsvg/22x22/actions
++ $(INSTALL_DATA) $(srcdir)/cr22-action-wallet_open.png $(DESTDIR)$(picsdir)/crystalsvg/22x22/actions/wallet_open.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-wallet_closed.png $(DESTDIR)$(picsdir)/crystalsvg/22x22/actions/wallet_closed.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-folder_open.png $(DESTDIR)$(picsdir)/crystalsvg/22x22/actions/folder_open.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-folder_closed.png $(DESTDIR)$(picsdir)/crystalsvg/22x22/actions/folder_closed.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-wallet_open.png $(DESTDIR)$(picsdir)/crystalsvg/22x22/actions/wallet_open.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-folder_open.png $(DESTDIR)$(picsdir)/crystalsvg/22x22/actions/folder_open.png
+
+ uninstall-kde-icons:
++ -rm -f $(DESTDIR)$(picsdir)/crystalsvg/22x22/actions/wallet_open.png
+ -rm -f $(DESTDIR)$(picsdir)/crystalsvg/22x22/actions/wallet_closed.png
+- -rm -f $(DESTDIR)$(picsdir)/crystalsvg/22x22/actions/folder_open.png
+ -rm -f $(DESTDIR)$(picsdir)/crystalsvg/22x22/actions/folder_closed.png
+- -rm -f $(DESTDIR)$(picsdir)/crystalsvg/22x22/actions/wallet_open.png
++ -rm -f $(DESTDIR)$(picsdir)/crystalsvg/22x22/actions/folder_open.png
+
+ #>+ 15
+ force-reedit:
+diff -Nru kdeutils-3.4.2.orig/kwallet/konfigurator/Makefile.in kdeutils-3.4.2/kwallet/konfigurator/Makefile.in
+--- kdeutils-3.4.2.orig/kwallet/konfigurator/Makefile.in 2005-07-20 20:23:54.000000000 +0000
++++ kdeutils-3.4.2/kwallet/konfigurator/Makefile.in 2005-08-02 16:59:53.494908416 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(kcm_kwallet_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -212,6 +210,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10334,7 +13298,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -407,7 +410,7 @@
+@@ -408,7 +409,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10343,7 +13307,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -445,9 +448,9 @@
+@@ -446,9 +447,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10355,10 +13319,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -rua kdeutils-3.4.1.orig/kwallet/Makefile.in kdeutils-3.4.1/kwallet/Makefile.in
---- kdeutils-3.4.1.orig/kwallet/Makefile.in 2005-05-23 18:15:15.000000000 +0200
-+++ kdeutils-3.4.1/kwallet/Makefile.in 2005-05-25 07:52:45.928349509 +0200
-@@ -233,6 +233,9 @@
+diff -Nru kdeutils-3.4.2.orig/kwallet/Makefile.in kdeutils-3.4.2/kwallet/Makefile.in
+--- kdeutils-3.4.2.orig/kwallet/Makefile.in 2005-07-20 20:23:54.000000000 +0000
++++ kdeutils-3.4.2/kwallet/Makefile.in 2005-08-02 16:59:53.203952648 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kwalletmanager_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -234,6 +232,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10368,7 +13347,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -439,7 +442,7 @@
+@@ -440,7 +441,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10377,7 +13356,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -477,9 +480,9 @@
+@@ -478,9 +479,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10389,10 +13368,61 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -rua kdeutils-3.4.1.orig/Makefile.in kdeutils-3.4.1/Makefile.in
---- kdeutils-3.4.1.orig/Makefile.in 2005-05-23 18:15:13.000000000 +0200
-+++ kdeutils-3.4.1/Makefile.in 2005-05-25 07:52:44.181507870 +0200
-@@ -195,6 +195,9 @@
+@@ -932,7 +933,7 @@
+ -rm -f kwalletmanager.moc kwalletpopup.moc kwmapeditor.moc allyourbase.moc kwalleteditor.moc
+
+ #>+ 2
+-KDE_DIST=cr16-app-kwalletmanager.png kwalletmanager.rc cr16-app-kwalletmanager2.png cr48-app-kwalletmanager.png kwalleteditor.rc cr128-app-kwalletmanager.png kwalletmanager.desktop kbetterthankdialogbase.ui.h walletwidget.ui cr48-app-kwalletmanager2.png cr32-app-kwalletmanager2.png cr128-app-kwalletmanager2.png kwalletmanager-kwalletd.desktop cr32-app-kwalletmanager.png Makefile.in cr22-app-kwalletmanager.png cr64-app-kwalletmanager2.png cr64-app-kwalletmanager.png Makefile.am kbetterthankdialogbase.ui
++KDE_DIST=cr16-app-kwalletmanager.png kwalletmanager.rc cr16-app-kwalletmanager2.png cr48-app-kwalletmanager.png cr128-app-kwalletmanager.png kwalleteditor.rc kwalletmanager.desktop kbetterthankdialogbase.ui.h walletwidget.ui cr48-app-kwalletmanager2.png cr32-app-kwalletmanager2.png cr128-app-kwalletmanager2.png kwalletmanager-kwalletd.desktop cr32-app-kwalletmanager.png Makefile.in cr22-app-kwalletmanager.png cr64-app-kwalletmanager.png cr64-app-kwalletmanager2.png Makefile.am kbetterthankdialogbase.ui
+
+ #>+ 4
+ clean-idl:
+@@ -950,26 +951,26 @@
+
+ #>+ 22
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/cr128-app-kwalletmanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kwalletmanager.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kwalletmanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwalletmanager.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kwalletmanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kwalletmanager.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/cr22-app-kwalletmanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kwalletmanager.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/cr32-app-kwalletmanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwalletmanager.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kwalletmanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwalletmanager.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/cr128-app-kwalletmanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kwalletmanager.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/cr64-app-kwalletmanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kwalletmanager.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kwalletmanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kwalletmanager.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kwalletmanager.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwalletmanager.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kwalletmanager.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kwalletmanager.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwalletmanager.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwalletmanager.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kwalletmanager.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kwalletmanager.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kwalletmanager.png
+
+ #>+ 15
+ force-reedit:
+diff -Nru kdeutils-3.4.2.orig/Makefile.in kdeutils-3.4.2/Makefile.in
+--- kdeutils-3.4.2.orig/Makefile.in 2005-07-20 20:23:52.000000000 +0000
++++ kdeutils-3.4.2/Makefile.in 2005-08-02 16:59:33.714915432 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -196,6 +196,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10402,7 +13432,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -385,7 +388,7 @@
+@@ -386,7 +389,7 @@
.SUFFIXES:
am--refresh:
@:
@@ -10411,7 +13441,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -427,12 +430,12 @@
+@@ -428,12 +431,12 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -10426,7 +13456,7 @@
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
config.h: stamp-h1
-@@ -444,7 +447,7 @@
+@@ -445,7 +448,7 @@
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
@@ -10435,12 +13465,12 @@
cd $(top_srcdir) && $(AUTOHEADER)
rm -f stamp-h1
touch $@
-@@ -861,7 +864,7 @@
+@@ -862,7 +865,7 @@
.NOEXPORT:
#>+ 2
-KDE_DIST=configure.in subdirs Makefile.in aclocal.m4 configure.files config.h.in configure.in.in Makefile.am acinclude.m4 kdeutils.lsm Makefile.am.in
-+KDE_DIST=stamp-h.in subdirs Makefile.in configure.files config.h.in kdeutils.lsm configure.in aclocal.m4 configure.in.in acinclude.m4 Makefile.am configure Makefile.am.in
++KDE_DIST=stamp-h.in subdirs Makefile.in configure.files config.h.in kdeutils.lsm configure.in aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in
#>+ 2
docs-am:
More information about the Pkg-kde-commits
mailing list