[Pkg-kde-commits] rev 1403 -
branches/kde-3.4.0/packages/kdenetwork/debian/patches
Christopher Martin
chrsmrtn-guest at costa.debian.org
Wed Aug 3 00:32:00 UTC 2005
Author: chrsmrtn-guest
Date: 2005-08-03 00:31:54 +0000 (Wed, 03 Aug 2005)
New Revision: 1403
Modified:
branches/kde-3.4.0/packages/kdenetwork/debian/patches/98_buildprep.diff
Log:
And the kdenetwork 3.4.2 buildprep update.
Modified: branches/kde-3.4.0/packages/kdenetwork/debian/patches/98_buildprep.diff
===================================================================
--- branches/kde-3.4.0/packages/kdenetwork/debian/patches/98_buildprep.diff 2005-08-03 00:30:37 UTC (rev 1402)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/patches/98_buildprep.diff 2005-08-03 00:31:54 UTC (rev 1403)
@@ -1,7 +1,7 @@
-diff -Nru kdenetwork-3.4.1.orig/acinclude.m4 kdenetwork-3.4.1/acinclude.m4
---- kdenetwork-3.4.1.orig/acinclude.m4 2005-05-23 12:06:46.000000000 -0400
-+++ kdenetwork-3.4.1/acinclude.m4 2005-05-24 13:38:27.000000000 -0400
-@@ -1690,15 +1690,6 @@
+diff -Nru kdenetwork-3.4.2.orig/acinclude.m4 kdenetwork-3.4.2/acinclude.m4
+--- kdenetwork-3.4.2.orig/acinclude.m4 2005-07-20 20:14:38.000000000 +0000
++++ kdenetwork-3.4.2/acinclude.m4 2005-08-02 17:13:28.093070672 +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 -Nru kdenetwork-3.4.1.orig/aclocal.m4 kdenetwork-3.4.1/aclocal.m4
---- kdenetwork-3.4.1.orig/aclocal.m4 2005-05-23 12:07:03.000000000 -0400
-+++ kdenetwork-3.4.1/aclocal.m4 2005-05-24 13:39:29.000000000 -0400
+diff -Nru kdenetwork-3.4.2.orig/aclocal.m4 kdenetwork-3.4.2/aclocal.m4
+--- kdenetwork-3.4.2.orig/aclocal.m4 2005-07-20 20:14:53.000000000 +0000
++++ kdenetwork-3.4.2/aclocal.m4 2005-08-02 17:14:12.195366104 +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,15 +1570,28 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-diff -Nru kdenetwork-3.4.1.orig/configure kdenetwork-3.4.1/configure
---- kdenetwork-3.4.1.orig/configure 2005-05-23 12:09:11.000000000 -0400
-+++ kdenetwork-3.4.1/configure 2005-05-24 13:47:30.000000000 -0400
+diff -Nru kdenetwork-3.4.2.orig/config.h.in kdenetwork-3.4.2/config.h.in
+--- kdenetwork-3.4.2.orig/config.h.in 2005-07-20 20:15:04.000000000 +0000
++++ kdenetwork-3.4.2/config.h.in 2005-08-02 17:14:40.692033952 +0000
+@@ -505,9 +505,6 @@
+ #endif
+
+
+-/* define to 1 if -fvisibility is supported */
+-#undef __KDE_HAVE_GCC_VISIBILITY
+-
+
+ #if defined(__SVR4) && !defined(__svr4__)
+ #define __svr4__ 1
+diff -Nru kdenetwork-3.4.2.orig/configure kdenetwork-3.4.2/configure
+--- kdenetwork-3.4.2.orig/configure 2005-07-20 20:17:09.000000000 +0000
++++ kdenetwork-3.4.2/configure 2005-08-02 17:20:50.119872384 +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 LIB_SLP QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN include_smpppdcs_TRUE include_smpppdcs_FALSE LIBXSLT_LIBS LIBXSLT_CFLAGS LIBXSLT_RPATH LIBXML_LIBS LIBXML_CFLAGS LIBXML_RPATH KOPETE_INCLUDES KOPETE_COMPAT_INCLUDES LIB_KOPETECOMPAT LIB_XSS include_motionautoaway_TRUE include_motionautoaway_FALSE XMMS_LIBS XMMS_LDFLAGS XMMS_INCLUDES LIBGG_INCLUDES LIBGG_LIBS COMPILE_GADU include_gadu_TRUE include_gadu_FALSE include_libggcopy_TRUE include_libggcopy_FALSE SSL_INCLUDES SSL_LDFLAGS LIBSSL include_jabber_TRUE include_jabber_FALSE IDN_LDFLAGS IDN_CPPFLAGS IDN_LIBS MEANWHILE_INCLUDES MEANWHILE_LIBS COMPILE_MEANWHILE include_meanwhile_TRUE include_meanwhile_FALSE YAHOO2_VERSION SAMPLE_CLIENT_TRUE SAMPLE_CLIENT_FALSE YAHOOPKGREQ LIBXF86VIDMODE COMPILE_GETIFADDRS KDE_INSTALLED_TRUE KDE_INSTALLED_FALSE LIBBSD TOPSUBDIRS doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE filesharing_SUBDIR_included_TRUE filesharing_SUBDIR_included_FALSE kdict_SUBDIR_included_TRUE kdict_SUBDIR_included_FALSE kdnssd_SUBDIR_included_TRUE kdnssd_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kget_SUBDIR_included_TRUE kget_SUBDIR_included_FALSE kopete_SUBDIR_included_TRUE kopete_SUBDIR_included_FALSE kpf_SUBDIR_included_TRUE kpf_SUBDIR_included_FALSE kppp_SUBDIR_included_TRUE kppp_SUBDIR_included_FALSE krdc_SUBDIR_included_TRUE krdc_SUBDIR_included_FALSE krfb_SUBDIR_included_TRUE krfb_SUBDIR_included_FALSE ksirc_SUBDIR_included_TRUE ksirc_SUBDIR_included_FALSE ktalkd_SUBDIR_included_TRUE ktalkd_SUBDIR_included_FALSE lanbrowsing_SUBDIR_included_TRUE lanbrowsing_SUBDIR_included_FALSE librss_SUBDIR_included_TRUE librss_SUBDIR_included_FALSE wifi_SUBDIR_included_TRUE wifi_SUBDIR_included_FALSE knewsticker_SUBDIR_included_TRUE knewsticker_SUBDIR_included_FALSE dcoprss_SUBDIR_included_TRUE dcoprss_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 LIB_SLP QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN include_smpppdcs_TRUE include_smpppdcs_FALSE LIBXSLT_LIBS LIBXSLT_CFLAGS LIBXSLT_RPATH LIBXML_LIBS LIBXML_CFLAGS LIBXML_RPATH KOPETE_INCLUDES KOPETE_COMPAT_INCLUDES LIB_KOPETECOMPAT LIB_XSS include_motionautoaway_TRUE include_motionautoaway_FALSE XMMS_LIBS XMMS_LDFLAGS XMMS_INCLUDES LIBGG_INCLUDES LIBGG_LIBS COMPILE_GADU include_gadu_TRUE include_gadu_FALSE include_libggcopy_TRUE include_libggcopy_FALSE SSL_INCLUDES SSL_LDFLAGS LIBSSL include_jabber_TRUE include_jabber_FALSE IDN_LDFLAGS IDN_CPPFLAGS IDN_LIBS MEANWHILE_INCLUDES MEANWHILE_LIBS COMPILE_MEANWHILE include_meanwhile_TRUE include_meanwhile_FALSE YAHOO2_VERSION SAMPLE_CLIENT_TRUE SAMPLE_CLIENT_FALSE YAHOOPKGREQ LIBXF86VIDMODE COMPILE_GETIFADDRS KDE_INSTALLED_TRUE KDE_INSTALLED_FALSE LIBBSD TOPSUBDIRS doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE filesharing_SUBDIR_included_TRUE filesharing_SUBDIR_included_FALSE kdict_SUBDIR_included_TRUE kdict_SUBDIR_included_FALSE kdnssd_SUBDIR_included_TRUE kdnssd_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kget_SUBDIR_included_TRUE kget_SUBDIR_included_FALSE kopete_SUBDIR_included_TRUE kopete_SUBDIR_included_FALSE kpf_SUBDIR_included_TRUE kpf_SUBDIR_included_FALSE kppp_SUBDIR_included_TRUE kppp_SUBDIR_included_FALSE krdc_SUBDIR_included_TRUE krdc_SUBDIR_included_FALSE krfb_SUBDIR_included_TRUE krfb_SUBDIR_included_FALSE ksirc_SUBDIR_included_TRUE ksirc_SUBDIR_included_FALSE ktalkd_SUBDIR_included_TRUE ktalkd_SUBDIR_included_FALSE lanbrowsing_SUBDIR_included_TRUE lanbrowsing_SUBDIR_included_FALSE librss_SUBDIR_included_TRUE librss_SUBDIR_included_FALSE wifi_SUBDIR_included_TRUE wifi_SUBDIR_included_FALSE knewsticker_SUBDIR_included_TRUE knewsticker_SUBDIR_included_FALSE dcoprss_SUBDIR_included_TRUE dcoprss_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 LIB_SLP QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN include_smpppdcs_TRUE include_smpppdcs_FALSE LIBXSLT_LIBS LIBXSLT_CFLAGS LIBXSLT_RPATH LIBXML_LIBS LIBXML_CFLAGS LIBXML_RPATH KOPETE_INCLUDES KOPETE_COMPAT_INCLUDES LIB_KOPETECOMPAT LIB_XSS include_motionautoaway_TRUE include_motionautoaway_FALSE XMMS_LIBS XMMS_LDFLAGS XMMS_INCLUDES LIBGG_INCLUDES LIBGG_LIBS COMPILE_GADU include_gadu_TRUE include_gadu_FALSE include_libggcopy_TRUE include_libggcopy_FALSE SSL_INCLUDES SSL_LDFLAGS LIBSSL include_jabber_TRUE include_jabber_FALSE IDN_LDFLAGS IDN_CPPFLAGS IDN_LIBS MEANWHILE_INCLUDES MEANWHILE_LIBS COMPILE_MEANWHILE include_meanwhile_TRUE include_meanwhile_FALSE YAHOO2_VERSION SAMPLE_CLIENT_TRUE SAMPLE_CLIENT_FALSE YAHOOPKGREQ LIBXF86VIDMODE COMPILE_GETIFADDRS KDE_INSTALLED_TRUE KDE_INSTALLED_FALSE LIBBSD TOPSUBDIRS doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE filesharing_SUBDIR_included_TRUE filesharing_SUBDIR_included_FALSE kdict_SUBDIR_included_TRUE kdict_SUBDIR_included_FALSE kdnssd_SUBDIR_included_TRUE kdnssd_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kget_SUBDIR_included_TRUE kget_SUBDIR_included_FALSE kopete_SUBDIR_included_TRUE kopete_SUBDIR_included_FALSE kpf_SUBDIR_included_TRUE kpf_SUBDIR_included_FALSE kppp_SUBDIR_included_TRUE kppp_SUBDIR_included_FALSE krdc_SUBDIR_included_TRUE krdc_SUBDIR_included_FALSE krfb_SUBDIR_included_TRUE krfb_SUBDIR_included_FALSE ksirc_SUBDIR_included_TRUE ksirc_SUBDIR_included_FALSE ktalkd_SUBDIR_included_TRUE ktalkd_SUBDIR_included_FALSE lanbrowsing_SUBDIR_included_TRUE lanbrowsing_SUBDIR_included_FALSE librss_SUBDIR_included_TRUE librss_SUBDIR_included_FALSE wifi_SUBDIR_included_TRUE wifi_SUBDIR_included_FALSE knewsticker_SUBDIR_included_TRUE knewsticker_SUBDIR_included_FALSE dcoprss_SUBDIR_included_TRUE dcoprss_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 LIB_SLP QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN include_smpppdcs_TRUE include_smpppdcs_FALSE LIBXSLT_LIBS LIBXSLT_CFLAGS LIBXSLT_RPATH LIBXML_LIBS LIBXML_CFLAGS LIBXML_RPATH KOPETE_INCLUDES KOPETE_COMPAT_INCLUDES LIB_KOPETECOMPAT LIB_XSS include_motionautoaway_TRUE include_motionautoaway_FALSE XMMS_LIBS XMMS_LDFLAGS XMMS_INCLUDES LIBGG_INCLUDES LIBGG_LIBS COMPILE_GADU include_gadu_TRUE include_gadu_FALSE include_libggcopy_TRUE include_libggcopy_FALSE SSL_INCLUDES SSL_LDFLAGS LIBSSL include_jabber_TRUE include_jabber_FALSE IDN_LDFLAGS IDN_CPPFLAGS IDN_LIBS MEANWHILE_INCLUDES MEANWHILE_LIBS COMPILE_MEANWHILE include_meanwhile_TRUE include_meanwhile_FALSE YAHOO2_VERSION SAMPLE_CLIENT_TRUE SAMPLE_CLIENT_FALSE YAHOOPKGREQ LIBXF86VIDMODE COMPILE_GETIFADDRS KDE_INSTALLED_TRUE KDE_INSTALLED_FALSE LIBBSD TOPSUBDIRS doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE filesharing_SUBDIR_included_TRUE filesharing_SUBDIR_included_FALSE kdict_SUBDIR_included_TRUE kdict_SUBDIR_included_FALSE kdnssd_SUBDIR_included_TRUE kdnssd_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kget_SUBDIR_included_TRUE kget_SUBDIR_included_FALSE kopete_SUBDIR_included_TRUE kopete_SUBDIR_included_FALSE kpf_SUBDIR_included_TRUE kpf_SUBDIR_included_FALSE kppp_SUBDIR_included_TRUE kppp_SUBDIR_included_FALSE krdc_SUBDIR_included_TRUE krdc_SUBDIR_included_FALSE krfb_SUBDIR_included_TRUE krfb_SUBDIR_included_FALSE ksirc_SUBDIR_included_TRUE ksirc_SUBDIR_included_FALSE ktalkd_SUBDIR_included_TRUE ktalkd_SUBDIR_included_FALSE lanbrowsing_SUBDIR_included_TRUE lanbrowsing_SUBDIR_included_FALSE librss_SUBDIR_included_TRUE librss_SUBDIR_included_FALSE wifi_SUBDIR_included_TRUE wifi_SUBDIR_included_FALSE knewsticker_SUBDIR_included_TRUE knewsticker_SUBDIR_included_FALSE dcoprss_SUBDIR_included_TRUE dcoprss_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -6358,7 +6459,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28602,8 +28525,7 @@
+@@ -28605,8 +28528,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6368,7 +6469,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28678,8 +28600,7 @@
+@@ -28681,8 +28603,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6378,7 +6479,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28739,8 +28660,7 @@
+@@ -28742,8 +28663,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6388,7 +6489,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28823,8 +28743,7 @@
+@@ -28826,8 +28746,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6398,7 +6499,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28917,8 +28836,7 @@
+@@ -28920,8 +28839,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6408,7 +6509,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29092,8 +29010,7 @@
+@@ -29095,8 +29013,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6418,7 +6519,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29191,8 +29108,7 @@
+@@ -29194,8 +29111,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6428,7 +6529,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29285,8 +29201,7 @@
+@@ -29288,8 +29204,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6438,7 +6539,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29369,8 +29284,7 @@
+@@ -29372,8 +29287,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6448,25 +6549,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29423,7 +29337,7 @@
+@@ -29426,7 +29340,7 @@
do
for j in jpeglib.h;
do
-- echo "configure: 29426: $i/$j" >&5
-+ echo "configure: 29340: $i/$j" >&5
+- echo "configure: 29429: $i/$j" >&5
++ echo "configure: 29343: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -29731,7 +29645,7 @@
+@@ -29729,7 +29643,7 @@
do
for j in $kde_qt_header;
do
-- echo "configure: 29734: $i/$j" >&5
-+ echo "configure: 29648: $i/$j" >&5
+- echo "configure: 29732: $i/$j" >&5
++ echo "configure: 29646: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -30408,8 +30322,7 @@
+@@ -30406,8 +30320,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6476,103 +6577,344 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30568,7 +30481,7 @@
+@@ -30566,7 +30479,7 @@
do
for j in $kde_check_header;
do
-- echo "configure: 30571: $i/$j" >&5
-+ echo "configure: 30484: $i/$j" >&5
+- echo "configure: 30569: $i/$j" >&5
++ echo "configure: 30482: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -30598,7 +30511,7 @@
+@@ -30596,7 +30509,7 @@
do
for j in $kde_check_lib;
do
-- echo "configure: 30601: $i/$j" >&5
-+ echo "configure: 30514: $i/$j" >&5
+- echo "configure: 30599: $i/$j" >&5
++ echo "configure: 30512: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -30616,7 +30529,7 @@
+@@ -30614,7 +30527,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
-- echo "configure: 30619: $i/$j" >&5
-+ echo "configure: 30532: $i/$j" >&5
+- echo "configure: 30617: $i/$j" >&5
++ echo "configure: 30530: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -32134,7 +32047,7 @@
+@@ -32132,7 +32045,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
-- echo "configure: 32137: $i/$j" >&5
-+ echo "configure: 32050: $i/$j" >&5
+- echo "configure: 32135: $i/$j" >&5
++ echo "configure: 32048: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -32330,8 +32243,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
+@@ -32288,290 +32201,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=$?
-@@ -32418,8 +32330,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=$?
-@@ -32506,8 +32417,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=$?
-@@ -32594,8 +32504,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
+
+
+@@ -32611,8 +32240,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=$?
-@@ -32688,8 +32597,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=$?
-@@ -32786,8 +32694,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=$?
-@@ -32937,8 +32844,7 @@
+@@ -32765,8 +32393,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6582,7 +6924,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33087,8 +32993,7 @@
+@@ -32920,8 +32547,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6592,7 +6934,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33241,8 +33146,7 @@
+@@ -33073,8 +32699,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6602,7 +6944,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33396,8 +33300,7 @@
+@@ -33214,8 +32839,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6612,7 +6954,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33549,8 +33452,7 @@
+@@ -33271,8 +32895,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6622,7 +6964,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33689,8 +33591,7 @@
+@@ -33334,8 +32957,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6632,7 +6974,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33767,8 +33668,7 @@
+@@ -33418,8 +33040,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6642,7 +6984,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33797,8 +33697,7 @@
+@@ -33448,8 +33069,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6652,7 +6994,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33868,8 +33767,7 @@
+@@ -33519,8 +33139,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6662,7 +7004,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33921,8 +33819,7 @@
+@@ -33572,8 +33191,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6672,7 +7014,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33993,8 +33890,7 @@
+@@ -33644,8 +33262,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6682,7 +7024,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34046,8 +33942,7 @@
+@@ -33697,8 +33314,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6692,7 +7034,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34158,8 +34053,7 @@
+@@ -33809,8 +33425,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6702,7 +7044,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34213,9 +34107,6 @@
+@@ -33864,9 +33479,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -6712,7 +7054,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34248,8 +34139,7 @@
+@@ -33899,8 +33511,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6722,7 +7064,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34352,8 +34242,7 @@
+@@ -34003,8 +33614,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6732,7 +7074,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34484,8 +34373,7 @@
+@@ -34135,8 +33745,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6742,7 +7084,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34539,9 +34427,6 @@
+@@ -34190,9 +33799,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -6752,7 +7094,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34572,8 +34457,7 @@
+@@ -34223,8 +33829,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6762,7 +7104,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34674,8 +34558,7 @@
+@@ -34325,8 +33930,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6772,7 +7114,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34754,9 +34637,6 @@
+@@ -34405,9 +34009,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -6782,7 +7124,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34787,8 +34667,7 @@
+@@ -34438,8 +34039,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6792,7 +7134,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34889,8 +34768,7 @@
+@@ -34540,8 +34140,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6802,7 +7144,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34969,9 +34847,6 @@
+@@ -34620,9 +34219,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -6812,7 +7154,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35007,8 +34882,7 @@
+@@ -34658,8 +34254,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6822,7 +7164,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35115,8 +34989,7 @@
+@@ -34766,8 +34361,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6832,7 +7174,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35195,9 +35068,6 @@
+@@ -34846,9 +34440,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -6842,7 +7184,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35232,8 +35102,7 @@
+@@ -34883,8 +34474,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6852,7 +7194,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35338,8 +35207,7 @@
+@@ -34989,8 +34579,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6862,7 +7204,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35431,8 +35299,7 @@
+@@ -35082,8 +34671,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6872,7 +7214,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35474,8 +35341,7 @@
+@@ -35125,8 +34713,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6882,7 +7224,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35532,8 +35398,7 @@
+@@ -35183,8 +34770,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6892,7 +7234,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35692,8 +35557,7 @@
+@@ -35343,8 +34929,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6902,7 +7244,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35757,8 +35621,7 @@
+@@ -35408,8 +34993,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6912,7 +7254,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35823,8 +35686,7 @@
+@@ -35474,8 +35058,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6922,7 +7264,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35888,8 +35750,7 @@
+@@ -35539,8 +35122,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6932,7 +7274,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35965,8 +35826,7 @@
+@@ -35616,8 +35198,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6942,16 +7284,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36057,7 +35917,7 @@
+@@ -35708,7 +35289,7 @@
do
for j in qsql.html;
do
-- echo "configure: 36060: $i/$j" >&5
-+ echo "configure: 35920: $i/$j" >&5
+- echo "configure: 35711: $i/$j" >&5
++ echo "configure: 35292: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
QTDOCDIR=$i
-@@ -36247,8 +36107,7 @@
+@@ -35898,8 +35479,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6961,7 +7303,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36330,8 +36189,7 @@
+@@ -35981,8 +35561,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6971,7 +7313,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36785,8 +36643,7 @@
+@@ -36436,8 +36015,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6981,7 +7323,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36856,8 +36713,7 @@
+@@ -36507,8 +36085,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6991,7 +7333,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36919,8 +36775,7 @@
+@@ -36570,8 +36147,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7001,7 +7343,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36960,8 +36815,7 @@
+@@ -36611,8 +36187,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7011,7 +7353,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37017,8 +36871,7 @@
+@@ -36668,8 +36243,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7021,7 +7363,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37058,8 +36911,7 @@
+@@ -36709,8 +36283,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7031,7 +7373,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37123,8 +36975,7 @@
+@@ -36774,8 +36347,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7041,7 +7383,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37155,10 +37006,8 @@
+@@ -36806,10 +36378,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -7054,7 +7396,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -37269,8 +37118,7 @@
+@@ -36920,8 +36490,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7064,7 +7406,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37332,8 +37180,7 @@
+@@ -36983,8 +36552,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7074,7 +7416,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37373,8 +37220,7 @@
+@@ -37024,8 +36592,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7084,7 +7426,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37430,8 +37276,7 @@
+@@ -37081,8 +36648,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7094,7 +7436,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37471,8 +37316,7 @@
+@@ -37122,8 +36688,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7104,7 +7446,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37536,8 +37380,7 @@
+@@ -37187,8 +36752,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7114,7 +7456,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37568,10 +37411,8 @@
+@@ -37219,10 +36783,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -7127,7 +7469,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -37682,8 +37523,7 @@
+@@ -37333,8 +36895,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7137,7 +7479,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37745,8 +37585,7 @@
+@@ -37396,8 +36957,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7147,7 +7489,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37786,8 +37625,7 @@
+@@ -37437,8 +36997,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7157,7 +7499,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37843,8 +37681,7 @@
+@@ -37494,8 +37053,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7167,7 +7509,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37884,8 +37721,7 @@
+@@ -37535,8 +37093,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7177,7 +7519,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37949,8 +37785,7 @@
+@@ -37600,8 +37157,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7187,7 +7529,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37981,10 +37816,8 @@
+@@ -37632,10 +37188,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -7200,7 +7542,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -38095,8 +37928,7 @@
+@@ -37746,8 +37300,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7210,7 +7552,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38158,8 +37990,7 @@
+@@ -37809,8 +37362,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7220,7 +7562,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38199,8 +38030,7 @@
+@@ -37850,8 +37402,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7230,7 +7572,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38256,8 +38086,7 @@
+@@ -37907,8 +37458,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7240,7 +7582,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38297,8 +38126,7 @@
+@@ -37948,8 +37498,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7250,7 +7592,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38362,8 +38190,7 @@
+@@ -38013,8 +37562,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7260,7 +7602,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38394,10 +38221,8 @@
+@@ -38045,10 +37593,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -7273,7 +7615,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -38532,8 +38357,7 @@
+@@ -38183,8 +37729,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7283,7 +7625,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38702,8 +38526,7 @@
+@@ -38353,8 +37898,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7293,7 +7635,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38781,8 +38604,7 @@
+@@ -38432,8 +37976,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7303,7 +7645,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38941,8 +38763,7 @@
+@@ -38592,8 +38135,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7313,7 +7655,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39005,8 +38826,7 @@
+@@ -38656,8 +38198,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7323,7 +7665,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39088,8 +38908,7 @@
+@@ -38739,8 +38280,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7333,7 +7675,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39169,8 +38988,7 @@
+@@ -38820,8 +38360,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7343,7 +7685,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39290,8 +39108,7 @@
+@@ -38941,8 +38480,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7353,7 +7695,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39402,8 +39219,20 @@
+@@ -39053,8 +38591,20 @@
int main()
{
#if defined __GG_LIBGADU_HAVE_PTHREAD && defined GG_LOGIN60
@@ -7376,7 +7718,7 @@
if ( maj != 1 ) {
return 1;
}
-@@ -39543,8 +39372,7 @@
+@@ -39194,8 +38744,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7386,16 +7728,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39633,7 +39461,7 @@
+@@ -39284,7 +38833,7 @@
do
for j in openssl/ssl.h;
do
-- echo "configure: 39636: $i/$j" >&5
-+ echo "configure: 39464: $i/$j" >&5
+- echo "configure: 39287: $i/$j" >&5
++ echo "configure: 38836: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ssl_incdir=$i
-@@ -39688,8 +39516,7 @@
+@@ -39339,8 +38888,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7405,7 +7747,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40005,8 +39832,7 @@
+@@ -39656,8 +39204,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7415,7 +7757,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40111,8 +39937,7 @@
+@@ -39762,8 +39309,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7425,7 +7767,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40211,8 +40036,7 @@
+@@ -39862,8 +39408,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7435,7 +7777,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40382,8 +40206,7 @@
+@@ -40033,8 +39578,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7445,7 +7787,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40597,8 +40420,7 @@
+@@ -40248,8 +39792,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7455,7 +7797,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40640,8 +40462,7 @@
+@@ -40291,8 +39834,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7465,7 +7807,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40698,8 +40519,7 @@
+@@ -40349,8 +39891,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7475,7 +7817,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40867,8 +40687,7 @@
+@@ -40518,8 +40059,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7485,7 +7827,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40928,8 +40747,7 @@
+@@ -40579,8 +40119,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7495,7 +7837,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41002,8 +40820,7 @@
+@@ -40653,8 +40192,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7505,7 +7847,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41067,8 +40884,7 @@
+@@ -40718,8 +40256,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7515,7 +7857,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41132,8 +40948,7 @@
+@@ -40783,8 +40320,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7525,7 +7867,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41198,8 +41013,7 @@
+@@ -40849,8 +40385,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7535,7 +7877,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41264,8 +41078,7 @@
+@@ -40915,8 +40450,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7545,7 +7887,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41368,8 +41181,7 @@
+@@ -41019,8 +40553,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7555,7 +7897,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41508,8 +41320,7 @@
+@@ -41159,8 +40692,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7565,7 +7907,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41575,8 +41386,7 @@
+@@ -41226,8 +40758,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7575,7 +7917,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41732,8 +41542,7 @@
+@@ -41383,8 +40914,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7585,25 +7927,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41763,7 +41572,7 @@
- #define HAVE_VIDMODE_EXTENSION 1
- _ACEOF
-
-- LIBXF86VIDMODE="-lXext -lXxf86vm"
-+ LIBXF86VIDMODE="-lXext -lXxf86vm_pic"
-
- fi
-
-@@ -41820,7 +41629,7 @@
+@@ -41471,7 +41001,7 @@
do
for j in openssl/ssl.h;
do
-- echo "configure: 41823: $i/$j" >&5
-+ echo "configure: 41632: $i/$j" >&5
+- echo "configure: 41474: $i/$j" >&5
++ echo "configure: 41004: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ssl_incdir=$i
-@@ -41875,8 +41684,7 @@
+@@ -41526,8 +41056,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7613,7 +7946,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42109,8 +41917,7 @@
+@@ -41760,8 +41289,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7623,7 +7956,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42267,8 +42074,7 @@
+@@ -41918,8 +41446,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7633,7 +7966,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42447,8 +42253,7 @@
+@@ -42098,8 +41625,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7643,7 +7976,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42514,8 +42319,7 @@
+@@ -42165,8 +41691,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7653,7 +7986,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42664,8 +42468,7 @@
+@@ -42315,8 +41840,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7663,7 +7996,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42747,8 +42550,7 @@
+@@ -42398,8 +41922,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7673,7 +8006,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42854,8 +42656,7 @@
+@@ -42505,8 +42028,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7683,7 +8016,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42921,8 +42722,7 @@
+@@ -42572,8 +42094,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7693,7 +8026,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42968,8 +42768,7 @@
+@@ -42619,8 +42140,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7703,7 +8036,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43046,8 +42845,7 @@
+@@ -42697,8 +42217,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7713,7 +8046,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43113,8 +42911,7 @@
+@@ -42764,8 +42283,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7723,7 +8056,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43174,8 +42971,7 @@
+@@ -42825,8 +42343,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7733,7 +8066,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44159,6 +43955,13 @@
+@@ -43810,6 +43327,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -7747,7 +8080,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
-@@ -45261,6 +45064,9 @@
+@@ -44912,6 +44436,9 @@
s, at AMTAR@,$AMTAR,;t t
s, at am__tar@,$am__tar,;t t
s, at am__untar@,$am__untar,;t t
@@ -7757,7 +8090,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
-@@ -45686,11 +45492,6 @@
+@@ -45338,11 +44865,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
@@ -7769,7 +8102,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. */
-@@ -45729,6 +45530,12 @@
+@@ -45381,6 +44903,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
@@ -7782,19 +8115,19 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
-diff -Nru kdenetwork-3.4.1.orig/configure.in kdenetwork-3.4.1/configure.in
---- kdenetwork-3.4.1.orig/configure.in 2005-05-23 12:06:48.000000000 -0400
-+++ kdenetwork-3.4.1/configure.in 2005-05-24 13:38:38.000000000 -0400
+diff -Nru kdenetwork-3.4.2.orig/configure.in kdenetwork-3.4.2/configure.in
+--- kdenetwork-3.4.2.orig/configure.in 2005-07-20 20:14:39.000000000 +0000
++++ kdenetwork-3.4.2/configure.in 2005-08-02 17:13:30.570694016 +0000
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdenetwork, "3.4.1") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdenetwork, "3.4.2") dnl searches for some needed programs
+AM_MAINTAINER_MODE
+
KDE_SET_PREFIX
dnl generate the config header
-@@ -503,8 +505,20 @@
+@@ -510,8 +512,20 @@
int main()
{
#if defined __GG_LIBGADU_HAVE_PTHREAD && defined GG_LOGIN60
@@ -7817,19 +8150,25 @@
if ( maj != 1 ) {
return 1;
}
-@@ -767,7 +781,7 @@
+diff -Nru kdenetwork-3.4.2.orig/dcoprss/Makefile.in kdenetwork-3.4.2/dcoprss/Makefile.in
+--- kdenetwork-3.4.2.orig/dcoprss/Makefile.in 2005-07-20 20:16:57.000000000 +0000
++++ kdenetwork-3.4.2/dcoprss/Makefile.in 2005-08-02 17:20:34.213290552 +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@
- KDE_CHECK_HEADER(X11/extensions/xf86vmode.h, [
- AC_DEFINE(HAVE_VIDMODE_EXTENSION, 1, [defined if XFree86's VidMode extension is supported])
-- LIBXF86VIDMODE="-lXext -lXxf86vm"
-+ LIBXF86VIDMODE="-lXext -lXxf86vm_pic"
- ], ,
- [
- #include <X11/Xlib.h>
-diff -Nru kdenetwork-3.4.1.orig/dcoprss/Makefile.in kdenetwork-3.4.1/dcoprss/Makefile.in
---- kdenetwork-3.4.1.orig/dcoprss/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/dcoprss/Makefile.in 2005-05-24 13:47:07.000000000 -0400
-@@ -259,6 +259,9 @@
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(feedbrowser_SOURCES) $(rssclient_SOURCES) $(rssservice_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -260,6 +258,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7839,7 +8178,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -471,7 +474,7 @@
+@@ -472,7 +473,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -7848,7 +8187,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -509,9 +512,9 @@
+@@ -510,9 +511,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7860,7 +8199,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -810,18 +813,18 @@
+@@ -811,18 +812,18 @@
mocs: feedbrowser.moc
#>+ 3
@@ -7885,7 +8224,7 @@
#>+ 3
service.moc: $(srcdir)/service.h
-@@ -842,7 +845,7 @@
+@@ -843,7 +844,7 @@
#>+ 3
clean-metasources:
@@ -7894,7 +8233,7 @@
#>+ 2
KDE_DIST=Makefile.in rssnewsfeed.h rssservice.desktop feedbrowser.h Makefile.am test.sh
-@@ -908,7 +911,7 @@
+@@ -909,7 +910,7 @@
rm -f feedbrowser.all_cpp.final feedbrowser.all_cpp.files
#>+ 11
@@ -7903,10 +8242,16 @@
@echo 'creating rssservice.all_cpp.cpp ...'; \
rm -f rssservice.all_cpp.files rssservice.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> rssservice.all_cpp.final; \
-diff -Nru kdenetwork-3.4.1.orig/doc/kcontrol/kcmktalkd/Makefile.in kdenetwork-3.4.1/doc/kcontrol/kcmktalkd/Makefile.in
---- kdenetwork-3.4.1.orig/doc/kcontrol/kcmktalkd/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/doc/kcontrol/kcmktalkd/Makefile.in 2005-05-24 13:47:07.000000000 -0400
-@@ -188,6 +188,9 @@
+diff -Nru kdenetwork-3.4.2.orig/doc/kcontrol/kcmktalkd/Makefile.in kdenetwork-3.4.2/doc/kcontrol/kcmktalkd/Makefile.in
+--- kdenetwork-3.4.2.orig/doc/kcontrol/kcmktalkd/Makefile.in 2005-07-20 20:16:57.000000000 +0000
++++ kdenetwork-3.4.2/doc/kcontrol/kcmktalkd/Makefile.in 2005-08-02 17:20:34.260283408 +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@
+
+@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7916,7 +8261,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
+@@ -382,7 +385,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7925,7 +8270,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -420,9 +423,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7937,10 +8282,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/doc/kcontrol/lanbrowser/Makefile.in kdenetwork-3.4.1/doc/kcontrol/lanbrowser/Makefile.in
---- kdenetwork-3.4.1.orig/doc/kcontrol/lanbrowser/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/doc/kcontrol/lanbrowser/Makefile.in 2005-05-24 13:47:07.000000000 -0400
-@@ -188,6 +188,9 @@
+diff -Nru kdenetwork-3.4.2.orig/doc/kcontrol/lanbrowser/Makefile.in kdenetwork-3.4.2/doc/kcontrol/lanbrowser/Makefile.in
+--- kdenetwork-3.4.2.orig/doc/kcontrol/lanbrowser/Makefile.in 2005-07-20 20:16:57.000000000 +0000
++++ kdenetwork-3.4.2/doc/kcontrol/lanbrowser/Makefile.in 2005-08-02 17:20:34.282280064 +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@
+
+@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7950,7 +8301,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
+@@ -382,7 +385,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7959,7 +8310,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -420,9 +423,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7971,10 +8322,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/doc/kcontrol/Makefile.in kdenetwork-3.4.1/doc/kcontrol/Makefile.in
---- kdenetwork-3.4.1.orig/doc/kcontrol/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/doc/kcontrol/Makefile.in 2005-05-24 13:47:07.000000000 -0400
-@@ -204,6 +204,9 @@
+diff -Nru kdenetwork-3.4.2.orig/doc/kcontrol/Makefile.in kdenetwork-3.4.2/doc/kcontrol/Makefile.in
+--- kdenetwork-3.4.2.orig/doc/kcontrol/Makefile.in 2005-07-20 20:16:57.000000000 +0000
++++ kdenetwork-3.4.2/doc/kcontrol/Makefile.in 2005-08-02 17:20:34.245285688 +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@
+
+@@ -205,6 +205,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7984,7 +8341,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
xdg_menudir = @xdg_menudir@
#>- SUBDIRS = $(AUTODIRS)
#>+ 1
@@ -7993,7 +8350,7 @@
KDE_LANG = en
KDE_DOCS = AUTO
#>- all: all-recursive
-@@ -400,7 +403,7 @@
+@@ -401,7 +404,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -8002,7 +8359,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -438,9 +441,9 @@
+@@ -439,9 +442,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8014,10 +8371,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/doc/kdict/Makefile.in kdenetwork-3.4.1/doc/kdict/Makefile.in
---- kdenetwork-3.4.1.orig/doc/kdict/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/doc/kdict/Makefile.in 2005-05-24 13:47:07.000000000 -0400
-@@ -188,6 +188,9 @@
+diff -Nru kdenetwork-3.4.2.orig/doc/kdict/Makefile.in kdenetwork-3.4.2/doc/kdict/Makefile.in
+--- kdenetwork-3.4.2.orig/doc/kdict/Makefile.in 2005-07-20 20:16:57.000000000 +0000
++++ kdenetwork-3.4.2/doc/kdict/Makefile.in 2005-08-02 17:20:34.296277936 +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@
+
+@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8027,7 +8390,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
+@@ -382,7 +385,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8036,7 +8399,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -420,9 +423,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8048,7 +8411,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -569,7 +572,7 @@
+@@ -570,7 +573,7 @@
KDE_DIST=Makefile.in applet.png seteditor.png index.docbook mainwin.png Makefile.am conf.png index.cache.bz2
#>+ 24
@@ -8057,7 +8420,7 @@
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -596,20 +599,20 @@
+@@ -597,20 +600,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdict
@@ -8081,10 +8444,16 @@
cp $(srcdir)/$$file $(distdir); \
done
-diff -Nru kdenetwork-3.4.1.orig/doc/kget/Makefile.in kdenetwork-3.4.1/doc/kget/Makefile.in
---- kdenetwork-3.4.1.orig/doc/kget/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/doc/kget/Makefile.in 2005-05-24 13:47:07.000000000 -0400
-@@ -188,6 +188,9 @@
+diff -Nru kdenetwork-3.4.2.orig/doc/kget/Makefile.in kdenetwork-3.4.2/doc/kget/Makefile.in
+--- kdenetwork-3.4.2.orig/doc/kget/Makefile.in 2005-07-20 20:16:57.000000000 +0000
++++ kdenetwork-3.4.2/doc/kget/Makefile.in 2005-08-02 17:20:34.315275048 +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@
+
+@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8094,7 +8463,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
+@@ -382,7 +385,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8103,7 +8472,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -420,9 +423,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8115,7 +8484,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -566,10 +569,10 @@
+@@ -567,10 +570,10 @@
.NOEXPORT:
#>+ 2
@@ -8128,7 +8497,7 @@
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -596,20 +599,20 @@
+@@ -597,20 +600,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kget
@@ -8152,10 +8521,16 @@
cp $(srcdir)/$$file $(distdir); \
done
-diff -Nru kdenetwork-3.4.1.orig/doc/knewsticker/Makefile.in kdenetwork-3.4.1/doc/knewsticker/Makefile.in
---- kdenetwork-3.4.1.orig/doc/knewsticker/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/doc/knewsticker/Makefile.in 2005-05-24 13:47:07.000000000 -0400
-@@ -188,6 +188,9 @@
+diff -Nru kdenetwork-3.4.2.orig/doc/knewsticker/Makefile.in kdenetwork-3.4.2/doc/knewsticker/Makefile.in
+--- kdenetwork-3.4.2.orig/doc/knewsticker/Makefile.in 2005-07-20 20:16:57.000000000 +0000
++++ kdenetwork-3.4.2/doc/knewsticker/Makefile.in 2005-08-02 17:20:34.331272616 +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@
+
+@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8165,7 +8540,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
+@@ -382,7 +385,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8174,7 +8549,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -420,9 +423,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8186,7 +8561,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -566,10 +569,10 @@
+@@ -567,10 +570,10 @@
.NOEXPORT:
#>+ 2
@@ -8199,7 +8574,7 @@
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -596,20 +599,20 @@
+@@ -597,20 +600,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/knewsticker
@@ -8223,10 +8598,16 @@
cp $(srcdir)/$$file $(distdir); \
done
-diff -Nru kdenetwork-3.4.1.orig/doc/kopete/Makefile.in kdenetwork-3.4.1/doc/kopete/Makefile.in
---- kdenetwork-3.4.1.orig/doc/kopete/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/doc/kopete/Makefile.in 2005-05-24 13:47:07.000000000 -0400
-@@ -188,6 +188,9 @@
+diff -Nru kdenetwork-3.4.2.orig/doc/kopete/Makefile.in kdenetwork-3.4.2/doc/kopete/Makefile.in
+--- kdenetwork-3.4.2.orig/doc/kopete/Makefile.in 2005-07-20 20:16:57.000000000 +0000
++++ kdenetwork-3.4.2/doc/kopete/Makefile.in 2005-08-02 17:20:34.352269424 +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@
+
+@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8236,7 +8617,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
+@@ -382,7 +385,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8245,7 +8626,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -420,9 +423,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8257,7 +8638,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -569,7 +572,7 @@
+@@ -570,7 +573,7 @@
KDE_DIST=Makefile.in index.docbook menus.docbook Makefile.am index.cache.bz2
#>+ 24
@@ -8266,7 +8647,7 @@
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -596,20 +599,20 @@
+@@ -597,20 +600,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kopete
@@ -8290,10 +8671,16 @@
cp $(srcdir)/$$file $(distdir); \
done
-diff -Nru kdenetwork-3.4.1.orig/doc/kpf/Makefile.in kdenetwork-3.4.1/doc/kpf/Makefile.in
---- kdenetwork-3.4.1.orig/doc/kpf/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/doc/kpf/Makefile.in 2005-05-24 13:47:07.000000000 -0400
-@@ -188,6 +188,9 @@
+diff -Nru kdenetwork-3.4.2.orig/doc/kpf/Makefile.in kdenetwork-3.4.2/doc/kpf/Makefile.in
+--- kdenetwork-3.4.2.orig/doc/kpf/Makefile.in 2005-07-20 20:16:57.000000000 +0000
++++ kdenetwork-3.4.2/doc/kpf/Makefile.in 2005-08-02 17:20:34.367267144 +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@
+
+@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8303,7 +8690,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
+@@ -382,7 +385,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8312,7 +8699,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -420,9 +423,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8324,10 +8711,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/doc/kppp/Makefile.in kdenetwork-3.4.1/doc/kppp/Makefile.in
---- kdenetwork-3.4.1.orig/doc/kppp/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/doc/kppp/Makefile.in 2005-05-24 13:47:07.000000000 -0400
-@@ -188,6 +188,9 @@
+diff -Nru kdenetwork-3.4.2.orig/doc/kppp/Makefile.in kdenetwork-3.4.2/doc/kppp/Makefile.in
+--- kdenetwork-3.4.2.orig/doc/kppp/Makefile.in 2005-07-20 20:16:57.000000000 +0000
++++ kdenetwork-3.4.2/doc/kppp/Makefile.in 2005-08-02 17:20:34.385264408 +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@
+
+@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8337,7 +8730,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
+@@ -382,7 +385,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8346,7 +8739,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -420,9 +423,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8358,7 +8751,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -569,7 +572,7 @@
+@@ -570,7 +573,7 @@
KDE_DIST=kppp-account-ip-tab.png callback.docbook kppp-faq.docbook kppp-account-login-script-tab.png getting-online.docbook kppp-account-dns-tab.png kppp-misc-tab.png kppp-wizard.png index.docbook kppp-graph-tab.png kppp-modem-tab.png dialog-setup.docbook global-settings.docbook accounting.docbook costsgraphs.png chap.docbook wizard.docbook kppp-account-dial-tab.png ttyS-cua.txt Makefile.in kppp-config.png kppp.faq.question kppp-account-gateway-tab.png tricks.docbook hayes.docbook kppp-dialler-tab.png kppp-device-tab.png security.docbook kppp-account-accounting-tab.png Makefile.am costsgraphs.fig kppp-account-execute-tab.png index.cache.bz2
#>+ 24
@@ -8367,7 +8760,7 @@
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -596,20 +599,20 @@
+@@ -597,20 +600,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kppp
@@ -8391,10 +8784,16 @@
cp $(srcdir)/$$file $(distdir); \
done
-diff -Nru kdenetwork-3.4.1.orig/doc/krdc/Makefile.in kdenetwork-3.4.1/doc/krdc/Makefile.in
---- kdenetwork-3.4.1.orig/doc/krdc/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/doc/krdc/Makefile.in 2005-05-24 13:47:07.000000000 -0400
-@@ -188,6 +188,9 @@
+diff -Nru kdenetwork-3.4.2.orig/doc/krdc/Makefile.in kdenetwork-3.4.2/doc/krdc/Makefile.in
+--- kdenetwork-3.4.2.orig/doc/krdc/Makefile.in 2005-07-20 20:16:57.000000000 +0000
++++ kdenetwork-3.4.2/doc/krdc/Makefile.in 2005-08-02 17:20:34.411260456 +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@
+
+@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8404,7 +8803,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
+@@ -382,7 +385,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8413,7 +8812,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -420,9 +423,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8425,7 +8824,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -566,10 +569,10 @@
+@@ -567,10 +570,10 @@
.NOEXPORT:
#>+ 2
@@ -8438,7 +8837,7 @@
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -596,20 +599,20 @@
+@@ -597,20 +600,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krdc
@@ -8462,10 +8861,16 @@
cp $(srcdir)/$$file $(distdir); \
done
-diff -Nru kdenetwork-3.4.1.orig/doc/krfb/Makefile.in kdenetwork-3.4.1/doc/krfb/Makefile.in
---- kdenetwork-3.4.1.orig/doc/krfb/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/doc/krfb/Makefile.in 2005-05-24 13:47:07.000000000 -0400
-@@ -188,6 +188,9 @@
+diff -Nru kdenetwork-3.4.2.orig/doc/krfb/Makefile.in kdenetwork-3.4.2/doc/krfb/Makefile.in
+--- kdenetwork-3.4.2.orig/doc/krfb/Makefile.in 2005-07-20 20:16:57.000000000 +0000
++++ kdenetwork-3.4.2/doc/krfb/Makefile.in 2005-08-02 17:20:34.427258024 +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@
+
+@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8475,7 +8880,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
+@@ -382,7 +385,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8484,7 +8889,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -420,9 +423,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8496,7 +8901,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -566,10 +569,10 @@
+@@ -567,10 +570,10 @@
.NOEXPORT:
#>+ 2
@@ -8509,7 +8914,7 @@
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -596,20 +599,20 @@
+@@ -597,20 +600,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krfb
@@ -8533,10 +8938,16 @@
cp $(srcdir)/$$file $(distdir); \
done
-diff -Nru kdenetwork-3.4.1.orig/doc/ksirc/Makefile.in kdenetwork-3.4.1/doc/ksirc/Makefile.in
---- kdenetwork-3.4.1.orig/doc/ksirc/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/doc/ksirc/Makefile.in 2005-05-24 13:47:07.000000000 -0400
-@@ -188,6 +188,9 @@
+diff -Nru kdenetwork-3.4.2.orig/doc/ksirc/Makefile.in kdenetwork-3.4.2/doc/ksirc/Makefile.in
+--- kdenetwork-3.4.2.orig/doc/ksirc/Makefile.in 2005-07-20 20:16:57.000000000 +0000
++++ kdenetwork-3.4.2/doc/ksirc/Makefile.in 2005-08-02 17:20:34.443255592 +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@
+
+@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8546,7 +8957,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
+@@ -382,7 +385,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8555,7 +8966,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -420,9 +423,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8567,10 +8978,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/doc/ktalkd/Makefile.in kdenetwork-3.4.1/doc/ktalkd/Makefile.in
---- kdenetwork-3.4.1.orig/doc/ktalkd/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/doc/ktalkd/Makefile.in 2005-05-24 13:47:08.000000000 -0400
-@@ -188,6 +188,9 @@
+diff -Nru kdenetwork-3.4.2.orig/doc/ktalkd/Makefile.in kdenetwork-3.4.2/doc/ktalkd/Makefile.in
+--- kdenetwork-3.4.2.orig/doc/ktalkd/Makefile.in 2005-07-20 20:16:57.000000000 +0000
++++ kdenetwork-3.4.2/doc/ktalkd/Makefile.in 2005-08-02 17:20:34.458253312 +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@
+
+@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8580,7 +8997,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
+@@ -382,7 +385,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8589,7 +9006,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -420,9 +423,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8601,10 +9018,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/doc/kwifimanager/Makefile.in kdenetwork-3.4.1/doc/kwifimanager/Makefile.in
---- kdenetwork-3.4.1.orig/doc/kwifimanager/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/doc/kwifimanager/Makefile.in 2005-05-24 13:47:08.000000000 -0400
-@@ -188,6 +188,9 @@
+diff -Nru kdenetwork-3.4.2.orig/doc/kwifimanager/Makefile.in kdenetwork-3.4.2/doc/kwifimanager/Makefile.in
+--- kdenetwork-3.4.2.orig/doc/kwifimanager/Makefile.in 2005-07-20 20:16:57.000000000 +0000
++++ kdenetwork-3.4.2/doc/kwifimanager/Makefile.in 2005-08-02 17:20:34.473251032 +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@
+
+@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8614,7 +9037,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
+@@ -382,7 +385,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8623,7 +9046,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -420,9 +423,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8635,10 +9058,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/doc/lisa/Makefile.in kdenetwork-3.4.1/doc/lisa/Makefile.in
---- kdenetwork-3.4.1.orig/doc/lisa/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/doc/lisa/Makefile.in 2005-05-24 13:47:08.000000000 -0400
-@@ -188,6 +188,9 @@
+diff -Nru kdenetwork-3.4.2.orig/doc/lisa/Makefile.in kdenetwork-3.4.2/doc/lisa/Makefile.in
+--- kdenetwork-3.4.2.orig/doc/lisa/Makefile.in 2005-07-20 20:16:57.000000000 +0000
++++ kdenetwork-3.4.2/doc/lisa/Makefile.in 2005-08-02 17:20:34.487248904 +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@
+
+@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8648,7 +9077,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
+@@ -382,7 +385,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8657,7 +9086,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -420,9 +423,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8669,10 +9098,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/doc/Makefile.in kdenetwork-3.4.1/doc/Makefile.in
---- kdenetwork-3.4.1.orig/doc/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/doc/Makefile.in 2005-05-24 13:47:07.000000000 -0400
-@@ -204,6 +204,9 @@
+diff -Nru kdenetwork-3.4.2.orig/doc/Makefile.in kdenetwork-3.4.2/doc/Makefile.in
+--- kdenetwork-3.4.2.orig/doc/Makefile.in 2005-07-20 20:16:57.000000000 +0000
++++ kdenetwork-3.4.2/doc/Makefile.in 2005-08-02 17:20:34.230287968 +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@
+
+@@ -205,6 +205,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8682,7 +9117,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,13 +397,13 @@
+@@ -395,13 +398,13 @@
KDE_DOCS = AUTO
#>- SUBDIRS = $(AUTODIRS)
#>+ 1
@@ -8698,7 +9133,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -438,9 +441,9 @@
+@@ -439,9 +442,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8710,10 +9145,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/filesharing/advanced/kcm_sambaconf/Makefile.in kdenetwork-3.4.1/filesharing/advanced/kcm_sambaconf/Makefile.in
---- kdenetwork-3.4.1.orig/filesharing/advanced/kcm_sambaconf/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/filesharing/advanced/kcm_sambaconf/Makefile.in 2005-05-24 13:47:08.000000000 -0400
-@@ -254,6 +254,9 @@
+diff -Nru kdenetwork-3.4.2.orig/filesharing/advanced/kcm_sambaconf/Makefile.in kdenetwork-3.4.2/filesharing/advanced/kcm_sambaconf/Makefile.in
+--- kdenetwork-3.4.2.orig/filesharing/advanced/kcm_sambaconf/Makefile.in 2005-07-20 20:16:57.000000000 +0000
++++ kdenetwork-3.4.2/filesharing/advanced/kcm_sambaconf/Makefile.in 2005-08-02 17:20:34.631227016 +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 = $(libfilesharesamba_la_SOURCES) $(libkcm_kcmsambaconf_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -255,6 +253,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8723,7 +9173,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -516,7 +519,7 @@
+@@ -517,7 +518,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8732,7 +9182,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -554,9 +557,9 @@
+@@ -555,9 +556,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8744,7 +9194,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -868,18 +871,18 @@
+@@ -869,18 +870,18 @@
mocs: kcmsambaconf.moc
#>+ 3
@@ -8769,7 +9219,7 @@
#>+ 3
hiddenfileview.moc: $(srcdir)/hiddenfileview.h
-@@ -948,10 +951,10 @@
+@@ -949,10 +950,10 @@
#>+ 3
clean-metasources:
@@ -8782,10 +9232,16 @@
#>+ 13
clean-ui:
-diff -Nru kdenetwork-3.4.1.orig/filesharing/advanced/Makefile.in kdenetwork-3.4.1/filesharing/advanced/Makefile.in
---- kdenetwork-3.4.1.orig/filesharing/advanced/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/filesharing/advanced/Makefile.in 2005-05-24 13:47:08.000000000 -0400
-@@ -204,6 +204,9 @@
+diff -Nru kdenetwork-3.4.2.orig/filesharing/advanced/Makefile.in kdenetwork-3.4.2/filesharing/advanced/Makefile.in
+--- kdenetwork-3.4.2.orig/filesharing/advanced/Makefile.in 2005-07-20 20:16:57.000000000 +0000
++++ kdenetwork-3.4.2/filesharing/advanced/Makefile.in 2005-08-02 17:20:34.524243280 +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@
+
+@@ -205,6 +205,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8795,7 +9251,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
+@@ -397,7 +400,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -8804,7 +9260,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -435,9 +438,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8816,10 +9272,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/filesharing/advanced/nfs/Makefile.in kdenetwork-3.4.1/filesharing/advanced/nfs/Makefile.in
---- kdenetwork-3.4.1.orig/filesharing/advanced/nfs/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/filesharing/advanced/nfs/Makefile.in 2005-05-24 13:47:08.000000000 -0400
-@@ -225,6 +225,9 @@
+diff -Nru kdenetwork-3.4.2.orig/filesharing/advanced/nfs/Makefile.in kdenetwork-3.4.2/filesharing/advanced/nfs/Makefile.in
+--- kdenetwork-3.4.2.orig/filesharing/advanced/nfs/Makefile.in 2005-07-20 20:16:57.000000000 +0000
++++ kdenetwork-3.4.2/filesharing/advanced/nfs/Makefile.in 2005-08-02 17:20:34.659222760 +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@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libfilesharenfs_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -226,6 +224,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8829,7 +9300,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -436,7 +439,7 @@
+@@ -437,7 +438,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8838,7 +9309,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -474,9 +477,9 @@
+@@ -475,9 +476,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8850,10 +9321,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdenetwork-3.4.1.orig/filesharing/advanced/propsdlgplugin/Makefile.in kdenetwork-3.4.1/filesharing/advanced/propsdlgplugin/Makefile.in
---- kdenetwork-3.4.1.orig/filesharing/advanced/propsdlgplugin/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/filesharing/advanced/propsdlgplugin/Makefile.in 2005-05-24 13:47:08.000000000 -0400
-@@ -247,6 +247,9 @@
+diff -Nru kdenetwork-3.4.2.orig/filesharing/advanced/propsdlgplugin/Makefile.in kdenetwork-3.4.2/filesharing/advanced/propsdlgplugin/Makefile.in
+--- kdenetwork-3.4.2.orig/filesharing/advanced/propsdlgplugin/Makefile.in 2005-07-20 20:16:58.000000000 +0000
++++ kdenetwork-3.4.2/filesharing/advanced/propsdlgplugin/Makefile.in 2005-08-02 17:20:34.705215768 +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 = $(fileshare_propsdlgplugin_la_SOURCES) $(libpropsdlgplugin_common_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -248,6 +246,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8863,7 +9349,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,7 +463,7 @@
+@@ -461,7 +462,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8872,7 +9358,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
@@ -8884,10 +9370,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdenetwork-3.4.1.orig/filesharing/Makefile.in kdenetwork-3.4.1/filesharing/Makefile.in
---- kdenetwork-3.4.1.orig/filesharing/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/filesharing/Makefile.in 2005-05-24 13:47:08.000000000 -0400
-@@ -204,6 +204,9 @@
+diff -Nru kdenetwork-3.4.2.orig/filesharing/Makefile.in kdenetwork-3.4.2/filesharing/Makefile.in
+--- kdenetwork-3.4.2.orig/filesharing/Makefile.in 2005-07-20 20:16:57.000000000 +0000
++++ kdenetwork-3.4.2/filesharing/Makefile.in 2005-08-02 17:20:34.510245408 +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@
+
+@@ -205,6 +205,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8897,7 +9389,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
+@@ -397,7 +400,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -8906,7 +9398,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -435,9 +438,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8918,10 +9410,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/filesharing/simple/Makefile.in kdenetwork-3.4.1/filesharing/simple/Makefile.in
---- kdenetwork-3.4.1.orig/filesharing/simple/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/filesharing/simple/Makefile.in 2005-05-24 13:47:09.000000000 -0400
-@@ -242,6 +242,9 @@
+diff -Nru kdenetwork-3.4.2.orig/filesharing/simple/Makefile.in kdenetwork-3.4.2/filesharing/simple/Makefile.in
+--- kdenetwork-3.4.2.orig/filesharing/simple/Makefile.in 2005-07-20 20:16:58.000000000 +0000
++++ kdenetwork-3.4.2/filesharing/simple/Makefile.in 2005-08-02 17:20:34.741210296 +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_fileshare_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -243,6 +241,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8931,7 +9438,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -458,7 +461,7 @@
+@@ -459,7 +460,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8940,7 +9447,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -496,9 +499,9 @@
+@@ -497,9 +498,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8952,10 +9459,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdenetwork-3.4.1.orig/kdict/applet/Makefile.in kdenetwork-3.4.1/kdict/applet/Makefile.in
---- kdenetwork-3.4.1.orig/kdict/applet/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/kdict/applet/Makefile.in 2005-05-24 13:47:09.000000000 -0400
-@@ -236,6 +236,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kdict/applet/Makefile.in kdenetwork-3.4.2/kdict/applet/Makefile.in
+--- kdenetwork-3.4.2.orig/kdict/applet/Makefile.in 2005-07-20 20:16:58.000000000 +0000
++++ kdenetwork-3.4.2/kdict/applet/Makefile.in 2005-08-02 17:20:34.942179744 +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 = $(kdict_panelapplet_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -237,6 +235,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8965,7 +9487,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -438,7 +441,7 @@
+@@ -439,7 +440,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8974,7 +9496,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -476,9 +479,9 @@
+@@ -477,9 +478,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8986,10 +9508,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdenetwork-3.4.1.orig/kdict/Makefile.in kdenetwork-3.4.1/kdict/Makefile.in
---- kdenetwork-3.4.1.orig/kdict/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/kdict/Makefile.in 2005-05-24 13:47:09.000000000 -0400
-@@ -260,6 +260,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kdict/Makefile.in kdenetwork-3.4.2/kdict/Makefile.in
+--- kdenetwork-3.4.2.orig/kdict/Makefile.in 2005-07-20 20:16:58.000000000 +0000
++++ kdenetwork-3.4.2/kdict/Makefile.in 2005-08-02 17:20:34.912184304 +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 = $(kdict_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -261,6 +259,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8999,7 +9536,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -487,7 +490,7 @@
+@@ -488,7 +489,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9008,7 +9545,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -525,9 +528,9 @@
+@@ -526,9 +527,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9020,7 +9557,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -942,13 +945,6 @@
+@@ -943,13 +944,6 @@
$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub dcopinterface.kidl
#>+ 3
@@ -9034,7 +9571,7 @@
actions.moc: $(srcdir)/actions.h
$(MOC) $(srcdir)/actions.h -o actions.moc
-@@ -956,25 +952,18 @@
+@@ -957,25 +951,18 @@
mocs: actions.moc
#>+ 3
@@ -9066,7 +9603,7 @@
#>+ 3
application.moc: $(srcdir)/application.h
-@@ -998,8 +987,22 @@
+@@ -999,8 +986,22 @@
mocs: dict.moc
#>+ 3
@@ -9090,7 +9627,7 @@
#>+ 2
KDE_DIST=crsc-app-kdict.svgz kdictui.rc cr16-app-kdict.png cr48-app-kdict.png cr32-app-kdict.png dcopinterface.h Makefile.in cr64-app-kdict.png kdict.desktop cr128-app-kdict.png Makefile.am LICENSE
-@@ -1014,6 +1017,8 @@
+@@ -1015,6 +1016,8 @@
#>+ 22
install-kde-icons:
@@ -9099,7 +9636,7 @@
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
$(INSTALL_DATA) $(srcdir)/crsc-app-kdict.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kdict.svgz
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-@@ -1024,16 +1029,14 @@
+@@ -1025,16 +1028,14 @@
$(INSTALL_DATA) $(srcdir)/cr128-app-kdict.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdict.png
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
$(INSTALL_DATA) $(srcdir)/cr32-app-kdict.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdict.png
@@ -9117,7 +9654,7 @@
#>+ 15
force-reedit:
-@@ -1074,7 +1077,7 @@
+@@ -1075,7 +1076,7 @@
#>+ 11
@@ -9126,7 +9663,7 @@
@echo 'creating kdict.all_cpp.cpp ...'; \
rm -f kdict.all_cpp.files kdict.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kdict.all_cpp.final; \
-@@ -1121,8 +1124,8 @@
+@@ -1122,8 +1123,8 @@
matchview.lo: matchview.moc
actions.lo: actions.moc
options.lo: options.moc
@@ -9136,10 +9673,16 @@
dict.lo: dict.moc
nmcheck:
queryview.o: queryview.moc
-diff -Nru kdenetwork-3.4.1.orig/kdict/pics/Makefile.in kdenetwork-3.4.1/kdict/pics/Makefile.in
---- kdenetwork-3.4.1.orig/kdict/pics/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/kdict/pics/Makefile.in 2005-05-24 13:47:09.000000000 -0400
-@@ -188,6 +188,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kdict/pics/Makefile.in kdenetwork-3.4.2/kdict/pics/Makefile.in
+--- kdenetwork-3.4.2.orig/kdict/pics/Makefile.in 2005-07-20 20:16:58.000000000 +0000
++++ kdenetwork-3.4.2/kdict/pics/Makefile.in 2005-08-02 17:20:34.958177312 +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@
+
+@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9149,7 +9692,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
+@@ -382,7 +385,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9158,7 +9701,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -420,9 +423,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9170,7 +9713,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -571,19 +574,19 @@
+@@ -572,19 +575,19 @@
#>+ 15
install-kde-icons:
@@ -9193,10 +9736,25 @@
#>+ 15
force-reedit:
-diff -Nru kdenetwork-3.4.1.orig/kdnssd/ioslave/Makefile.in kdenetwork-3.4.1/kdnssd/ioslave/Makefile.in
---- kdenetwork-3.4.1.orig/kdnssd/ioslave/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/kdnssd/ioslave/Makefile.in 2005-05-24 13:47:09.000000000 -0400
-@@ -237,6 +237,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kdnssd/ioslave/Makefile.in kdenetwork-3.4.2/kdnssd/ioslave/Makefile.in
+--- kdenetwork-3.4.2.orig/kdnssd/ioslave/Makefile.in 2005-07-20 20:16:58.000000000 +0000
++++ kdenetwork-3.4.2/kdnssd/ioslave/Makefile.in 2005-08-02 17:20:35.007169864 +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 = $(kio_zeroconf_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -238,6 +236,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9206,7 +9764,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -441,7 +444,7 @@
+@@ -442,7 +443,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9215,7 +9773,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -479,9 +482,9 @@
+@@ -480,9 +481,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9227,7 +9785,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -819,7 +822,7 @@
+@@ -820,7 +821,7 @@
-rm -f dnssd.moc
#>+ 2
@@ -9236,10 +9794,25 @@
#>+ 3
clean-closures:
-diff -Nru kdenetwork-3.4.1.orig/kdnssd/kdedmodule/Makefile.in kdenetwork-3.4.1/kdnssd/kdedmodule/Makefile.in
---- kdenetwork-3.4.1.orig/kdnssd/kdedmodule/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/kdnssd/kdedmodule/Makefile.in 2005-05-24 13:47:09.000000000 -0400
-@@ -236,6 +236,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kdnssd/kdedmodule/Makefile.in kdenetwork-3.4.2/kdnssd/kdedmodule/Makefile.in
+--- kdenetwork-3.4.2.orig/kdnssd/kdedmodule/Makefile.in 2005-07-20 20:16:58.000000000 +0000
++++ kdenetwork-3.4.2/kdnssd/kdedmodule/Makefile.in 2005-08-02 17:20:35.033165912 +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 = $(kded_dnssdwatcher_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -237,6 +235,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9249,7 +9822,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -438,7 +441,7 @@
+@@ -439,7 +440,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9258,7 +9831,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -476,9 +479,9 @@
+@@ -477,9 +478,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9270,10 +9843,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdenetwork-3.4.1.orig/kdnssd/Makefile.in kdenetwork-3.4.1/kdnssd/Makefile.in
---- kdenetwork-3.4.1.orig/kdnssd/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/kdnssd/Makefile.in 2005-05-24 13:47:09.000000000 -0400
-@@ -204,6 +204,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kdnssd/Makefile.in kdenetwork-3.4.2/kdnssd/Makefile.in
+--- kdenetwork-3.4.2.orig/kdnssd/Makefile.in 2005-07-20 20:16:58.000000000 +0000
++++ kdenetwork-3.4.2/kdnssd/Makefile.in 2005-08-02 17:20:34.980173968 +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@
+
+@@ -205,6 +205,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9283,7 +9862,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
+@@ -397,7 +400,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -9292,7 +9871,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -435,9 +438,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9304,10 +9883,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kfile-plugins/Makefile.in kdenetwork-3.4.1/kfile-plugins/Makefile.in
---- kdenetwork-3.4.1.orig/kfile-plugins/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/kfile-plugins/Makefile.in 2005-05-24 13:47:09.000000000 -0400
-@@ -204,6 +204,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kfile-plugins/Makefile.in kdenetwork-3.4.2/kfile-plugins/Makefile.in
+--- kdenetwork-3.4.2.orig/kfile-plugins/Makefile.in 2005-07-20 20:16:58.000000000 +0000
++++ kdenetwork-3.4.2/kfile-plugins/Makefile.in 2005-08-02 17:20:35.048163632 +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@
+
+@@ -205,6 +205,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9317,7 +9902,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
+@@ -397,7 +400,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -9326,7 +9911,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -435,9 +438,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9338,10 +9923,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kfile-plugins/torrent/Makefile.in kdenetwork-3.4.1/kfile-plugins/torrent/Makefile.in
---- kdenetwork-3.4.1.orig/kfile-plugins/torrent/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/kfile-plugins/torrent/Makefile.in 2005-05-24 13:47:09.000000000 -0400
-@@ -241,6 +241,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kfile-plugins/torrent/Makefile.in kdenetwork-3.4.2/kfile-plugins/torrent/Makefile.in
+--- kdenetwork-3.4.2.orig/kfile-plugins/torrent/Makefile.in 2005-07-20 20:16:58.000000000 +0000
++++ kdenetwork-3.4.2/kfile-plugins/torrent/Makefile.in 2005-08-02 17:20:35.081158616 +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 = $(kfile_torrent_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -242,6 +240,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9351,7 +9951,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -448,7 +451,7 @@
+@@ -449,7 +450,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9360,7 +9960,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -486,9 +489,9 @@
+@@ -487,9 +488,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9372,10 +9972,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdenetwork-3.4.1.orig/kget/icons/Makefile.in kdenetwork-3.4.1/kget/icons/Makefile.in
---- kdenetwork-3.4.1.orig/kget/icons/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/kget/icons/Makefile.in 2005-05-24 13:47:09.000000000 -0400
-@@ -188,6 +188,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kget/icons/Makefile.in kdenetwork-3.4.2/kget/icons/Makefile.in
+--- kdenetwork-3.4.2.orig/kget/icons/Makefile.in 2005-07-20 20:16:58.000000000 +0000
++++ kdenetwork-3.4.2/kget/icons/Makefile.in 2005-08-02 17:20:35.295126088 +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@
+
+@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9385,7 +9991,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
+@@ -382,7 +385,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9394,7 +10000,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -420,9 +423,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9406,16 +10012,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -564,7 +567,7 @@
+@@ -565,7 +568,7 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=cr22-action-bar6.png cr22-action-tool_expert.png cr22-action-tool_logwindow.png cr22-action-tool_uselastdir.png cr22-action-bar0.png cr22-action-tool_drop_target.png cr22-action-bar4.png cr22-action-tool_dock.png cr22-action-tool_pause.png cr22-action-tool_paste.png cr22-action-tool_shutdown.png cr22-action-bar3.png cr22-action-tool_delay.png Makefile.in cr22-action-bar5.png cr22-action-tool_preferences.png cr22-action-tool_resume.png cr22-action-tool_offline_mode_off.png cr22-action-tool_offline_mode_on.png cr22-action-bar2.png cr22-action-dock.png cr22-action-tool_clipboard.png cr22-action-tool_restart.png cr22-action-tool_timer.png cr22-action-tool_disconnect.png cr22-action-tool_queue.png Makefile.am cr22-action-bar1.png cr22-action-tool_normal.png
-+KDE_DIST=cr22-action-bar6.png cr22-action-tool_expert.png cr22-action-tool_logwindow.png cr22-action-tool_uselastdir.png cr22-action-bar0.png cr22-action-bar4.png cr22-action-tool_drop_target.png cr22-action-tool_dock.png cr22-action-tool_pause.png cr22-action-tool_paste.png cr22-action-tool_shutdown.png cr22-action-bar3.png cr22-action-tool_delay.png Makefile.in cr22-action-bar5.png cr22-action-tool_preferences.png cr22-action-tool_resume.png cr22-action-tool_offline_mode_off.png cr22-action-tool_offline_mode_on.png cr22-action-bar2.png cr22-action-dock.png cr22-action-tool_restart.png cr22-action-tool_clipboard.png cr22-action-tool_timer.png cr22-action-tool_queue.png cr22-action-tool_disconnect.png cr22-action-bar1.png Makefile.am cr22-action-tool_normal.png
+-KDE_DIST=cr22-action-bar6.png cr22-action-kget_dock.png cr22-action-tool_expert.png cr22-action-tool_logwindow.png cr22-action-tool_uselastdir.png cr22-action-bar0.png cr22-action-tool_drop_target.png cr22-action-bar4.png cr22-action-tool_dock.png cr22-action-tool_pause.png cr22-action-tool_paste.png cr22-action-tool_shutdown.png cr22-action-bar3.png cr22-action-tool_delay.png Makefile.in cr22-action-bar5.png cr22-action-tool_preferences.png cr22-action-tool_resume.png cr22-action-tool_offline_mode_off.png cr22-action-tool_offline_mode_on.png cr22-action-bar2.png cr22-action-tool_clipboard.png cr22-action-tool_restart.png cr22-action-tool_timer.png cr22-action-tool_disconnect.png cr22-action-tool_queue.png Makefile.am cr22-action-bar1.png cr22-action-tool_normal.png
++KDE_DIST=cr22-action-bar6.png cr22-action-kget_dock.png cr22-action-tool_expert.png cr22-action-tool_logwindow.png cr22-action-tool_uselastdir.png cr22-action-bar0.png cr22-action-bar4.png cr22-action-tool_drop_target.png cr22-action-tool_dock.png cr22-action-tool_pause.png cr22-action-tool_paste.png cr22-action-tool_shutdown.png cr22-action-bar3.png cr22-action-tool_delay.png Makefile.in cr22-action-bar5.png cr22-action-tool_preferences.png cr22-action-tool_resume.png cr22-action-tool_offline_mode_off.png cr22-action-tool_offline_mode_on.png cr22-action-bar2.png cr22-action-tool_restart.png cr22-action-tool_clipboard.png cr22-action-tool_timer.png cr22-action-tool_queue.png cr22-action-tool_disconnect.png cr22-action-bar1.png Makefile.am cr22-action-tool_normal.png
#>+ 2
docs-am:
-@@ -573,61 +576,61 @@
+@@ -574,61 +577,61 @@
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions
$(INSTALL_DATA) $(srcdir)/cr22-action-tool_offline_mode_on.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_offline_mode_on.png
@@ -9428,7 +10034,6 @@
+ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_preferences.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_preferences.png
$(INSTALL_DATA) $(srcdir)/cr22-action-tool_timer.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_timer.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_offline_mode_off.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_offline_mode_off.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-dock.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/dock.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-bar0.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar0.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_queue.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_queue.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_restart.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_restart.png
@@ -9441,6 +10046,7 @@
+ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_pause.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_pause.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_expert.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_expert.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_drop_target.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_drop_target.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-kget_dock.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/kget_dock.png
$(INSTALL_DATA) $(srcdir)/cr22-action-tool_normal.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_normal.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-bar0.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar0.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-bar1.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar1.png
@@ -9459,9 +10065,9 @@
- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_shutdown.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_shutdown.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_paste.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_paste.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_pause.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_pause.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-kget_dock.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/kget_dock.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_uselastdir.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_uselastdir.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_queue.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_queue.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-dock.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/dock.png
uninstall-kde-icons:
-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_offline_mode_on.png
@@ -9474,7 +10080,6 @@
+ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_preferences.png
-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_timer.png
- -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_offline_mode_off.png
-- -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/dock.png
- -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar0.png
- -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_queue.png
- -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_restart.png
@@ -9487,6 +10092,7 @@
+ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_pause.png
+ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_expert.png
+ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_drop_target.png
++ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/kget_dock.png
-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_normal.png
+ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar0.png
+ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar1.png
@@ -9505,16 +10111,31 @@
- -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_shutdown.png
- -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_paste.png
- -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_pause.png
+- -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/kget_dock.png
+ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_uselastdir.png
+ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_queue.png
-+ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/dock.png
#>+ 15
force-reedit:
-diff -Nru kdenetwork-3.4.1.orig/kget/kget_plug_in/Makefile.in kdenetwork-3.4.1/kget/kget_plug_in/Makefile.in
---- kdenetwork-3.4.1.orig/kget/kget_plug_in/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/kget/kget_plug_in/Makefile.in 2005-05-24 13:47:10.000000000 -0400
-@@ -235,6 +235,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kget/kget_plug_in/Makefile.in kdenetwork-3.4.2/kget/kget_plug_in/Makefile.in
+--- kdenetwork-3.4.2.orig/kget/kget_plug_in/Makefile.in 2005-07-20 20:16:58.000000000 +0000
++++ kdenetwork-3.4.2/kget/kget_plug_in/Makefile.in 2005-08-02 17:20:35.325121528 +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 = $(khtml_kget_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -236,6 +234,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9524,7 +10145,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -436,7 +439,7 @@
+@@ -437,7 +438,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9533,7 +10154,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -474,9 +477,9 @@
+@@ -475,9 +476,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9545,10 +10166,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdenetwork-3.4.1.orig/kget/Makefile.in kdenetwork-3.4.1/kget/Makefile.in
---- kdenetwork-3.4.1.orig/kget/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/kget/Makefile.in 2005-05-24 13:47:09.000000000 -0400
-@@ -273,6 +273,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kget/Makefile.in kdenetwork-3.4.2/kget/Makefile.in
+--- kdenetwork-3.4.2.orig/kget/Makefile.in 2005-07-20 20:16:58.000000000 +0000
++++ kdenetwork-3.4.2/kget/Makefile.in 2005-08-02 17:20:35.259131560 +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 = $(kget_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -274,6 +272,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9558,7 +10194,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -505,7 +508,7 @@
+@@ -506,7 +507,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9567,7 +10203,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -543,9 +546,9 @@
+@@ -544,9 +545,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9579,7 +10215,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1012,18 +1015,18 @@
+@@ -1013,18 +1014,18 @@
mocs: dlgAdvanced.moc
#>+ 3
@@ -9604,7 +10240,7 @@
#>+ 3
slave.moc: $(srcdir)/slave.h
-@@ -1054,18 +1057,18 @@
+@@ -1055,18 +1056,18 @@
mocs: dlgSystem.moc
#>+ 3
@@ -9629,7 +10265,7 @@
#>+ 3
droptarget.moc: $(srcdir)/droptarget.h
-@@ -1104,7 +1107,7 @@
+@@ -1105,7 +1106,7 @@
#>+ 3
clean-metasources:
@@ -9638,7 +10274,7 @@
#>+ 2
KDE_DIST=kgetui.rc dlglimitsbase.ui dlgadvancedbase.ui Makefile.in dlgsystembase.ui x-kgetlist.desktop safedelete.h dlgautomationbase.ui dlgdirectoriesbase.ui dlgconnectionbase.ui cr48-mime-kget_list.png Makefile.am kget_iface.h cr48-app-kget.png
-@@ -1177,7 +1180,7 @@
+@@ -1178,7 +1179,7 @@
#>+ 11
@@ -9647,10 +10283,16 @@
@echo 'creating kget.all_cpp.cpp ...'; \
rm -f kget.all_cpp.files kget.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kget.all_cpp.final; \
-diff -Nru kdenetwork-3.4.1.orig/kget/pics/Makefile.in kdenetwork-3.4.1/kget/pics/Makefile.in
---- kdenetwork-3.4.1.orig/kget/pics/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/kget/pics/Makefile.in 2005-05-24 13:47:10.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kget/pics/Makefile.in kdenetwork-3.4.2/kget/pics/Makefile.in
+--- kdenetwork-3.4.2.orig/kget/pics/Makefile.in 2005-07-20 20:16:58.000000000 +0000
++++ kdenetwork-3.4.2/kget/pics/Makefile.in 2005-08-02 17:20:35.341119096 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9660,7 +10302,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -398,7 +401,7 @@
+@@ -399,7 +402,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9669,7 +10311,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -436,9 +439,9 @@
+@@ -437,9 +440,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9681,7 +10323,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -597,7 +600,7 @@
+@@ -598,7 +601,7 @@
.NOEXPORT:
#>+ 2
@@ -9690,10 +10332,16 @@
#>+ 2
docs-am:
-diff -Nru kdenetwork-3.4.1.orig/kget/sounds/Makefile.in kdenetwork-3.4.1/kget/sounds/Makefile.in
---- kdenetwork-3.4.1.orig/kget/sounds/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/kget/sounds/Makefile.in 2005-05-24 13:47:10.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kget/sounds/Makefile.in kdenetwork-3.4.2/kget/sounds/Makefile.in
+--- kdenetwork-3.4.2.orig/kget/sounds/Makefile.in 2005-07-20 20:16:58.000000000 +0000
++++ kdenetwork-3.4.2/kget/sounds/Makefile.in 2005-08-02 17:20:35.353117272 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9703,7 +10351,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9712,7 +10360,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9724,10 +10372,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/knewsticker/common/Makefile.in kdenetwork-3.4.1/knewsticker/common/Makefile.in
---- kdenetwork-3.4.1.orig/knewsticker/common/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/knewsticker/common/Makefile.in 2005-05-24 13:47:10.000000000 -0400
-@@ -231,6 +231,9 @@
+diff -Nru kdenetwork-3.4.2.orig/knewsticker/common/Makefile.in kdenetwork-3.4.2/knewsticker/common/Makefile.in
+--- kdenetwork-3.4.2.orig/knewsticker/common/Makefile.in 2005-07-20 20:16:58.000000000 +0000
++++ kdenetwork-3.4.2/knewsticker/common/Makefile.in 2005-08-02 17:20:35.447102984 +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 = $(libknewstickercommon_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -232,6 +230,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9737,7 +10400,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -439,7 +442,7 @@
+@@ -440,7 +441,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9746,7 +10409,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
@@ -9758,10 +10421,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdenetwork-3.4.1.orig/knewsticker/knewstickerstub/Makefile.in kdenetwork-3.4.1/knewsticker/knewstickerstub/Makefile.in
---- kdenetwork-3.4.1.orig/knewsticker/knewstickerstub/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/knewsticker/knewstickerstub/Makefile.in 2005-05-24 13:47:10.000000000 -0400
-@@ -234,6 +234,9 @@
+diff -Nru kdenetwork-3.4.2.orig/knewsticker/knewstickerstub/Makefile.in kdenetwork-3.4.2/knewsticker/knewstickerstub/Makefile.in
+--- kdenetwork-3.4.2.orig/knewsticker/knewstickerstub/Makefile.in 2005-07-20 20:16:58.000000000 +0000
++++ kdenetwork-3.4.2/knewsticker/knewstickerstub/Makefile.in 2005-08-02 17:20:35.466100096 +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 = $(knewstickerstub_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -235,6 +233,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9771,7 +10449,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -433,7 +436,7 @@
+@@ -434,7 +435,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9780,7 +10458,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
@@ -9792,10 +10470,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdenetwork-3.4.1.orig/knewsticker/kntsrcfilepropsdlg/Makefile.in kdenetwork-3.4.1/knewsticker/kntsrcfilepropsdlg/Makefile.in
---- kdenetwork-3.4.1.orig/knewsticker/kntsrcfilepropsdlg/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/knewsticker/kntsrcfilepropsdlg/Makefile.in 2005-05-24 13:47:10.000000000 -0400
-@@ -238,6 +238,9 @@
+diff -Nru kdenetwork-3.4.2.orig/knewsticker/kntsrcfilepropsdlg/Makefile.in kdenetwork-3.4.2/knewsticker/kntsrcfilepropsdlg/Makefile.in
+--- kdenetwork-3.4.2.orig/knewsticker/kntsrcfilepropsdlg/Makefile.in 2005-07-20 20:16:58.000000000 +0000
++++ kdenetwork-3.4.2/knewsticker/kntsrcfilepropsdlg/Makefile.in 2005-08-02 17:20:35.501094776 +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 = $(libkntsrcfilepropsdlg_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -239,6 +237,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9805,7 +10498,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -443,7 +446,7 @@
+@@ -444,7 +445,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9814,7 +10507,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
@@ -9826,10 +10519,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdenetwork-3.4.1.orig/knewsticker/Makefile.in kdenetwork-3.4.1/knewsticker/Makefile.in
---- kdenetwork-3.4.1.orig/knewsticker/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/knewsticker/Makefile.in 2005-05-24 13:47:10.000000000 -0400
-@@ -266,6 +266,9 @@
+diff -Nru kdenetwork-3.4.2.orig/knewsticker/Makefile.in kdenetwork-3.4.2/knewsticker/Makefile.in
+--- kdenetwork-3.4.2.orig/knewsticker/Makefile.in 2005-07-20 20:16:58.000000000 +0000
++++ kdenetwork-3.4.2/knewsticker/Makefile.in 2005-08-02 17:20:35.416107696 +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 = $(knewsticker_panelapplet_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -267,6 +265,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9839,7 +10547,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -486,7 +489,7 @@
+@@ -487,7 +488,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9848,7 +10556,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -524,9 +527,9 @@
+@@ -525,9 +526,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9860,7 +10568,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1021,18 +1024,18 @@
+@@ -1022,18 +1023,18 @@
mocs: newsscroller.moc
#>+ 3
@@ -9885,7 +10593,7 @@
#>+ 3
newssourcedlgimpl.moc: $(srcdir)/newssourcedlgimpl.h
-@@ -1043,10 +1046,10 @@
+@@ -1044,10 +1045,10 @@
#>+ 3
clean-metasources:
@@ -9898,7 +10606,7 @@
#>+ 4
clean-idl:
-@@ -1068,17 +1071,17 @@
+@@ -1069,17 +1070,17 @@
#>+ 13
install-kde-icons:
@@ -9919,7 +10627,7 @@
#>+ 15
force-reedit:
-@@ -1119,7 +1122,7 @@
+@@ -1120,7 +1121,7 @@
#>+ 11
@@ -9928,10 +10636,16 @@
@echo 'creating knewsticker_panelapplet_la.all_cpp.cpp ...'; \
rm -f knewsticker_panelapplet_la.all_cpp.files knewsticker_panelapplet_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> knewsticker_panelapplet_la.all_cpp.final; \
-diff -Nru kdenetwork-3.4.1.orig/kopete/icons/Makefile.in kdenetwork-3.4.1/kopete/icons/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/icons/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/icons/Makefile.in 2005-05-24 13:47:10.000000000 -0400
-@@ -188,6 +188,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/icons/Makefile.in kdenetwork-3.4.2/kopete/icons/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/icons/Makefile.in 2005-07-20 20:16:58.000000000 +0000
++++ kdenetwork-3.4.2/kopete/icons/Makefile.in 2005-08-02 17:20:35.547087784 +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@
+
+@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9941,7 +10655,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
+@@ -382,7 +385,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9950,7 +10664,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -420,9 +423,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9962,7 +10676,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -564,104 +567,104 @@
+@@ -565,104 +568,104 @@
.NOEXPORT:
#>+ 2
@@ -10128,10 +10842,25 @@
#>+ 15
force-reedit:
-diff -Nru kdenetwork-3.4.1.orig/kopete/kopete/addcontactwizard/Makefile.in kdenetwork-3.4.1/kopete/kopete/addcontactwizard/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/kopete/addcontactwizard/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/kopete/addcontactwizard/Makefile.in 2005-05-24 13:47:11.000000000 -0400
-@@ -230,6 +230,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/kopete/addcontactwizard/Makefile.in kdenetwork-3.4.2/kopete/kopete/addcontactwizard/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/kopete/addcontactwizard/Makefile.in 2005-07-20 20:16:58.000000000 +0000
++++ kdenetwork-3.4.2/kopete/kopete/addcontactwizard/Makefile.in 2005-08-02 17:20:35.641073496 +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 = $(libkopeteaddcontactwizard_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -231,6 +229,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10141,7 +10870,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -433,7 +436,7 @@
+@@ -434,7 +435,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10150,7 +10879,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
@@ -10162,10 +10891,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdenetwork-3.4.1.orig/kopete/kopete/chatwindow/Makefile.in kdenetwork-3.4.1/kopete/kopete/chatwindow/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/kopete/chatwindow/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/kopete/chatwindow/Makefile.in 2005-05-24 13:47:11.000000000 -0400
-@@ -270,6 +270,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/kopete/chatwindow/Makefile.in kdenetwork-3.4.2/kopete/kopete/chatwindow/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/kopete/chatwindow/Makefile.in 2005-07-20 20:16:58.000000000 +0000
++++ kdenetwork-3.4.2/kopete/kopete/chatwindow/Makefile.in 2005-08-02 17:20:35.831044616 +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 = $(kopete_chatwindow_la_SOURCES) $(kopete_emailwindow_la_SOURCES) $(libkrichtexteditpart_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -271,6 +269,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10175,7 +10919,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -488,7 +491,7 @@
+@@ -489,7 +490,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10184,7 +10928,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -526,9 +529,9 @@
+@@ -527,9 +528,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10196,7 +10940,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -911,11 +914,11 @@
+@@ -912,11 +913,11 @@
mocs: kopeteemailwindow.moc
#>+ 3
@@ -10211,7 +10955,7 @@
#>+ 3
kopetechatwindow.moc: $(srcdir)/kopetechatwindow.h
-@@ -925,11 +928,11 @@
+@@ -926,11 +927,11 @@
mocs: kopetechatwindow.moc
#>+ 3
@@ -10226,7 +10970,7 @@
#>+ 8
kopete_emailwindow.la.closure: $(kopete_emailwindow_la_OBJECTS) $(kopete_emailwindow_la_DEPENDENCIES)
-@@ -951,7 +954,7 @@
+@@ -952,7 +953,7 @@
#>+ 3
clean-metasources:
@@ -10235,7 +10979,7 @@
#>+ 2
KDE_DIST=kopeteemailwindow.rc kopetechatwindow.h emoticonselector.h emailwindow.desktop chatwindow.desktop chattexteditpart.h chatmemberslistwidget.h krichtexteditpart.h kopetechatwindow.rc chatview.h Makefile.in kopeteemoticonaction.h kopeterichtexteditpartfull.rc chatmessagepart.h kopeteemailwindow.h Makefile.am
-@@ -1002,7 +1005,7 @@
+@@ -1003,7 +1004,7 @@
#>+ 11
@@ -10244,10 +10988,25 @@
@echo 'creating kopete_chatwindow_la.all_cpp.cpp ...'; \
rm -f kopete_chatwindow_la.all_cpp.files kopete_chatwindow_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kopete_chatwindow_la.all_cpp.final; \
-diff -Nru kdenetwork-3.4.1.orig/kopete/kopete/config/accounts/Makefile.in kdenetwork-3.4.1/kopete/kopete/config/accounts/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/kopete/config/accounts/Makefile.in 2005-05-23 12:09:02.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/kopete/config/accounts/Makefile.in 2005-05-24 13:47:11.000000000 -0400
-@@ -241,6 +241,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/kopete/config/accounts/Makefile.in kdenetwork-3.4.2/kopete/kopete/config/accounts/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/kopete/config/accounts/Makefile.in 2005-07-20 20:16:58.000000000 +0000
++++ kdenetwork-3.4.2/kopete/kopete/config/accounts/Makefile.in 2005-08-02 17:20:35.901033976 +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_kopete_accountconfig_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -242,6 +240,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10257,7 +11016,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -445,7 +448,7 @@
+@@ -446,7 +447,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10266,7 +11025,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -483,9 +486,9 @@
+@@ -484,9 +485,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10278,7 +11037,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -792,7 +795,7 @@
+@@ -793,7 +794,7 @@
-rm -f addaccountwizard.moc kopeteaccountconfig.moc
#>+ 2
@@ -10287,10 +11046,25 @@
#>+ 7
clean-ui:
-diff -Nru kdenetwork-3.4.1.orig/kopete/kopete/config/appearance/Makefile.in kdenetwork-3.4.1/kopete/kopete/config/appearance/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/kopete/config/appearance/Makefile.in 2005-05-23 12:09:02.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/kopete/config/appearance/Makefile.in 2005-05-24 13:47:11.000000000 -0400
-@@ -241,6 +241,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/kopete/config/appearance/Makefile.in kdenetwork-3.4.2/kopete/kopete/config/appearance/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/kopete/config/appearance/Makefile.in 2005-07-20 20:16:58.000000000 +0000
++++ kdenetwork-3.4.2/kopete/kopete/config/appearance/Makefile.in 2005-08-02 17:20:35.946027136 +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_kopete_appearanceconfig_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -242,6 +240,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10300,7 +11074,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -452,7 +455,7 @@
+@@ -453,7 +454,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10309,7 +11083,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -490,9 +493,9 @@
+@@ -491,9 +492,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10321,7 +11095,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -799,7 +802,7 @@
+@@ -800,7 +801,7 @@
-rm -f tooltipeditdialog.moc appearanceconfig.moc
#>+ 2
@@ -10330,10 +11104,25 @@
#>+ 8
clean-ui:
-diff -Nru kdenetwork-3.4.1.orig/kopete/kopete/config/behavior/Makefile.in kdenetwork-3.4.1/kopete/kopete/config/behavior/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/kopete/config/behavior/Makefile.in 2005-05-23 12:09:02.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/kopete/config/behavior/Makefile.in 2005-05-24 13:47:11.000000000 -0400
-@@ -239,6 +239,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/kopete/config/behavior/Makefile.in kdenetwork-3.4.2/kopete/kopete/config/behavior/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/kopete/config/behavior/Makefile.in 2005-07-20 20:16:58.000000000 +0000
++++ kdenetwork-3.4.2/kopete/kopete/config/behavior/Makefile.in 2005-08-02 17:20:35.974022880 +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_kopete_behaviorconfig_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -240,6 +238,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10343,7 +11132,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -450,7 +453,7 @@
+@@ -451,7 +452,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10352,7 +11141,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -488,9 +491,9 @@
+@@ -489,9 +490,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10364,10 +11153,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdenetwork-3.4.1.orig/kopete/kopete/config/Makefile.in kdenetwork-3.4.1/kopete/kopete/config/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/kopete/config/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/kopete/config/Makefile.in 2005-05-24 13:47:11.000000000 -0400
-@@ -204,6 +204,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/kopete/config/Makefile.in kdenetwork-3.4.2/kopete/kopete/config/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/kopete/config/Makefile.in 2005-07-20 20:16:58.000000000 +0000
++++ kdenetwork-3.4.2/kopete/kopete/config/Makefile.in 2005-08-02 17:20:35.860040208 +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@
+
+@@ -205,6 +205,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10377,7 +11172,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
+@@ -397,7 +400,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -10386,7 +11181,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -435,9 +438,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10398,10 +11193,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/kopete/config/plugins/Makefile.in kdenetwork-3.4.1/kopete/kopete/config/plugins/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/kopete/config/plugins/Makefile.in 2005-05-23 12:09:02.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/kopete/config/plugins/Makefile.in 2005-05-24 13:47:11.000000000 -0400
-@@ -222,6 +222,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/kopete/config/plugins/Makefile.in kdenetwork-3.4.2/kopete/kopete/config/plugins/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/kopete/config/plugins/Makefile.in 2005-07-20 20:16:58.000000000 +0000
++++ kdenetwork-3.4.2/kopete/kopete/config/plugins/Makefile.in 2005-08-02 17:20:36.004018320 +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@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libkopetepluginconfig_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -223,6 +221,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10411,7 +11221,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -420,7 +423,7 @@
+@@ -421,7 +422,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10420,7 +11230,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -458,9 +461,9 @@
+@@ -459,9 +460,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10432,10 +11242,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdenetwork-3.4.1.orig/kopete/kopete/contactlist/Makefile.in kdenetwork-3.4.1/kopete/kopete/contactlist/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/kopete/contactlist/Makefile.in 2005-05-23 12:09:02.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/kopete/contactlist/Makefile.in 2005-05-24 13:47:11.000000000 -0400
-@@ -239,6 +239,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/kopete/contactlist/Makefile.in kdenetwork-3.4.2/kopete/kopete/contactlist/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/kopete/contactlist/Makefile.in 2005-07-20 20:16:59.000000000 +0000
++++ kdenetwork-3.4.2/kopete/kopete/contactlist/Makefile.in 2005-08-02 17:20:36.162994152 +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 = $(libkopetecontactlist_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -240,6 +238,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10445,7 +11270,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -461,7 +464,7 @@
+@@ -462,7 +463,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10454,7 +11279,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -499,9 +502,9 @@
+@@ -500,9 +501,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10466,7 +11291,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -759,18 +762,18 @@
+@@ -760,18 +761,18 @@
mocs: customnotificationprops.moc
#>+ 3
@@ -10491,7 +11316,7 @@
#>+ 3
kopetelistview.moc: $(srcdir)/kopetelistview.h
-@@ -823,10 +826,10 @@
+@@ -824,10 +825,10 @@
#>+ 3
clean-metasources:
@@ -10504,10 +11329,25 @@
#>+ 9
clean-ui:
-diff -Nru kdenetwork-3.4.1.orig/kopete/kopete/kconf_update/Makefile.in kdenetwork-3.4.1/kopete/kopete/kconf_update/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/kopete/kconf_update/Makefile.in 2005-05-23 12:09:02.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/kopete/kconf_update/Makefile.in 2005-05-24 13:47:11.000000000 -0400
-@@ -261,6 +261,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/kopete/kconf_update/Makefile.in kdenetwork-3.4.2/kopete/kopete/kconf_update/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/kopete/kconf_update/Makefile.in 2005-07-20 20:16:59.000000000 +0000
++++ kdenetwork-3.4.2/kopete/kopete/kconf_update/Makefile.in 2005-08-02 17:20:36.197988832 +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 = $(kopete_account_kconf_update_SOURCES) $(kopete_nameTracking_kconf_update_SOURCES) $(kopete_pluginloader2_kconf_update_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -262,6 +260,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10517,7 +11357,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -473,7 +476,7 @@
+@@ -474,7 +475,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10526,7 +11366,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -511,9 +514,9 @@
+@@ -512,9 +513,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10538,10 +11378,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kconfPROGRAMS: $(kconf_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdenetwork-3.4.1.orig/kopete/kopete/Makefile.in kdenetwork-3.4.1/kopete/kopete/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/kopete/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/kopete/Makefile.in 2005-05-24 13:47:10.000000000 -0400
-@@ -264,6 +264,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/kopete/Makefile.in kdenetwork-3.4.2/kopete/kopete/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/kopete/Makefile.in 2005-07-20 20:16:58.000000000 +0000
++++ kdenetwork-3.4.2/kopete/kopete/Makefile.in 2005-08-02 17:20:35.614077600 +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 = $(kopete_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -265,6 +263,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10551,7 +11406,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -506,7 +509,7 @@
+@@ -507,7 +508,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10560,7 +11415,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -544,9 +547,9 @@
+@@ -545,9 +546,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10572,7 +11427,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1000,18 +1003,18 @@
+@@ -1001,18 +1002,18 @@
mocs: kopetewindow.moc
#>+ 3
@@ -10597,7 +11452,7 @@
#>+ 3
systemtray.moc: $(srcdir)/systemtray.h
-@@ -1029,10 +1032,10 @@
+@@ -1030,10 +1031,10 @@
#>+ 3
clean-metasources:
@@ -10610,7 +11465,7 @@
#>+ 5
clean-idl:
-@@ -1045,43 +1048,43 @@
+@@ -1046,43 +1047,43 @@
#>+ 39
install-kde-icons:
@@ -10675,7 +11530,7 @@
#>+ 15
force-reedit:
-@@ -1122,7 +1125,7 @@
+@@ -1123,7 +1124,7 @@
#>+ 11
@@ -10684,10 +11539,25 @@
@echo 'creating kopete.all_cpp.cpp ...'; \
rm -f kopete.all_cpp.files kopete.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kopete.all_cpp.final; \
-diff -Nru kdenetwork-3.4.1.orig/kopete/libkopete/Makefile.in kdenetwork-3.4.1/kopete/libkopete/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/libkopete/Makefile.in 2005-05-23 12:09:02.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/libkopete/Makefile.in 2005-05-24 13:47:12.000000000 -0400
-@@ -304,6 +304,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/libkopete/Makefile.in kdenetwork-3.4.2/kopete/libkopete/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/libkopete/Makefile.in 2005-07-20 20:16:59.000000000 +0000
++++ kdenetwork-3.4.2/kopete/libkopete/Makefile.in 2005-08-02 17:20:36.374961928 +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 = $(libkopete_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -305,6 +303,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10697,7 +11567,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -556,7 +559,7 @@
+@@ -557,7 +558,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10706,7 +11576,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -594,9 +597,9 @@
+@@ -595,9 +596,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10718,7 +11588,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1265,18 +1268,18 @@
+@@ -1266,18 +1267,18 @@
mocs: kopeteaccount.moc
#>+ 3
@@ -10743,7 +11613,7 @@
#>+ 3
kopeteaccountmanager.moc: $(srcdir)/kopeteaccountmanager.h
-@@ -1293,18 +1296,18 @@
+@@ -1294,18 +1295,18 @@
mocs: kopetecommandhandler.moc
#>+ 3
@@ -10768,7 +11638,7 @@
#>+ 3
kautoconfig.moc: $(srcdir)/kautoconfig.h
-@@ -1398,18 +1401,18 @@
+@@ -1399,18 +1400,18 @@
mocs: kopeteplugin.moc
#>+ 3
@@ -10793,7 +11663,7 @@
#>+ 3
kopetecontactlist.moc: $(srcdir)/kopetecontactlist.h
-@@ -1454,18 +1457,18 @@
+@@ -1455,18 +1456,18 @@
mocs: kopeteonlinestatusmanager.moc
#>+ 3
@@ -10818,7 +11688,7 @@
#>+ 3
kopetemessagemanager.moc: $(srcdir)/kopetemessagemanager.h
-@@ -1483,7 +1486,7 @@
+@@ -1484,7 +1485,7 @@
#>+ 3
clean-metasources:
@@ -10827,7 +11697,7 @@
#>+ 2
KDE_DIST=connectionmanager.h PORTING kopetenotifyevent.h API-TODO kautoconfig.h kopetewalletmanager.h clientiface.h kopeteui.desktop kopetepluginmanager.h kopetemimesourcefactory.h kopeteplugin.desktop kopetecommandui.rc kcautoconfigmodule.h configure.in.in Makefile.in kopeteproperties.h kopeteprotocol.desktop Makefile.am networkstatuscommon.cpp
-@@ -1540,7 +1543,7 @@
+@@ -1541,7 +1542,7 @@
#>+ 11
@@ -10836,10 +11706,25 @@
@echo 'creating libkopete_la.all_cpp.cpp ...'; \
rm -f libkopete_la.all_cpp.files libkopete_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkopete_la.all_cpp.final; \
-diff -Nru kdenetwork-3.4.1.orig/kopete/libkopete/private/Makefile.in kdenetwork-3.4.1/kopete/libkopete/private/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/libkopete/private/Makefile.in 2005-05-23 12:09:02.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/libkopete/private/Makefile.in 2005-05-24 13:47:12.000000000 -0400
-@@ -226,6 +226,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/libkopete/private/Makefile.in kdenetwork-3.4.2/kopete/libkopete/private/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/libkopete/private/Makefile.in 2005-07-20 20:16:59.000000000 +0000
++++ kdenetwork-3.4.2/kopete/libkopete/private/Makefile.in 2005-08-02 17:20:36.414955848 +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@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libkopeteprivate_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -227,6 +225,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10849,7 +11734,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -428,7 +431,7 @@
+@@ -429,7 +430,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10858,7 +11743,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -466,9 +469,9 @@
+@@ -467,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10870,7 +11755,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -733,7 +736,7 @@
+@@ -734,7 +735,7 @@
-rm -f kopeteviewmanager.moc kopeteemoticons.moc kopeteprefs.moc kopetecommand.moc
#>+ 2
@@ -10879,10 +11764,25 @@
#>+ 2
docs-am:
-diff -Nru kdenetwork-3.4.1.orig/kopete/libkopete/tests/Makefile.in kdenetwork-3.4.1/kopete/libkopete/tests/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/libkopete/tests/Makefile.in 2005-05-23 12:09:02.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/libkopete/tests/Makefile.in 2005-05-24 13:47:12.000000000 -0400
-@@ -245,6 +245,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/libkopete/tests/Makefile.in kdenetwork-3.4.2/kopete/libkopete/tests/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/libkopete/tests/Makefile.in 2005-07-20 20:16:59.000000000 +0000
++++ kdenetwork-3.4.2/kopete/libkopete/tests/Makefile.in 2005-08-02 17:20:36.444951288 +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 = $(kopeteemoticontest_SOURCES) $(kopetelinktest_SOURCES) $(kopetepasswordtest_SOURCES) $(kopetepropertiestest_SOURCES) $(kopetewallettest_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -246,6 +244,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10892,7 +11792,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -457,7 +460,7 @@
+@@ -458,7 +459,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10901,7 +11801,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
@@ -10913,10 +11813,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-diff -Nru kdenetwork-3.4.1.orig/kopete/libkopete/ui/Makefile.in kdenetwork-3.4.1/kopete/libkopete/ui/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/libkopete/ui/Makefile.in 2005-05-23 12:09:02.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/libkopete/ui/Makefile.in 2005-05-24 13:47:12.000000000 -0400
-@@ -243,6 +243,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/libkopete/ui/Makefile.in kdenetwork-3.4.2/kopete/libkopete/ui/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/libkopete/ui/Makefile.in 2005-07-20 20:16:59.000000000 +0000
++++ kdenetwork-3.4.2/kopete/libkopete/ui/Makefile.in 2005-08-02 17:20:36.482945512 +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 = $(libkopeteui_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -244,6 +242,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10926,7 +11841,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -461,7 +464,7 @@
+@@ -462,7 +463,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10935,7 +11850,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -499,9 +502,9 @@
+@@ -500,9 +501,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10947,7 +11862,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -797,22 +800,22 @@
+@@ -798,22 +799,22 @@
mocs: kopetestdaction.moc
#>+ 3
@@ -10977,10 +11892,16 @@
#>+ 2
KDE_DIST=fileconfirmbase.ui widgets.cw kopetepasswordwidgetbase.ui kopeteawaydialogbase.ui Makefile.in kopetepassworddialog.ui Makefile.am
-diff -Nru kdenetwork-3.4.1.orig/kopete/Makefile.in kdenetwork-3.4.1/kopete/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/Makefile.in 2005-05-24 13:47:10.000000000 -0400
-@@ -205,6 +205,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/Makefile.in kdenetwork-3.4.2/kopete/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/Makefile.in 2005-07-20 20:16:58.000000000 +0000
++++ kdenetwork-3.4.2/kopete/Makefile.in 2005-08-02 17:20:35.516092496 +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@
+
+@@ -206,6 +206,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10990,7 +11911,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -397,7 +400,7 @@
+@@ -398,7 +401,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -10999,7 +11920,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -435,9 +438,9 @@
+@@ -436,9 +439,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11011,10 +11932,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/addbookmarks/Makefile.in kdenetwork-3.4.1/kopete/plugins/addbookmarks/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/addbookmarks/Makefile.in 2005-05-23 12:09:02.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/plugins/addbookmarks/Makefile.in 2005-05-24 13:47:12.000000000 -0400
-@@ -256,6 +256,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/plugins/addbookmarks/Makefile.in kdenetwork-3.4.2/kopete/plugins/addbookmarks/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/plugins/addbookmarks/Makefile.in 2005-07-20 20:16:59.000000000 +0000
++++ kdenetwork-3.4.2/kopete/plugins/addbookmarks/Makefile.in 2005-08-02 17:20:36.542936392 +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_kopete_addbookmarks_la_SOURCES) $(kopete_addbookmarks_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -257,6 +255,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11024,7 +11960,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -473,7 +476,7 @@
+@@ -474,7 +475,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11033,7 +11969,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -511,9 +514,9 @@
+@@ -512,9 +513,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11045,10 +11981,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/alias/Makefile.in kdenetwork-3.4.1/kopete/plugins/alias/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/alias/Makefile.in 2005-05-23 12:09:02.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/plugins/alias/Makefile.in 2005-05-24 13:47:12.000000000 -0400
-@@ -246,6 +246,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/plugins/alias/Makefile.in kdenetwork-3.4.2/kopete/plugins/alias/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/plugins/alias/Makefile.in 2005-07-20 20:16:59.000000000 +0000
++++ kdenetwork-3.4.2/kopete/plugins/alias/Makefile.in 2005-08-02 17:20:36.580930616 +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_kopete_alias_la_SOURCES) $(kopete_alias_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -247,6 +245,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11058,7 +12009,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -457,7 +460,7 @@
+@@ -458,7 +459,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11067,7 +12018,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
@@ -11079,7 +12030,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -809,18 +812,18 @@
+@@ -810,18 +811,18 @@
#>+ 3
@@ -11104,7 +12055,7 @@
#>+ 3
editaliasdialog.moc: $(srcdir)/editaliasdialog.h
-@@ -840,10 +843,10 @@
+@@ -841,10 +842,10 @@
#>+ 3
clean-metasources:
@@ -11117,7 +12068,7 @@
#>+ 5
clean-ui:
-@@ -938,8 +941,8 @@
+@@ -939,8 +940,8 @@
#>+ 11
nmcheck:
@@ -11127,10 +12078,16 @@
$(srcdir)/editaliasdialog.cpp: aliasdialogbase.h aliasdialog.h
nmcheck-am: nmcheck
aliasplugin.lo: aliasplugin.moc
-diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/autoreplace/icons/Makefile.in kdenetwork-3.4.1/kopete/plugins/autoreplace/icons/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/autoreplace/icons/Makefile.in 2005-05-23 12:09:02.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/plugins/autoreplace/icons/Makefile.in 2005-05-24 13:47:12.000000000 -0400
-@@ -188,6 +188,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/plugins/autoreplace/icons/Makefile.in kdenetwork-3.4.2/kopete/plugins/autoreplace/icons/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/plugins/autoreplace/icons/Makefile.in 2005-07-20 20:16:59.000000000 +0000
++++ kdenetwork-3.4.2/kopete/plugins/autoreplace/icons/Makefile.in 2005-08-02 17:20:36.642921192 +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@
+
+@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11140,7 +12097,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
+@@ -382,7 +385,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11149,7 +12106,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -420,9 +423,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11161,10 +12118,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/autoreplace/Makefile.in kdenetwork-3.4.1/kopete/plugins/autoreplace/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/autoreplace/Makefile.in 2005-05-23 12:09:02.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/plugins/autoreplace/Makefile.in 2005-05-24 13:47:12.000000000 -0400
-@@ -267,6 +267,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/plugins/autoreplace/Makefile.in kdenetwork-3.4.2/kopete/plugins/autoreplace/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/plugins/autoreplace/Makefile.in 2005-07-20 20:16:59.000000000 +0000
++++ kdenetwork-3.4.2/kopete/plugins/autoreplace/Makefile.in 2005-08-02 17:20:36.626923624 +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_kopete_autoreplace_la_SOURCES) $(kopete_autoreplace_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -268,6 +266,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11174,7 +12146,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -479,7 +482,7 @@
+@@ -480,7 +481,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11183,7 +12155,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -517,9 +520,9 @@
+@@ -518,9 +519,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11195,10 +12167,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/connectionstatus/Makefile.in kdenetwork-3.4.1/kopete/plugins/connectionstatus/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/connectionstatus/Makefile.in 2005-05-23 12:09:02.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/plugins/connectionstatus/Makefile.in 2005-05-24 13:47:12.000000000 -0400
-@@ -234,6 +234,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/plugins/connectionstatus/Makefile.in kdenetwork-3.4.2/kopete/plugins/connectionstatus/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/plugins/connectionstatus/Makefile.in 2005-07-20 20:16:59.000000000 +0000
++++ kdenetwork-3.4.2/kopete/plugins/connectionstatus/Makefile.in 2005-08-02 17:20:36.665917696 +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 = $(kopete_connectionstatus_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -235,6 +233,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11208,7 +12195,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -434,7 +437,7 @@
+@@ -435,7 +436,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11217,7 +12204,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -472,9 +475,9 @@
+@@ -473,9 +474,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11229,10 +12216,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/contactnotes/Makefile.in kdenetwork-3.4.1/kopete/plugins/contactnotes/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/contactnotes/Makefile.in 2005-05-23 12:09:02.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/plugins/contactnotes/Makefile.in 2005-05-24 13:47:12.000000000 -0400
-@@ -238,6 +238,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/plugins/contactnotes/Makefile.in kdenetwork-3.4.2/kopete/plugins/contactnotes/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/plugins/contactnotes/Makefile.in 2005-07-20 20:16:59.000000000 +0000
++++ kdenetwork-3.4.2/kopete/plugins/contactnotes/Makefile.in 2005-08-02 17:20:36.699912528 +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 = $(kopete_contactnotes_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -239,6 +237,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11242,7 +12244,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -442,7 +445,7 @@
+@@ -443,7 +444,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11251,7 +12253,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -480,9 +483,9 @@
+@@ -481,9 +482,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11263,10 +12265,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/cryptography/icons/Makefile.in kdenetwork-3.4.1/kopete/plugins/cryptography/icons/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/cryptography/icons/Makefile.in 2005-05-23 12:09:02.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/plugins/cryptography/icons/Makefile.in 2005-05-24 13:47:12.000000000 -0400
-@@ -188,6 +188,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/plugins/cryptography/icons/Makefile.in kdenetwork-3.4.2/kopete/plugins/cryptography/icons/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/plugins/cryptography/icons/Makefile.in 2005-07-20 20:16:59.000000000 +0000
++++ kdenetwork-3.4.2/kopete/plugins/cryptography/icons/Makefile.in 2005-08-02 17:20:36.764902648 +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@
+
+@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11276,7 +12284,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
+@@ -382,7 +385,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11285,7 +12293,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -420,9 +423,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11297,10 +12305,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/cryptography/Makefile.in kdenetwork-3.4.1/kopete/plugins/cryptography/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/cryptography/Makefile.in 2005-05-23 12:09:02.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/plugins/cryptography/Makefile.in 2005-05-24 13:47:12.000000000 -0400
-@@ -270,6 +270,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/plugins/cryptography/Makefile.in kdenetwork-3.4.2/kopete/plugins/cryptography/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/plugins/cryptography/Makefile.in 2005-07-20 20:16:59.000000000 +0000
++++ kdenetwork-3.4.2/kopete/plugins/cryptography/Makefile.in 2005-08-02 17:20:36.749904928 +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_kopete_cryptography_la_SOURCES) $(kopete_cryptography_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -271,6 +269,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11310,7 +12333,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -486,7 +489,7 @@
+@@ -487,7 +488,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11319,7 +12342,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -524,9 +527,9 @@
+@@ -525,9 +526,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11331,7 +12354,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -966,6 +969,13 @@
+@@ -967,6 +968,13 @@
#>+ 3
@@ -11345,7 +12368,7 @@
kgpginterface.moc: $(srcdir)/kgpginterface.h
$(MOC) $(srcdir)/kgpginterface.h -o kgpginterface.moc
-@@ -973,11 +983,11 @@
+@@ -974,11 +982,11 @@
mocs: kgpginterface.moc
#>+ 3
@@ -11360,7 +12383,7 @@
#>+ 3
kgpgselkey.moc: $(srcdir)/kgpgselkey.h
-@@ -994,13 +1004,6 @@
+@@ -995,13 +1003,6 @@
mocs: popuppublic.moc
#>+ 3
@@ -11374,7 +12397,7 @@
cryptographypreferences.moc: $(srcdir)/cryptographypreferences.h
$(MOC) $(srcdir)/cryptographypreferences.h -o cryptographypreferences.moc
-@@ -1025,7 +1028,7 @@
+@@ -1026,7 +1027,7 @@
#>+ 3
clean-metasources:
@@ -11383,7 +12406,7 @@
#>+ 2
KDE_DIST=cryptographychatui.rc kopete_cryptography.desktop cryptographyguiclient.h kgpginterface.h cryptographyuserkey_ui.ui kgpgselkey.h kopete_cryptography_config.desktop cryptographyselectuserkey.h Makefile.in cryptographypreferences.h cryptographyplugin.h cryptographyui.rc cryptographyprefsbase.ui Makefile.am popuppublic.h
-@@ -1094,7 +1097,7 @@
+@@ -1095,7 +1096,7 @@
rm -f kcm_kopete_cryptography_la.all_cpp.final kcm_kopete_cryptography_la.all_cpp.files
#>+ 11
@@ -11392,10 +12415,16 @@
@echo 'creating kopete_cryptography_la.all_cpp.cpp ...'; \
rm -f kopete_cryptography_la.all_cpp.files kopete_cryptography_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kopete_cryptography_la.all_cpp.final; \
-diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/highlight/icons/Makefile.in kdenetwork-3.4.1/kopete/plugins/highlight/icons/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/highlight/icons/Makefile.in 2005-05-23 12:09:02.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/plugins/highlight/icons/Makefile.in 2005-05-24 13:47:12.000000000 -0400
-@@ -188,6 +188,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/plugins/highlight/icons/Makefile.in kdenetwork-3.4.2/kopete/plugins/highlight/icons/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/plugins/highlight/icons/Makefile.in 2005-07-20 20:16:59.000000000 +0000
++++ kdenetwork-3.4.2/kopete/plugins/highlight/icons/Makefile.in 2005-08-02 17:20:36.827893072 +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@
+
+@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11405,7 +12434,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
+@@ -382,7 +385,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11414,7 +12443,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -420,9 +423,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11426,10 +12455,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/highlight/Makefile.in kdenetwork-3.4.1/kopete/plugins/highlight/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/highlight/Makefile.in 2005-05-23 12:09:02.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/plugins/highlight/Makefile.in 2005-05-24 13:47:12.000000000 -0400
-@@ -267,6 +267,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/plugins/highlight/Makefile.in kdenetwork-3.4.2/kopete/plugins/highlight/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/plugins/highlight/Makefile.in 2005-07-20 20:16:59.000000000 +0000
++++ kdenetwork-3.4.2/kopete/plugins/highlight/Makefile.in 2005-08-02 17:20:36.812895352 +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_kopete_highlight_la_SOURCES) $(kopete_highlight_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -268,6 +266,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11439,7 +12483,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -479,7 +482,7 @@
+@@ -480,7 +481,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11448,7 +12492,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -517,9 +520,9 @@
+@@ -518,9 +519,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11460,7 +12504,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -964,7 +967,7 @@
+@@ -965,7 +966,7 @@
-rm -f highlightpreferences.moc highlightplugin.moc
#>+ 2
@@ -11469,10 +12513,25 @@
#>+ 4
clean-ui:
-diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/history/Makefile.in kdenetwork-3.4.1/kopete/plugins/history/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/history/Makefile.in 2005-05-23 12:09:02.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/plugins/history/Makefile.in 2005-05-24 13:47:12.000000000 -0400
-@@ -253,6 +253,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/plugins/history/Makefile.in kdenetwork-3.4.2/kopete/plugins/history/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/plugins/history/Makefile.in 2005-07-20 20:16:59.000000000 +0000
++++ kdenetwork-3.4.2/kopete/plugins/history/Makefile.in 2005-08-02 17:20:36.893883040 +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_kopete_history_la_SOURCES) $(kopete_history_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -254,6 +252,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11482,7 +12541,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -472,7 +475,7 @@
+@@ -473,7 +474,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11491,7 +12550,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -510,9 +513,9 @@
+@@ -511,9 +512,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11503,7 +12562,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -866,18 +869,18 @@
+@@ -867,18 +868,18 @@
#>+ 3
@@ -11528,7 +12587,7 @@
#>+ 3
historylogger.moc: $(srcdir)/historylogger.h
-@@ -911,7 +914,7 @@
+@@ -912,7 +913,7 @@
#>+ 3
clean-metasources:
@@ -11537,7 +12596,7 @@
#>+ 2
KDE_DIST=historyprefsui.ui historyviewer.ui historypreferences.h historyconfig.kcfgc kopete_history_config.desktop historyui.rc historyguiclient.h kopete_history.desktop historyplugin.h historylogger.h historyconfig.kcfg Makefile.in historychatui.rc Makefile.am historydialog.h
-@@ -986,7 +989,7 @@
+@@ -987,7 +988,7 @@
rm -f kcm_kopete_history_la.all_cpp.final kcm_kopete_history_la.all_cpp.files
#>+ 11
@@ -11546,10 +12605,16 @@
@echo 'creating kopete_history_la.all_cpp.cpp ...'; \
rm -f kopete_history_la.all_cpp.files kopete_history_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kopete_history_la.all_cpp.final; \
-diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/latex/icons/Makefile.in kdenetwork-3.4.1/kopete/plugins/latex/icons/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/latex/icons/Makefile.in 2005-05-23 12:09:02.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/plugins/latex/icons/Makefile.in 2005-05-24 13:47:12.000000000 -0400
-@@ -188,6 +188,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/plugins/latex/icons/Makefile.in kdenetwork-3.4.2/kopete/plugins/latex/icons/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/plugins/latex/icons/Makefile.in 2005-07-20 20:16:59.000000000 +0000
++++ kdenetwork-3.4.2/kopete/plugins/latex/icons/Makefile.in 2005-08-02 17:20:36.961872704 +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@
+
+@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11559,7 +12624,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
+@@ -382,7 +385,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11568,7 +12633,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -420,9 +423,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11580,10 +12645,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/latex/Makefile.in kdenetwork-3.4.1/kopete/plugins/latex/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/latex/Makefile.in 2005-05-23 12:09:02.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/plugins/latex/Makefile.in 2005-05-24 13:47:12.000000000 -0400
-@@ -266,6 +266,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/plugins/latex/Makefile.in kdenetwork-3.4.2/kopete/plugins/latex/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/plugins/latex/Makefile.in 2005-07-20 20:16:59.000000000 +0000
++++ kdenetwork-3.4.2/kopete/plugins/latex/Makefile.in 2005-08-02 17:20:36.946874984 +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_kopete_latex_la_SOURCES) $(kopete_latex_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -267,6 +265,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11593,7 +12673,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -482,7 +485,7 @@
+@@ -483,7 +484,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11602,7 +12682,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -520,9 +523,9 @@
+@@ -521,9 +522,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11614,10 +12694,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/Makefile.in kdenetwork-3.4.1/kopete/plugins/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/Makefile.in 2005-05-23 12:09:02.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/plugins/Makefile.in 2005-05-24 13:47:12.000000000 -0400
-@@ -207,6 +207,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/plugins/Makefile.in kdenetwork-3.4.2/kopete/plugins/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/plugins/Makefile.in 2005-07-20 20:16:59.000000000 +0000
++++ kdenetwork-3.4.2/kopete/plugins/Makefile.in 2005-08-02 17:20:36.506941864 +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@
+
+@@ -208,6 +208,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11627,7 +12713,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -406,7 +409,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -11636,7 +12722,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -444,9 +447,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11648,10 +12734,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/motionautoaway/Makefile.in kdenetwork-3.4.1/kopete/plugins/motionautoaway/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/motionautoaway/Makefile.in 2005-05-23 12:09:02.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/plugins/motionautoaway/Makefile.in 2005-05-24 13:47:13.000000000 -0400
-@@ -250,6 +250,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/plugins/motionautoaway/Makefile.in kdenetwork-3.4.2/kopete/plugins/motionautoaway/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/plugins/motionautoaway/Makefile.in 2005-07-20 20:16:59.000000000 +0000
++++ kdenetwork-3.4.2/kopete/plugins/motionautoaway/Makefile.in 2005-08-02 17:20:36.996867384 +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_kopete_motionaway_la_SOURCES) $(kopete_motionaway_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -251,6 +249,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11661,7 +12762,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -462,7 +465,7 @@
+@@ -463,7 +464,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11670,7 +12771,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -500,9 +503,9 @@
+@@ -501,9 +502,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11682,7 +12783,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -832,18 +835,18 @@
+@@ -833,18 +834,18 @@
#>+ 3
@@ -11707,7 +12808,7 @@
#>+ 8
kopete_motionaway.la.closure: $(kopete_motionaway_la_OBJECTS) $(kopete_motionaway_la_DEPENDENCIES)
-@@ -856,7 +859,7 @@
+@@ -857,7 +858,7 @@
#>+ 3
clean-metasources:
@@ -11716,10 +12817,25 @@
#>+ 2
KDE_DIST=kopete_motionaway.desktop COPYING.motion motionawayplugin.h motionawayprefs.ui kopete_motionaway_config.desktop motionawayconfig.kcfg configure.in.in Makefile.in motionawaypreferences.h motionawayconfig.kcfgc Makefile.am
-diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/netmeeting/Makefile.in kdenetwork-3.4.1/kopete/plugins/netmeeting/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/netmeeting/Makefile.in 2005-05-23 12:09:02.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/plugins/netmeeting/Makefile.in 2005-05-24 13:47:13.000000000 -0400
-@@ -254,6 +254,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/plugins/netmeeting/Makefile.in kdenetwork-3.4.2/kopete/plugins/netmeeting/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/plugins/netmeeting/Makefile.in 2005-07-20 20:16:59.000000000 +0000
++++ kdenetwork-3.4.2/kopete/plugins/netmeeting/Makefile.in 2005-08-02 17:20:37.043860240 +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_kopete_netmeeting_la_SOURCES) $(kopete_netmeeting_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -255,6 +253,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11729,7 +12845,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -467,7 +470,7 @@
+@@ -468,7 +469,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11738,7 +12854,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
@@ -11750,7 +12866,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -880,7 +883,7 @@
+@@ -881,7 +882,7 @@
-rm -f netmeetingplugin.moc netmeetingpreferences.moc netmeetinginvitation.moc netmeetingguiclient.moc
#>+ 2
@@ -11759,10 +12875,25 @@
#>+ 4
clean-ui:
-diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/nowlistening/Makefile.in kdenetwork-3.4.1/kopete/plugins/nowlistening/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/nowlistening/Makefile.in 2005-05-23 12:09:02.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/plugins/nowlistening/Makefile.in 2005-05-24 13:47:13.000000000 -0400
-@@ -76,8 +76,7 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/plugins/nowlistening/Makefile.in kdenetwork-3.4.2/kopete/plugins/nowlistening/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/plugins/nowlistening/Makefile.in 2005-07-20 20:16:59.000000000 +0000
++++ kdenetwork-3.4.2/kopete/plugins/nowlistening/Makefile.in 2005-08-02 17:20:37.085853856 +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_kopete_nowlistening_la_SOURCES) $(kopete_nowlistening_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -76,8 +74,7 @@
nowlisteningconfig.lo nowlisteningprefs.lo
@KDE_USE_FINAL_FALSE at kcm_kopete_nowlistening_la_OBJECTS = $(kcm_kopete_nowlistening_la_nofinal_OBJECTS)
@KDE_USE_FINAL_TRUE at kcm_kopete_nowlistening_la_OBJECTS = $(kcm_kopete_nowlistening_la_final_OBJECTS)
@@ -11772,7 +12903,7 @@
am_kopete_nowlistening_la_OBJECTS = nowlisteningconfig.lo \
nowlisteningplugin.lo nlkscd.lo nlnoatun.lo nlxmms.lo \
nowlisteningguiclient.lo nljuk.lo nlamarok.lo nlkaffeine.lo
-@@ -260,6 +259,9 @@
+@@ -261,6 +258,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11782,7 +12913,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -450,8 +452,8 @@
+@@ -451,8 +451,8 @@
AM_CPPFLAGS = $(KOPETE_INCLUDES) $(XMMS_INCLUDES) $(all_includes)
kde_module_LTLIBRARIES = kopete_nowlistening.la kcm_kopete_nowlistening.la
kopete_nowlistening_la_SOURCES = nowlisteningconfig.cpp nowlisteningplugin.cpp nlkscd.cpp nlnoatun.cpp nlxmms.cpp nowlisteningguiclient.cpp nljuk.cpp nlamarok.cpp nlkaffeine.cpp
@@ -11793,7 +12924,7 @@
#>- kcm_kopete_nowlistening_la_SOURCES = nowlisteningprefs.ui nowlisteningpreferences.cpp nowlisteningconfig.cpp
#>+ 1
kcm_kopete_nowlistening_la_SOURCES= nowlisteningpreferences.cpp nowlisteningconfig.cpp nowlisteningprefs.cpp
-@@ -472,7 +474,7 @@
+@@ -473,7 +473,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11802,7 +12933,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -510,9 +512,9 @@
+@@ -511,9 +511,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11814,7 +12945,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -857,18 +859,18 @@
+@@ -858,18 +858,18 @@
mocs: nowlisteningpreferences.moc
#>+ 3
@@ -11839,7 +12970,7 @@
#>+ 8
kopete_nowlistening.la.closure: $(kopete_nowlistening_la_OBJECTS) $(kopete_nowlistening_la_DEPENDENCIES)
-@@ -881,7 +883,7 @@
+@@ -882,7 +882,7 @@
#>+ 3
clean-metasources:
@@ -11848,7 +12979,7 @@
#>+ 2
KDE_DIST=nlkscd.h nowlisteningguiclient.h nowlisteningpreferences.h nowlisteningconfig.h nlnoatun.h kopete_nowlistening_config.desktop nowlisteningprefs.ui nlmediaplayer.h DESIGN nowlisteningchatui.rc configure.in.in Makefile.in nljuk.h kopete_nowlistening.desktop nlamarok.h nowlisteningplugin.h nowlisteningui.rc Makefile.am nlxmms.h
-@@ -949,7 +951,7 @@
+@@ -950,7 +950,7 @@
rm -f kcm_kopete_nowlistening_la.all_cpp.final kcm_kopete_nowlistening_la.all_cpp.files
#>+ 11
@@ -11857,10 +12988,25 @@
@echo 'creating kopete_nowlistening_la.all_cpp.cpp ...'; \
rm -f kopete_nowlistening_la.all_cpp.files kopete_nowlistening_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kopete_nowlistening_la.all_cpp.final; \
-diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/smpppdcs/config/Makefile.in kdenetwork-3.4.1/kopete/plugins/smpppdcs/config/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/smpppdcs/config/Makefile.in 2005-05-23 12:09:02.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/plugins/smpppdcs/config/Makefile.in 2005-05-24 13:47:13.000000000 -0400
-@@ -241,6 +241,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/plugins/smpppdcs/config/Makefile.in kdenetwork-3.4.2/kopete/plugins/smpppdcs/config/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/plugins/smpppdcs/config/Makefile.in 2005-07-20 20:16:59.000000000 +0000
++++ kdenetwork-3.4.2/kopete/plugins/smpppdcs/config/Makefile.in 2005-08-02 17:20:37.163842000 +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_kopete_smpppdcs_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -242,6 +240,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11870,7 +13016,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -449,7 +452,7 @@
+@@ -450,7 +451,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11879,7 +13025,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
@@ -11891,10 +13037,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/smpppdcs/icons/Makefile.in kdenetwork-3.4.1/kopete/plugins/smpppdcs/icons/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/smpppdcs/icons/Makefile.in 2005-05-23 12:09:02.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/plugins/smpppdcs/icons/Makefile.in 2005-05-24 13:47:13.000000000 -0400
-@@ -188,6 +188,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/plugins/smpppdcs/icons/Makefile.in kdenetwork-3.4.2/kopete/plugins/smpppdcs/icons/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/plugins/smpppdcs/icons/Makefile.in 2005-07-20 20:16:59.000000000 +0000
++++ kdenetwork-3.4.2/kopete/plugins/smpppdcs/icons/Makefile.in 2005-08-02 17:20:37.177839872 +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@
+
+@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11904,7 +13056,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
+@@ -382,7 +385,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11913,7 +13065,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -420,9 +423,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11925,10 +13077,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/smpppdcs/Makefile.in kdenetwork-3.4.1/kopete/plugins/smpppdcs/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/smpppdcs/Makefile.in 2005-05-23 12:09:02.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/plugins/smpppdcs/Makefile.in 2005-05-24 13:47:13.000000000 -0400
-@@ -246,6 +246,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/plugins/smpppdcs/Makefile.in kdenetwork-3.4.2/kopete/plugins/smpppdcs/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/plugins/smpppdcs/Makefile.in 2005-07-20 20:16:59.000000000 +0000
++++ kdenetwork-3.4.2/kopete/plugins/smpppdcs/Makefile.in 2005-08-02 17:20:37.133846560 +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 = $(kopete_smpppdcs_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -247,6 +245,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11938,7 +13105,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -449,7 +452,7 @@
+@@ -450,7 +451,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11947,7 +13114,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
@@ -11959,10 +13126,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/statistics/Makefile.in kdenetwork-3.4.1/kopete/plugins/statistics/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/statistics/Makefile.in 2005-05-23 12:09:02.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/plugins/statistics/Makefile.in 2005-05-24 13:47:13.000000000 -0400
-@@ -255,6 +255,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/plugins/statistics/Makefile.in kdenetwork-3.4.2/kopete/plugins/statistics/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/plugins/statistics/Makefile.in 2005-07-20 20:16:59.000000000 +0000
++++ kdenetwork-3.4.2/kopete/plugins/statistics/Makefile.in 2005-08-02 17:20:37.225832576 +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 = $(kopete_statistics_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -256,6 +254,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11972,7 +13154,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -464,7 +467,7 @@
+@@ -465,7 +466,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11981,7 +13163,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -502,9 +505,9 @@
+@@ -503,9 +504,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11993,10 +13175,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/statistics/sqlite/Makefile.in kdenetwork-3.4.1/kopete/plugins/statistics/sqlite/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/statistics/sqlite/Makefile.in 2005-05-23 12:09:03.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/plugins/statistics/sqlite/Makefile.in 2005-05-24 13:47:13.000000000 -0400
-@@ -247,6 +247,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/plugins/statistics/sqlite/Makefile.in kdenetwork-3.4.2/kopete/plugins/statistics/sqlite/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/plugins/statistics/sqlite/Makefile.in 2005-07-20 20:16:59.000000000 +0000
++++ kdenetwork-3.4.2/kopete/plugins/statistics/sqlite/Makefile.in 2005-08-02 17:20:37.260827256 +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@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libsqlite_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -248,6 +246,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12006,7 +13203,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -490,7 +493,7 @@
+@@ -491,7 +492,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -12015,7 +13212,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -528,9 +531,9 @@
+@@ -529,9 +530,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12027,10 +13224,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/texteffect/icons/Makefile.in kdenetwork-3.4.1/kopete/plugins/texteffect/icons/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/texteffect/icons/Makefile.in 2005-05-23 12:09:03.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/plugins/texteffect/icons/Makefile.in 2005-05-24 13:47:13.000000000 -0400
-@@ -188,6 +188,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/plugins/texteffect/icons/Makefile.in kdenetwork-3.4.2/kopete/plugins/texteffect/icons/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/plugins/texteffect/icons/Makefile.in 2005-07-20 20:16:59.000000000 +0000
++++ kdenetwork-3.4.2/kopete/plugins/texteffect/icons/Makefile.in 2005-08-02 17:20:37.319818288 +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@
+
+@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12040,7 +13243,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
+@@ -382,7 +385,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12049,7 +13252,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -420,9 +423,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12061,10 +13264,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/texteffect/Makefile.in kdenetwork-3.4.1/kopete/plugins/texteffect/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/texteffect/Makefile.in 2005-05-23 12:09:03.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/plugins/texteffect/Makefile.in 2005-05-24 13:47:13.000000000 -0400
-@@ -267,6 +267,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/plugins/texteffect/Makefile.in kdenetwork-3.4.2/kopete/plugins/texteffect/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/plugins/texteffect/Makefile.in 2005-07-20 20:16:59.000000000 +0000
++++ kdenetwork-3.4.2/kopete/plugins/texteffect/Makefile.in 2005-08-02 17:20:37.304820568 +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_kopete_texteffect_la_SOURCES) $(kopete_texteffect_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -268,6 +266,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12074,7 +13292,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -479,7 +482,7 @@
+@@ -480,7 +481,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12083,7 +13301,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -517,9 +520,9 @@
+@@ -518,9 +519,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12095,10 +13313,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/translator/Makefile.in kdenetwork-3.4.1/kopete/plugins/translator/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/translator/Makefile.in 2005-05-23 12:09:03.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/plugins/translator/Makefile.in 2005-05-24 13:47:13.000000000 -0400
-@@ -257,6 +257,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/plugins/translator/Makefile.in kdenetwork-3.4.2/kopete/plugins/translator/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/plugins/translator/Makefile.in 2005-07-20 20:16:59.000000000 +0000
++++ kdenetwork-3.4.2/kopete/plugins/translator/Makefile.in 2005-08-02 17:20:37.356812664 +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_kopete_translator_la_SOURCES) $(kopete_translator_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -258,6 +256,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12108,7 +13341,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -472,7 +475,7 @@
+@@ -473,7 +474,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12117,7 +13350,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -510,9 +513,9 @@
+@@ -511,9 +512,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12129,7 +13362,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -879,7 +882,7 @@
+@@ -880,7 +881,7 @@
-rm -f translatorplugin.moc translatorguiclient.moc translatordialog.moc
#>+ 2
@@ -12138,10 +13371,25 @@
#>+ 4
clean-ui:
-diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/webpresence/Makefile.in kdenetwork-3.4.1/kopete/plugins/webpresence/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/webpresence/Makefile.in 2005-05-23 12:09:03.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/plugins/webpresence/Makefile.in 2005-05-24 13:47:13.000000000 -0400
-@@ -248,6 +248,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/plugins/webpresence/Makefile.in kdenetwork-3.4.2/kopete/plugins/webpresence/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/plugins/webpresence/Makefile.in 2005-07-20 20:16:59.000000000 +0000
++++ kdenetwork-3.4.2/kopete/plugins/webpresence/Makefile.in 2005-08-02 17:20:37.483793360 +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_kopete_webpresence_la_SOURCES) $(kopete_webpresence_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -249,6 +247,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12151,7 +13399,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -462,7 +465,7 @@
+@@ -463,7 +464,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12160,7 +13408,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -500,9 +503,9 @@
+@@ -501,9 +502,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12172,10 +13420,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/gadu/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/gadu/icons/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/gadu/icons/Makefile.in 2005-05-23 12:09:03.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/gadu/icons/Makefile.in 2005-05-24 13:47:13.000000000 -0400
-@@ -188,6 +188,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/gadu/icons/Makefile.in kdenetwork-3.4.2/kopete/protocols/gadu/icons/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/gadu/icons/Makefile.in 2005-07-20 20:17:00.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/gadu/icons/Makefile.in 2005-08-02 17:20:37.590777096 +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@
+
+@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12185,7 +13439,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
+@@ -382,7 +385,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12194,7 +13448,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -420,9 +423,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12206,7 +13460,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -564,7 +567,7 @@
+@@ -565,7 +568,7 @@
.NOEXPORT:
#>+ 2
@@ -12215,7 +13469,7 @@
#>+ 2
docs-am:
-@@ -572,38 +575,38 @@
+@@ -573,38 +576,38 @@
#>+ 35
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
@@ -12272,10 +13526,25 @@
#>+ 15
force-reedit:
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/gadu/libgadu/Makefile.in kdenetwork-3.4.1/kopete/protocols/gadu/libgadu/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/gadu/libgadu/Makefile.in 2005-05-23 12:09:03.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/gadu/libgadu/Makefile.in 2005-05-24 13:47:13.000000000 -0400
-@@ -217,6 +217,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/gadu/libgadu/Makefile.in kdenetwork-3.4.2/kopete/protocols/gadu/libgadu/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/gadu/libgadu/Makefile.in 2005-07-20 20:17:00.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/gadu/libgadu/Makefile.in 2005-08-02 17:20:37.618772840 +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@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libgadu_copy_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -218,6 +216,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12285,7 +13554,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -423,7 +424,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -12294,7 +13563,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
@@ -12306,10 +13575,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/gadu/Makefile.in kdenetwork-3.4.1/kopete/protocols/gadu/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/gadu/Makefile.in 2005-05-23 12:09:03.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/gadu/Makefile.in 2005-05-24 13:47:13.000000000 -0400
-@@ -265,6 +265,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/gadu/Makefile.in kdenetwork-3.4.2/kopete/protocols/gadu/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/gadu/Makefile.in 2005-07-20 20:17:00.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/gadu/Makefile.in 2005-08-02 17:20:37.571779984 +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 = $(kopete_gadu_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -266,6 +264,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12319,7 +13603,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -492,7 +495,7 @@
+@@ -493,7 +494,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12328,7 +13612,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -530,9 +533,9 @@
+@@ -531,9 +532,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12340,7 +13624,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -986,11 +989,11 @@
+@@ -987,11 +988,11 @@
mocs: gaducommands.moc
#>+ 3
@@ -12355,7 +13639,7 @@
#>+ 3
gaduregisteraccount.moc: $(srcdir)/gaduregisteraccount.h
-@@ -1000,11 +1003,11 @@
+@@ -1001,11 +1002,11 @@
mocs: gaduregisteraccount.moc
#>+ 3
@@ -12370,7 +13654,7 @@
#>+ 3
gaduaway.moc: $(srcdir)/gaduaway.h
-@@ -1021,25 +1024,25 @@
+@@ -1022,25 +1023,25 @@
mocs: gaduprotocol.moc
#>+ 3
@@ -12404,7 +13688,7 @@
#>+ 3
clean-closures:
-@@ -1087,7 +1090,7 @@
+@@ -1088,7 +1089,7 @@
#>+ 11
@@ -12413,7 +13697,7 @@
@echo 'creating kopete_gadu_la.all_cpp.cpp ...'; \
rm -f kopete_gadu_la.all_cpp.files kopete_gadu_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kopete_gadu_la.all_cpp.final; \
-@@ -1142,11 +1145,11 @@
+@@ -1143,11 +1144,11 @@
gadupubdir.o: gadupubdir.moc
gadueditaccount.lo: gadueditaccount.moc
gadudccserver.lo: gadudccserver.moc
@@ -12427,10 +13711,25 @@
gaduaway.lo: gaduaway.moc
gaducommands.lo: gaducommands.moc
gaduaddcontactpage.o: gaduaddcontactpage.moc
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/gadu/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/gadu/ui/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/gadu/ui/Makefile.in 2005-05-23 12:09:03.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/gadu/ui/Makefile.in 2005-05-24 13:47:13.000000000 -0400
-@@ -223,6 +223,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/gadu/ui/Makefile.in kdenetwork-3.4.2/kopete/protocols/gadu/ui/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/gadu/ui/Makefile.in 2005-07-20 20:17:00.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/gadu/ui/Makefile.in 2005-08-02 17:20:37.641769344 +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@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libgaduui_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -224,6 +222,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12440,7 +13739,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -430,7 +433,7 @@
+@@ -431,7 +432,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12449,7 +13748,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -468,9 +471,9 @@
+@@ -469,9 +470,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12461,10 +13760,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/groupwise/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/groupwise/icons/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/groupwise/icons/Makefile.in 2005-05-23 12:09:03.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/groupwise/icons/Makefile.in 2005-05-24 13:47:14.000000000 -0400
-@@ -188,6 +188,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/groupwise/icons/Makefile.in kdenetwork-3.4.2/kopete/protocols/groupwise/icons/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/groupwise/icons/Makefile.in 2005-07-20 20:17:00.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/groupwise/icons/Makefile.in 2005-08-02 17:20:37.768750040 +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@
+
+@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12474,7 +13779,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
+@@ -382,7 +385,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12483,7 +13788,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -420,9 +423,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12495,7 +13800,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -564,7 +567,7 @@
+@@ -565,7 +568,7 @@
.NOEXPORT:
#>+ 2
@@ -12504,7 +13809,7 @@
#>+ 2
docs-am:
-@@ -572,47 +575,47 @@
+@@ -573,47 +576,47 @@
#>+ 44
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
@@ -12578,10 +13883,25 @@
#>+ 15
force-reedit:
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/Makefile.in kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/Makefile.in 2005-05-23 12:09:03.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/Makefile.in 2005-05-24 13:47:14.000000000 -0400
-@@ -264,6 +264,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/groupwise/libgroupwise/Makefile.in kdenetwork-3.4.2/kopete/protocols/groupwise/libgroupwise/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/groupwise/libgroupwise/Makefile.in 2005-07-20 20:17:00.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/groupwise/libgroupwise/Makefile.in 2005-08-02 17:20:37.882732712 +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 = $(libgroupwise_la_SOURCES) $(libgwtest_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -265,6 +263,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12591,7 +13911,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -497,7 +500,7 @@
+@@ -498,7 +499,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -12600,7 +13920,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -535,9 +538,9 @@
+@@ -536,9 +537,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12612,7 +13932,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -934,18 +937,18 @@
+@@ -935,18 +936,18 @@
#>+ 3
@@ -12637,7 +13957,7 @@
#>+ 3
stream.moc: $(srcdir)/stream.h
-@@ -955,18 +958,18 @@
+@@ -956,18 +957,18 @@
mocs: stream.moc
#>+ 3
@@ -12662,7 +13982,7 @@
#>+ 3
qcatlshandler.moc: $(srcdir)/qcatlshandler.h
-@@ -1056,7 +1059,7 @@
+@@ -1057,7 +1058,7 @@
#>+ 3
clean-metasources:
@@ -12671,10 +13991,16 @@
#>+ 2
KDE_DIST=transferbase.h rtf.ll Makefile.in Makefile.am
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/qca/Makefile.in kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/qca/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/qca/Makefile.in 2005-05-23 12:09:03.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/qca/Makefile.in 2005-05-24 13:47:14.000000000 -0400
-@@ -205,6 +205,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/groupwise/libgroupwise/qca/Makefile.in kdenetwork-3.4.2/kopete/protocols/groupwise/libgroupwise/qca/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/groupwise/libgroupwise/qca/Makefile.in 2005-07-20 20:17:00.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/groupwise/libgroupwise/qca/Makefile.in 2005-08-02 17:20:37.908728760 +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@
+
+@@ -206,6 +206,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12684,7 +14010,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -397,7 +400,7 @@
+@@ -398,7 +401,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -12693,7 +14019,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -435,9 +438,9 @@
+@@ -436,9 +439,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12705,10 +14031,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.in kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.in 2005-05-23 12:09:03.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.in 2005-05-24 13:47:14.000000000 -0400
-@@ -220,6 +220,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.in kdenetwork-3.4.2/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.in 2005-07-20 20:17:00.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.in 2005-08-02 17:20:37.948722680 +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@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libqca_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -221,6 +219,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12718,7 +14059,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -419,7 +422,7 @@
+@@ -420,7 +421,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12727,7 +14068,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
@@ -12739,10 +14080,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/tasks/Makefile.in kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/tasks/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/tasks/Makefile.in 2005-05-23 12:09:03.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/tasks/Makefile.in 2005-05-24 13:47:14.000000000 -0400
-@@ -247,6 +247,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/groupwise/libgroupwise/tasks/Makefile.in kdenetwork-3.4.2/kopete/protocols/groupwise/libgroupwise/tasks/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/groupwise/libgroupwise/tasks/Makefile.in 2005-07-20 20:17:00.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/groupwise/libgroupwise/tasks/Makefile.in 2005-08-02 17:20:38.018712040 +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 = $(libgroupwise_tasks_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -248,6 +246,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12752,7 +14108,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -466,7 +469,7 @@
+@@ -467,7 +468,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12761,7 +14117,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -504,9 +507,9 @@
+@@ -505,9 +506,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12773,7 +14129,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -839,13 +842,6 @@
+@@ -840,13 +841,6 @@
mocs: connectiontask.moc
#>+ 3
@@ -12787,7 +14143,7 @@
logintask.moc: $(srcdir)/logintask.h
$(MOC) $(srcdir)/logintask.h -o logintask.moc
-@@ -860,6 +856,13 @@
+@@ -861,6 +855,13 @@
mocs: createcontactinstancetask.moc
#>+ 3
@@ -12801,7 +14157,7 @@
rejectinvitetask.moc: $(srcdir)/rejectinvitetask.h
$(MOC) $(srcdir)/rejectinvitetask.h -o rejectinvitetask.moc
-@@ -881,18 +884,18 @@
+@@ -882,18 +883,18 @@
mocs: getdetailstask.moc
#>+ 3
@@ -12826,7 +14182,7 @@
#>+ 3
joinconferencetask.moc: $(srcdir)/joinconferencetask.h
-@@ -973,10 +976,10 @@
+@@ -974,10 +975,10 @@
#>+ 3
clean-metasources:
@@ -12839,7 +14195,7 @@
#>+ 3
clean-closures:
-@@ -1024,7 +1027,7 @@
+@@ -1025,7 +1026,7 @@
#>+ 11
@@ -12848,7 +14204,7 @@
@echo 'creating libgroupwise_tasks_la.all_cpp.cpp ...'; \
rm -f libgroupwise_tasks_la.all_cpp.files libgroupwise_tasks_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libgroupwise_tasks_la.all_cpp.final; \
-@@ -1101,8 +1104,8 @@
+@@ -1102,8 +1103,8 @@
conferencetask.lo: conferencetask.moc
createcontacttask.o: createcontacttask.moc
logintask.lo: logintask.moc
@@ -12858,7 +14214,7 @@
updatecontacttask.lo: updatecontacttask.moc
setstatustask.lo: setstatustask.moc
logintask.o: logintask.moc
-@@ -1115,8 +1118,8 @@
+@@ -1116,8 +1117,8 @@
typingtask.lo: typingtask.moc
requesttask.o: requesttask.moc
updateitemtask.lo: updateitemtask.moc
@@ -12868,10 +14224,25 @@
joinconferencetask.lo: joinconferencetask.moc
statustask.o: statustask.moc
typingtask.o: typingtask.moc
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/tasks/tests/Makefile.in kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/tasks/tests/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/tasks/tests/Makefile.in 2005-05-23 12:09:03.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/tasks/tests/Makefile.in 2005-05-24 13:47:14.000000000 -0400
-@@ -221,6 +221,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/groupwise/libgroupwise/tasks/tests/Makefile.in kdenetwork-3.4.2/kopete/protocols/groupwise/libgroupwise/tasks/tests/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/groupwise/libgroupwise/tasks/tests/Makefile.in 2005-07-20 20:17:00.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/groupwise/libgroupwise/tasks/tests/Makefile.in 2005-08-02 17:20:38.043708240 +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@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(task_take_test_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -222,6 +220,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12881,7 +14252,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -417,7 +420,7 @@
+@@ -418,7 +419,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12890,7 +14261,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -455,9 +458,9 @@
+@@ -456,9 +457,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12902,10 +14273,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstPROGRAMS:
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/tests/Makefile.in kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/tests/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/tests/Makefile.in 2005-05-23 12:09:03.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/tests/Makefile.in 2005-05-24 13:47:14.000000000 -0400
-@@ -241,6 +241,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/groupwise/libgroupwise/tests/Makefile.in kdenetwork-3.4.2/kopete/protocols/groupwise/libgroupwise/tests/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/groupwise/libgroupwise/tests/Makefile.in 2005-07-20 20:17:00.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/groupwise/libgroupwise/tests/Makefile.in 2005-08-02 17:20:38.081702464 +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@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(client_test_SOURCES) $(clientstream_test_SOURCES) $(coreprotocol_test_SOURCES) $(field_test_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -242,6 +240,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12915,7 +14301,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -457,7 +460,7 @@
+@@ -458,7 +459,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12924,7 +14310,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
@@ -12936,10 +14322,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstPROGRAMS:
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/groupwise/Makefile.in kdenetwork-3.4.1/kopete/protocols/groupwise/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/groupwise/Makefile.in 2005-05-23 12:09:03.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/groupwise/Makefile.in 2005-05-24 13:47:14.000000000 -0400
-@@ -260,6 +260,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/groupwise/Makefile.in kdenetwork-3.4.2/kopete/protocols/groupwise/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/groupwise/Makefile.in 2005-07-20 20:17:00.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/groupwise/Makefile.in 2005-08-02 17:20:37.748753080 +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 = $(kopete_groupwise_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -261,6 +259,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12949,7 +14350,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -479,7 +482,7 @@
+@@ -480,7 +481,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12958,7 +14359,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -517,9 +520,9 @@
+@@ -518,9 +519,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12970,7 +14371,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -935,18 +938,18 @@
+@@ -936,18 +937,18 @@
#>+ 3
@@ -12995,7 +14396,7 @@
#>+ 3
gwbytestream.moc: $(srcdir)/gwbytestream.h
-@@ -963,18 +966,18 @@
+@@ -964,18 +965,18 @@
mocs: gwconnector.moc
#>+ 3
@@ -13020,7 +14421,7 @@
#>+ 3
gwcontactlist.moc: $(srcdir)/gwcontactlist.h
-@@ -985,7 +988,7 @@
+@@ -986,7 +987,7 @@
#>+ 3
clean-metasources:
@@ -13029,7 +14430,7 @@
#>+ 2
KDE_DIST=gwchatui.rc kopete_groupwise.desktop gwaddui.ui Makefile.in Makefile.am
-@@ -1036,7 +1039,7 @@
+@@ -1037,7 +1038,7 @@
#>+ 11
@@ -13038,7 +14439,7 @@
@echo 'creating kopete_groupwise_la.all_cpp.cpp ...'; \
rm -f kopete_groupwise_la.all_cpp.files kopete_groupwise_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kopete_groupwise_la.all_cpp.final; \
-@@ -1081,8 +1084,8 @@
+@@ -1082,8 +1083,8 @@
gwbytestream.o: gwbytestream.moc
gwconnector.o: gwconnector.moc
gwaccount.lo: gwaccount.moc
@@ -13048,10 +14449,25 @@
gwbytestream.lo: gwbytestream.moc
nmcheck:
gwcontact.o: gwcontact.moc
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/groupwise/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/groupwise/ui/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/groupwise/ui/Makefile.in 2005-05-23 12:09:03.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/groupwise/ui/Makefile.in 2005-05-24 13:47:14.000000000 -0400
-@@ -231,6 +231,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/groupwise/ui/Makefile.in kdenetwork-3.4.2/kopete/protocols/groupwise/ui/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/groupwise/ui/Makefile.in 2005-07-20 20:17:00.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/groupwise/ui/Makefile.in 2005-08-02 17:20:38.129695168 +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 = $(libkopetegroupwiseui_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -232,6 +230,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13061,7 +14477,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -447,7 +450,7 @@
+@@ -448,7 +449,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13070,7 +14486,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
@@ -13082,10 +14498,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/irc/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/irc/icons/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/irc/icons/Makefile.in 2005-05-23 12:09:03.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/irc/icons/Makefile.in 2005-05-24 13:47:14.000000000 -0400
-@@ -188,6 +188,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/irc/icons/Makefile.in kdenetwork-3.4.2/kopete/protocols/irc/icons/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/irc/icons/Makefile.in 2005-07-20 20:17:00.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/irc/icons/Makefile.in 2005-08-02 17:20:38.242677992 +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@
+
+@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13095,7 +14517,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
+@@ -382,7 +385,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -13104,7 +14526,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -420,9 +423,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13116,7 +14538,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -571,31 +574,31 @@
+@@ -572,31 +575,31 @@
#>+ 27
install-kde-icons:
@@ -13161,10 +14583,25 @@
#>+ 15
force-reedit:
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/irc/libkirc/Makefile.in kdenetwork-3.4.1/kopete/protocols/irc/libkirc/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/irc/libkirc/Makefile.in 2005-05-23 12:09:03.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/irc/libkirc/Makefile.in 2005-05-24 13:47:14.000000000 -0400
-@@ -227,6 +227,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/irc/libkirc/Makefile.in kdenetwork-3.4.2/kopete/protocols/irc/libkirc/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/irc/libkirc/Makefile.in 2005-07-20 20:17:00.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/irc/libkirc/Makefile.in 2005-08-02 17:20:38.285671456 +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@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libkirc_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -228,6 +226,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13174,7 +14611,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -440,7 +443,7 @@
+@@ -441,7 +442,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13183,7 +14620,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
@@ -13195,7 +14632,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -759,18 +762,18 @@
+@@ -760,18 +761,18 @@
mocs: kirctransferserver.moc
#>+ 3
@@ -13220,7 +14657,7 @@
#>+ 3
ksslsocket.moc: $(srcdir)/ksslsocket.h
-@@ -781,7 +784,7 @@
+@@ -782,7 +783,7 @@
#>+ 3
clean-metasources:
@@ -13229,10 +14666,25 @@
#>+ 2
KDE_DIST=kirctransferhandler.h kirctransfer.h kircentity.h kircengine.h kircmessageredirector.h ksslsocket.h kirctransferserver.h Makefile.in kircmessage.h Makefile.am
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/irc/Makefile.in kdenetwork-3.4.1/kopete/protocols/irc/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/irc/Makefile.in 2005-05-23 12:09:03.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/irc/Makefile.in 2005-05-24 13:47:14.000000000 -0400
-@@ -263,6 +263,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/irc/Makefile.in kdenetwork-3.4.2/kopete/protocols/irc/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/irc/Makefile.in 2005-07-20 20:17:00.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/irc/Makefile.in 2005-08-02 17:20:38.223680880 +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 = $(kopete_irc_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -264,6 +262,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13242,7 +14694,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -491,7 +494,7 @@
+@@ -492,7 +493,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13251,7 +14703,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -529,9 +532,9 @@
+@@ -530,9 +531,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13263,7 +14715,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -979,18 +982,18 @@
+@@ -980,18 +981,18 @@
mocs: ircchannelcontact.moc
#>+ 3
@@ -13288,7 +14740,7 @@
#>+ 3
ircguiclient.moc: $(srcdir)/ircguiclient.h
-@@ -1007,18 +1010,18 @@
+@@ -1008,18 +1009,18 @@
mocs: irccontact.moc
#>+ 3
@@ -13313,7 +14765,7 @@
#>+ 3
ircusercontact.moc: $(srcdir)/ircusercontact.h
-@@ -1057,7 +1060,7 @@
+@@ -1058,7 +1059,7 @@
#>+ 3
clean-metasources:
@@ -13322,7 +14774,7 @@
#>+ 2
KDE_DIST=irc.protocol irctransferhandler.h ircguiclient.h ircsignalhandler.h kopete_irc.desktop ircusercontact.h ircchatui.rc ksparser.h ircchannelcontact.h ircprotocol.h ircnetworks.xml irccontactmanager.h ircaddcontactpage.h Makefile.in kcodecaction.h ircservercontact.h irccontact.h Makefile.am ircaccount.h
-@@ -1108,7 +1111,7 @@
+@@ -1109,7 +1110,7 @@
#>+ 11
@@ -13331,10 +14783,25 @@
@echo 'creating kopete_irc_la.all_cpp.cpp ...'; \
rm -f kopete_irc_la.all_cpp.files kopete_irc_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kopete_irc_la.all_cpp.final; \
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/irc/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/irc/ui/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/irc/ui/Makefile.in 2005-05-23 12:09:03.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/irc/ui/Makefile.in 2005-05-24 13:47:14.000000000 -0400
-@@ -225,6 +225,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/irc/ui/Makefile.in kdenetwork-3.4.2/kopete/protocols/irc/ui/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/irc/ui/Makefile.in 2005-07-20 20:17:00.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/irc/ui/Makefile.in 2005-08-02 17:20:38.313667200 +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@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libkopeteircui_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -226,6 +224,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13344,7 +14811,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -431,7 +434,7 @@
+@@ -432,7 +433,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13353,7 +14820,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -469,9 +472,9 @@
+@@ -470,9 +471,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13365,10 +14832,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/jabber/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/icons/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/jabber/icons/Makefile.in 2005-05-23 12:09:03.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/jabber/icons/Makefile.in 2005-05-24 13:47:14.000000000 -0400
-@@ -188,6 +188,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/jabber/icons/Makefile.in kdenetwork-3.4.2/kopete/protocols/jabber/icons/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/jabber/icons/Makefile.in 2005-07-20 20:17:00.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/jabber/icons/Makefile.in 2005-08-02 17:20:38.562629352 +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@
+
+@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13378,7 +14851,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
+@@ -382,7 +385,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -13387,7 +14860,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -420,9 +423,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13399,7 +14872,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -564,87 +567,87 @@
+@@ -565,87 +568,87 @@
.NOEXPORT:
#>+ 2
@@ -13543,10 +15016,16 @@
#>+ 15
force-reedit:
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/cutestuff/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/cutestuff/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/cutestuff/Makefile.in 2005-05-23 12:09:03.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/cutestuff/Makefile.in 2005-05-24 13:47:15.000000000 -0400
-@@ -204,6 +204,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/jabber/libiris/cutestuff/Makefile.in kdenetwork-3.4.2/kopete/protocols/jabber/libiris/cutestuff/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/jabber/libiris/cutestuff/Makefile.in 2005-07-20 20:17:00.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/jabber/libiris/cutestuff/Makefile.in 2005-08-02 17:20:38.601623424 +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@
+
+@@ -205,6 +205,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13556,7 +15035,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
+@@ -397,7 +400,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -13565,7 +15044,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -435,9 +438,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13577,10 +15056,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/cutestuff/network/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/cutestuff/network/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/cutestuff/network/Makefile.in 2005-05-23 12:09:03.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/cutestuff/network/Makefile.in 2005-05-24 13:47:15.000000000 -0400
-@@ -223,6 +223,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/jabber/libiris/cutestuff/network/Makefile.in kdenetwork-3.4.2/kopete/protocols/jabber/libiris/cutestuff/network/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/jabber/libiris/cutestuff/network/Makefile.in 2005-07-20 20:17:00.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/jabber/libiris/cutestuff/network/Makefile.in 2005-08-02 17:20:38.647616432 +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@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libcutestuff_network_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -224,6 +222,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13590,7 +15084,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -428,7 +431,7 @@
+@@ -429,7 +430,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13599,7 +15093,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -466,9 +469,9 @@
+@@ -467,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13611,7 +15105,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -717,18 +720,18 @@
+@@ -718,18 +719,18 @@
mocs: ndns.moc
#>+ 3
@@ -13636,7 +15130,7 @@
#>+ 3
httppoll.moc: $(srcdir)/httppoll.h
-@@ -753,10 +756,10 @@
+@@ -754,10 +755,10 @@
#>+ 3
clean-metasources:
@@ -13649,10 +15143,25 @@
#>+ 2
docs-am:
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/cutestuff/util/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/cutestuff/util/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/cutestuff/util/Makefile.in 2005-05-23 12:09:03.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/cutestuff/util/Makefile.in 2005-05-24 13:47:15.000000000 -0400
-@@ -225,6 +225,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/jabber/libiris/cutestuff/util/Makefile.in kdenetwork-3.4.2/kopete/protocols/jabber/libiris/cutestuff/util/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/jabber/libiris/cutestuff/util/Makefile.in 2005-07-20 20:17:00.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/jabber/libiris/cutestuff/util/Makefile.in 2005-08-02 17:20:38.684610808 +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@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libcutestuff_util_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -226,6 +224,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13662,7 +15171,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -428,7 +431,7 @@
+@@ -429,7 +430,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13671,7 +15180,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -466,9 +469,9 @@
+@@ -467,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13683,10 +15192,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/iris/include/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/iris/include/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/iris/include/Makefile.in 2005-05-23 12:09:04.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/iris/include/Makefile.in 2005-05-24 13:47:15.000000000 -0400
-@@ -224,6 +224,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/jabber/libiris/iris/include/Makefile.in kdenetwork-3.4.2/kopete/protocols/jabber/libiris/iris/include/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/jabber/libiris/iris/include/Makefile.in 2005-07-20 20:17:00.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/jabber/libiris/iris/include/Makefile.in 2005-08-02 17:20:38.723604880 +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@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libiris_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -225,6 +223,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13696,7 +15220,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -423,7 +424,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13705,7 +15229,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
@@ -13717,10 +15241,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/iris/jabber/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/iris/jabber/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/iris/jabber/Makefile.in 2005-05-23 12:09:04.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/iris/jabber/Makefile.in 2005-05-24 13:47:15.000000000 -0400
-@@ -225,6 +225,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/jabber/libiris/iris/jabber/Makefile.in kdenetwork-3.4.2/kopete/protocols/jabber/libiris/iris/jabber/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/jabber/libiris/iris/jabber/Makefile.in 2005-07-20 20:17:01.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/jabber/libiris/iris/jabber/Makefile.in 2005-08-02 17:20:38.787595152 +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@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libiris_jabber_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -226,6 +224,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13730,7 +15269,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -426,7 +429,7 @@
+@@ -427,7 +428,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13739,7 +15278,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -464,9 +467,9 @@
+@@ -465,9 +466,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13751,10 +15290,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/iris/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/iris/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/iris/Makefile.in 2005-05-23 12:09:03.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/iris/Makefile.in 2005-05-24 13:47:15.000000000 -0400
-@@ -204,6 +204,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/jabber/libiris/iris/Makefile.in kdenetwork-3.4.2/kopete/protocols/jabber/libiris/iris/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/jabber/libiris/iris/Makefile.in 2005-07-20 20:17:00.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/jabber/libiris/iris/Makefile.in 2005-08-02 17:20:38.699608528 +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@
+
+@@ -205,6 +205,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13764,7 +15309,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
+@@ -397,7 +400,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -13773,7 +15318,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -435,9 +438,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13785,10 +15330,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.in 2005-05-23 12:09:04.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.in 2005-05-24 13:47:15.000000000 -0400
-@@ -236,6 +236,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.in kdenetwork-3.4.2/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.in 2005-07-20 20:17:01.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.in 2005-08-02 17:20:38.874581928 +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@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libiris_xmpp_core_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -237,6 +235,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13798,7 +15358,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -452,7 +455,7 @@
+@@ -453,7 +454,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13807,7 +15367,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -490,9 +493,9 @@
+@@ -491,9 +492,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13819,10 +15379,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile.in 2005-05-23 12:09:04.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile.in 2005-05-24 13:47:15.000000000 -0400
-@@ -222,6 +222,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile.in kdenetwork-3.4.2/kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile.in 2005-07-20 20:17:01.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile.in 2005-08-02 17:20:38.914575848 +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@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libiris_xmpp_im_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -223,6 +221,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13832,7 +15407,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -426,7 +429,7 @@
+@@ -427,7 +428,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13841,7 +15416,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -464,9 +467,9 @@
+@@ -465,9 +466,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13853,10 +15428,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/Makefile.in 2005-05-23 12:09:03.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/Makefile.in 2005-05-24 13:47:14.000000000 -0400
-@@ -204,6 +204,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/jabber/libiris/Makefile.in kdenetwork-3.4.2/kopete/protocols/jabber/libiris/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/jabber/libiris/Makefile.in 2005-07-20 20:17:00.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/jabber/libiris/Makefile.in 2005-08-02 17:20:38.576627224 +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@
+
+@@ -205,6 +205,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13866,7 +15447,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
+@@ -397,7 +400,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -13875,7 +15456,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -435,9 +438,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13887,10 +15468,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/qca/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/qca/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/qca/Makefile.in 2005-05-23 12:09:04.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/qca/Makefile.in 2005-05-24 13:47:15.000000000 -0400
-@@ -205,6 +205,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/jabber/libiris/qca/Makefile.in kdenetwork-3.4.2/kopete/protocols/jabber/libiris/qca/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/jabber/libiris/qca/Makefile.in 2005-07-20 20:17:01.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/jabber/libiris/qca/Makefile.in 2005-08-02 17:20:38.928573720 +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@
+
+@@ -206,6 +206,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13900,7 +15487,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -397,7 +400,7 @@
+@@ -398,7 +401,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -13909,7 +15496,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -435,9 +438,9 @@
+@@ -436,9 +439,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13921,10 +15508,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/qca/src/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/qca/src/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/qca/src/Makefile.in 2005-05-23 12:09:04.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/qca/src/Makefile.in 2005-05-24 13:47:15.000000000 -0400
-@@ -220,6 +220,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/jabber/libiris/qca/src/Makefile.in kdenetwork-3.4.2/kopete/protocols/jabber/libiris/qca/src/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/jabber/libiris/qca/src/Makefile.in 2005-07-20 20:17:01.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/jabber/libiris/qca/src/Makefile.in 2005-08-02 17:20:39.059553808 +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@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libqca_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -221,6 +219,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13934,7 +15536,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -418,7 +421,7 @@
+@@ -419,7 +420,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13943,7 +15545,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -456,9 +459,9 @@
+@@ -457,9 +458,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13955,10 +15557,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/jabber/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/jabber/Makefile.in 2005-05-23 12:09:03.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/jabber/Makefile.in 2005-05-24 13:47:14.000000000 -0400
-@@ -272,6 +272,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/jabber/Makefile.in kdenetwork-3.4.2/kopete/protocols/jabber/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/jabber/Makefile.in 2005-07-20 20:17:00.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/jabber/Makefile.in 2005-08-02 17:20:38.525634976 +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 = $(kopete_jabber_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -273,6 +271,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13968,7 +15585,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -512,7 +515,7 @@
+@@ -513,7 +514,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13977,7 +15594,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
@@ -13989,7 +15606,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1006,18 +1009,18 @@
+@@ -1007,18 +1008,18 @@
mocs: jabbergroupchatmanager.moc
#>+ 3
@@ -14014,7 +15631,7 @@
#>+ 3
jabberprotocol.moc: $(srcdir)/jabberprotocol.h
-@@ -1070,7 +1073,7 @@
+@@ -1071,7 +1072,7 @@
#>+ 3
clean-metasources:
@@ -14023,7 +15640,7 @@
#>+ 2
KDE_DIST=jabberformtranslator.h kopete_jabber.desktop jabberbasecontact.h jabberprotocol.h jabberchatsession.h jabberaccount.h jabberfiletransfer.h jabberresource.h Makefile.in jabberconnector.h jabbercontactpool.h jabbergroupchatmanager.h Makefile.am jabberbytestream.h jabberformlineedit.h jabbergroupmembercontact.h
-@@ -1121,7 +1124,7 @@
+@@ -1122,7 +1123,7 @@
#>+ 11
@@ -14032,7 +15649,7 @@
@echo 'creating kopete_jabber_la.all_cpp.cpp ...'; \
rm -f kopete_jabber_la.all_cpp.files kopete_jabber_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kopete_jabber_la.all_cpp.final; \
-@@ -1173,8 +1176,8 @@
+@@ -1174,8 +1175,8 @@
jabberformlineedit.o: jabberformlineedit.moc
jabberfiletransfer.o: jabberfiletransfer.moc
nmcheck-am: nmcheck
@@ -14042,10 +15659,25 @@
jabberresourcepool.o: jabberresourcepool.moc
jabbercontactpool.lo: jabbercontactpool.moc
jabberformtranslator.o: jabberformtranslator.moc
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/jabber/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/ui/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/jabber/ui/Makefile.in 2005-05-23 12:09:04.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/jabber/ui/Makefile.in 2005-05-24 13:47:15.000000000 -0400
-@@ -231,6 +231,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/jabber/ui/Makefile.in kdenetwork-3.4.2/kopete/protocols/jabber/ui/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/jabber/ui/Makefile.in 2005-07-20 20:17:01.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/jabber/ui/Makefile.in 2005-08-02 17:20:39.124543928 +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@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libkopetejabberui_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -232,6 +230,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14055,7 +15687,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -469,7 +472,7 @@
+@@ -470,7 +471,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14064,7 +15696,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -507,9 +510,9 @@
+@@ -508,9 +509,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14076,7 +15708,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -769,18 +772,18 @@
+@@ -770,18 +771,18 @@
mocs: dlgjabbervcard.moc
#>+ 3
@@ -14101,7 +15733,7 @@
#>+ 3
dlgjabberchatjoin.moc: $(srcdir)/dlgjabberchatjoin.h
-@@ -819,7 +822,7 @@
+@@ -820,7 +821,7 @@
#>+ 3
clean-metasources:
@@ -14110,7 +15742,7 @@
#>+ 2
KDE_DIST=dlgjabberregister.h dlgjabberchatjoin.h dlgjabberchooseserver.ui dlgchatjoin.ui dlgjabberbrowse.h jabberchooseserver.h jabberaddcontactpage.h dlgjabbervcard.h dlgjabbersendraw.h dlgjabberservices.h Makefile.in jabbereditaccountwidget.h dlgjabberregisteraccount.ui Makefile.am jabberregisteraccount.h
-@@ -880,7 +883,7 @@
+@@ -881,7 +882,7 @@
#>+ 11
@@ -14119,10 +15751,16 @@
@echo 'creating libkopetejabberui_la.all_cpp.cpp ...'; \
rm -f libkopetejabberui_la.all_cpp.files libkopetejabberui_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkopetejabberui_la.all_cpp.final; \
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/Makefile.in kdenetwork-3.4.1/kopete/protocols/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/Makefile.in 2005-05-23 12:09:03.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/Makefile.in 2005-05-24 13:47:13.000000000 -0400
-@@ -204,6 +204,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/Makefile.in kdenetwork-3.4.2/kopete/protocols/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/Makefile.in 2005-07-20 20:16:59.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/Makefile.in 2005-08-02 17:20:37.498791080 +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@
+
+@@ -205,6 +205,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14132,7 +15770,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -399,7 +402,7 @@
+@@ -400,7 +403,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -14141,7 +15779,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -437,9 +440,9 @@
+@@ -438,9 +441,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14153,10 +15791,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/meanwhile/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/meanwhile/icons/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/meanwhile/icons/Makefile.in 2005-05-23 12:09:04.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/meanwhile/icons/Makefile.in 2005-05-24 13:47:15.000000000 -0400
-@@ -188,6 +188,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/meanwhile/icons/Makefile.in kdenetwork-3.4.2/kopete/protocols/meanwhile/icons/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/meanwhile/icons/Makefile.in 2005-07-20 20:17:01.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/meanwhile/icons/Makefile.in 2005-08-02 17:20:39.184534808 +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@
+
+@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14166,7 +15810,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
+@@ -382,7 +385,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -14175,7 +15819,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -420,9 +423,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14187,7 +15831,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -573,36 +576,36 @@
+@@ -574,36 +577,36 @@
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
$(INSTALL_DATA) $(srcdir)/cr16-action-meanwhile_unknown.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/meanwhile_unknown.png
@@ -14237,10 +15881,25 @@
#>+ 15
force-reedit:
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/meanwhile/Makefile.in kdenetwork-3.4.1/kopete/protocols/meanwhile/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/meanwhile/Makefile.in 2005-05-23 12:09:04.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/meanwhile/Makefile.in 2005-05-24 13:47:15.000000000 -0400
-@@ -261,6 +261,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/meanwhile/Makefile.in kdenetwork-3.4.2/kopete/protocols/meanwhile/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/meanwhile/Makefile.in 2005-07-20 20:17:01.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/meanwhile/Makefile.in 2005-08-02 17:20:39.167537392 +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 = $(kopete_meanwhile_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -262,6 +260,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14250,7 +15909,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -493,7 +496,7 @@
+@@ -494,7 +495,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14259,7 +15918,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -531,9 +534,9 @@
+@@ -532,9 +533,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14271,10 +15930,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/meanwhile/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/meanwhile/ui/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/meanwhile/ui/Makefile.in 2005-05-23 12:09:04.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/meanwhile/ui/Makefile.in 2005-05-24 13:47:15.000000000 -0400
-@@ -224,6 +224,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/meanwhile/ui/Makefile.in kdenetwork-3.4.2/kopete/protocols/meanwhile/ui/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/meanwhile/ui/Makefile.in 2005-07-20 20:17:01.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/meanwhile/ui/Makefile.in 2005-08-02 17:20:39.214530248 +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@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libkopetemeanwhileui_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -225,6 +223,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14284,7 +15958,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -425,7 +428,7 @@
+@@ -426,7 +427,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14293,7 +15967,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
@@ -14305,10 +15979,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/msn/config/Makefile.in kdenetwork-3.4.1/kopete/protocols/msn/config/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/msn/config/Makefile.in 2005-05-23 12:09:04.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/msn/config/Makefile.in 2005-05-24 13:47:16.000000000 -0400
-@@ -237,6 +237,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/msn/config/Makefile.in kdenetwork-3.4.2/kopete/protocols/msn/config/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/msn/config/Makefile.in 2005-07-20 20:17:01.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/msn/config/Makefile.in 2005-08-02 17:20:39.366507144 +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_kopete_msn_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -238,6 +236,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14318,7 +16007,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -441,7 +444,7 @@
+@@ -442,7 +443,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14327,7 +16016,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -479,9 +482,9 @@
+@@ -480,9 +481,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14339,10 +16028,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/msn/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/msn/icons/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/msn/icons/Makefile.in 2005-05-23 12:09:04.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/msn/icons/Makefile.in 2005-05-24 13:47:16.000000000 -0400
-@@ -188,6 +188,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/msn/icons/Makefile.in kdenetwork-3.4.2/kopete/protocols/msn/icons/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/msn/icons/Makefile.in 2005-07-20 20:17:01.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/msn/icons/Makefile.in 2005-08-02 17:20:39.388503800 +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@
+
+@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14352,7 +16047,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
+@@ -382,7 +385,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -14361,7 +16056,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -420,9 +423,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14373,7 +16068,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -572,47 +575,47 @@
+@@ -573,47 +576,47 @@
#>+ 44
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
@@ -14450,10 +16145,25 @@
#>+ 15
force-reedit:
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/msn/Makefile.in kdenetwork-3.4.1/kopete/protocols/msn/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/msn/Makefile.in 2005-05-23 12:09:04.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/msn/Makefile.in 2005-05-24 13:47:16.000000000 -0400
-@@ -267,6 +267,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/msn/Makefile.in kdenetwork-3.4.2/kopete/protocols/msn/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/msn/Makefile.in 2005-07-20 20:17:01.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/msn/Makefile.in 2005-08-02 17:20:39.341510944 +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 = $(kopete_msn_la_SOURCES) $(libkopete_msn_shared_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -270,6 +268,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14463,7 +16173,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -489,7 +492,7 @@
+@@ -492,7 +493,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14472,7 +16182,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -527,9 +530,9 @@
+@@ -530,9 +531,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14484,8 +16194,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1003,13 +1006,6 @@
- mocs: msndebugrawcmddlg.moc
+@@ -1013,13 +1014,6 @@
+ mocs: msnsecureloginhandler.moc
#>+ 3
-msncontact.moc: $(srcdir)/msncontact.h
@@ -14498,7 +16208,7 @@
msnp2pdisplatcher.moc: $(srcdir)/msnp2pdisplatcher.h
$(MOC) $(srcdir)/msnp2pdisplatcher.h -o msnp2pdisplatcher.moc
-@@ -1031,6 +1027,13 @@
+@@ -1041,6 +1035,13 @@
mocs: msnfiletransfersocket.moc
#>+ 3
@@ -14512,7 +16222,7 @@
msnprotocol.moc: $(srcdir)/msnprotocol.h
$(MOC) $(srcdir)/msnprotocol.h -o msnprotocol.moc
-@@ -1073,18 +1076,18 @@
+@@ -1076,18 +1077,18 @@
mocs: msnswitchboardsocket.moc
#>+ 3
@@ -14537,19 +16247,44 @@
#>+ 3
msnaddcontactpage.moc: $(srcdir)/msnaddcontactpage.h
-@@ -1111,7 +1114,7 @@
+@@ -1114,7 +1115,7 @@
#>+ 3
clean-metasources:
-- -rm -f msndebugrawcmddlg.moc msncontact.moc msnp2pdisplatcher.moc msnmessagemanager.moc msnfiletransfersocket.moc msnprotocol.moc sslloginhandler.moc msnaccount.moc msnsocket.moc msnnotifysocket.moc msnswitchboardsocket.moc msnp2poutgoing.moc msnp2p.moc msnaddcontactpage.moc msnp2pincoming.moc
-+ -rm -f msndebugrawcmddlg.moc msnp2pdisplatcher.moc msnmessagemanager.moc msnfiletransfersocket.moc msncontact.moc msnprotocol.moc sslloginhandler.moc msnaccount.moc msnsocket.moc msnnotifysocket.moc msnswitchboardsocket.moc msnp2p.moc msnp2poutgoing.moc msnaddcontactpage.moc msnp2pincoming.moc
+- -rm -f msndebugrawcmddlg.moc msnsecureloginhandler.moc msncontact.moc msnp2pdisplatcher.moc msnmessagemanager.moc msnfiletransfersocket.moc msnprotocol.moc msnaccount.moc msnsocket.moc msnnotifysocket.moc msnswitchboardsocket.moc msnp2poutgoing.moc msnp2p.moc msnaddcontactpage.moc msnp2pincoming.moc
++ -rm -f msndebugrawcmddlg.moc msnsecureloginhandler.moc msnp2pdisplatcher.moc msnmessagemanager.moc msnfiletransfersocket.moc msncontact.moc msnprotocol.moc msnaccount.moc msnsocket.moc msnnotifysocket.moc msnswitchboardsocket.moc msnp2p.moc msnp2poutgoing.moc msnaddcontactpage.moc msnp2pincoming.moc
#>+ 2
- KDE_DIST=msnp2poutgoing.h kopete_msn.desktop msncontact.h msnp2p.h msnmessagemanager.h msnchatui.rc Changelog msnsocket.h msnp2pincoming.h ReleaseNotes msndebugrawcmddlg.h msnaccount.h msnfiletransfersocket.h sha1.h msnp2pdisplatcher.h sslloginhandler.h msninvitation.h Makefile.in msnswitchboardsocket.h msnprotocol.h msnnotifysocket.h msnaddcontactpage.h Makefile.am
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/msn/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/msn/ui/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/msn/ui/Makefile.in 2005-05-23 12:09:04.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/msn/ui/Makefile.in 2005-05-24 13:47:16.000000000 -0400
-@@ -223,6 +223,9 @@
+ KDE_DIST=msnp2poutgoing.h kopete_msn.desktop msncontact.h msnp2p.h msnmessagemanager.h msnchatui.rc Changelog msnsocket.h msnp2pincoming.h msnsecureloginhandler.h ReleaseNotes msndebugrawcmddlg.h msnaccount.h msnfiletransfersocket.h sha1.h msnp2pdisplatcher.h msninvitation.h Makefile.in msnswitchboardsocket.h msnprotocol.h msnnotifysocket.h msnaddcontactpage.h Makefile.am
+@@ -1205,8 +1206,8 @@
+ msnnotifysocket.lo: msnnotifysocket.moc
+ msncontact.o: msncontact.moc
+ msnp2p.lo: msnp2p.moc
+-msnsecureloginhandler.lo: msnsecureloginhandler.moc
+ msnfiletransfersocket.o: msnfiletransfersocket.moc
++msnsecureloginhandler.lo: msnsecureloginhandler.moc
+ msnmessagemanager.lo: msnmessagemanager.moc
+ msndebugrawcmddlg.o: msndebugrawcmddlg.moc
+ msnsocket.lo: msnsocket.moc
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/msn/ui/Makefile.in kdenetwork-3.4.2/kopete/protocols/msn/ui/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/msn/ui/Makefile.in 2005-07-20 20:17:01.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/msn/ui/Makefile.in 2005-08-02 17:20:39.415499696 +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@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libkopetemsnui_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -224,6 +222,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14559,7 +16294,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -428,7 +431,7 @@
+@@ -429,7 +430,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14568,7 +16303,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -466,9 +469,9 @@
+@@ -467,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14580,10 +16315,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/oscar/aim/Makefile.in kdenetwork-3.4.1/kopete/protocols/oscar/aim/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/oscar/aim/Makefile.in 2005-05-23 12:09:04.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/oscar/aim/Makefile.in 2005-05-24 13:47:17.000000000 -0400
-@@ -253,6 +253,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/oscar/aim/Makefile.in kdenetwork-3.4.2/kopete/protocols/oscar/aim/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/oscar/aim/Makefile.in 2005-07-20 20:17:01.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/oscar/aim/Makefile.in 2005-08-02 17:20:39.502486472 +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 = $(kopete_aim_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -254,6 +252,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14593,7 +16343,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -463,7 +466,7 @@
+@@ -464,7 +465,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14602,7 +16352,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -501,9 +504,9 @@
+@@ -502,9 +503,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14614,10 +16364,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/oscar/aim/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/oscar/aim/ui/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/oscar/aim/ui/Makefile.in 2005-05-23 12:09:04.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/oscar/aim/ui/Makefile.in 2005-05-24 13:47:17.000000000 -0400
-@@ -226,6 +226,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/oscar/aim/ui/Makefile.in kdenetwork-3.4.2/kopete/protocols/oscar/aim/ui/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/oscar/aim/ui/Makefile.in 2005-07-20 20:17:01.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/oscar/aim/ui/Makefile.in 2005-08-02 17:20:39.528482520 +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@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libkopeteaimui_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -227,6 +225,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14627,7 +16392,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -430,7 +433,7 @@
+@@ -431,7 +432,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14636,7 +16401,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -468,9 +471,9 @@
+@@ -469,9 +470,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14648,10 +16413,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/oscar/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/oscar/icons/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/oscar/icons/Makefile.in 2005-05-23 12:09:04.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/oscar/icons/Makefile.in 2005-05-24 13:47:17.000000000 -0400
-@@ -188,6 +188,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/oscar/icons/Makefile.in kdenetwork-3.4.2/kopete/protocols/oscar/icons/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/oscar/icons/Makefile.in 2005-07-20 20:17:01.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/oscar/icons/Makefile.in 2005-08-02 17:20:39.568476440 +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@
+
+@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14661,7 +16432,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
+@@ -382,7 +385,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -14670,7 +16441,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -420,9 +423,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14682,7 +16453,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -564,7 +567,7 @@
+@@ -565,7 +568,7 @@
.NOEXPORT:
#>+ 2
@@ -14691,7 +16462,7 @@
#>+ 2
docs-am:
-@@ -572,96 +575,96 @@
+@@ -573,96 +576,96 @@
#>+ 93
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions
@@ -14853,10 +16624,25 @@
#>+ 15
force-reedit:
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/oscar/icq/Makefile.in kdenetwork-3.4.1/kopete/protocols/oscar/icq/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/oscar/icq/Makefile.in 2005-05-23 12:09:04.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/oscar/icq/Makefile.in 2005-05-24 13:47:17.000000000 -0400
-@@ -254,6 +254,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/oscar/icq/Makefile.in kdenetwork-3.4.2/kopete/protocols/oscar/icq/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/oscar/icq/Makefile.in 2005-07-20 20:17:01.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/oscar/icq/Makefile.in 2005-08-02 17:20:39.615469296 +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 = $(kopete_icq_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -255,6 +253,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14866,7 +16652,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -467,7 +470,7 @@
+@@ -468,7 +469,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14875,7 +16661,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
@@ -14887,10 +16673,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/oscar/icq/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/oscar/icq/ui/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/oscar/icq/ui/Makefile.in 2005-05-23 12:09:04.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/oscar/icq/ui/Makefile.in 2005-05-24 13:47:17.000000000 -0400
-@@ -236,6 +236,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/oscar/icq/ui/Makefile.in kdenetwork-3.4.2/kopete/protocols/oscar/icq/ui/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/oscar/icq/ui/Makefile.in 2005-07-20 20:17:02.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/oscar/icq/ui/Makefile.in 2005-08-02 17:20:39.647464432 +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@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libkopeteicqui_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -237,6 +235,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14900,7 +16701,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -448,7 +451,7 @@
+@@ -449,7 +450,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14909,7 +16710,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -486,9 +489,9 @@
+@@ -487,9 +488,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14921,7 +16722,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -760,7 +763,7 @@
+@@ -761,7 +762,7 @@
-rm -f icqaddcontactpage.moc icqsearchdialog.moc icqeditaccountwidget.moc icquserinfowidget.moc icqauthreplydialog.moc
#>+ 2
@@ -14930,10 +16731,25 @@
#>+ 10
clean-ui:
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/oscar/liboscar/Makefile.in kdenetwork-3.4.1/kopete/protocols/oscar/liboscar/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/oscar/liboscar/Makefile.in 2005-05-23 12:09:04.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/oscar/liboscar/Makefile.in 2005-05-24 13:47:17.000000000 -0400
-@@ -269,6 +269,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/oscar/liboscar/Makefile.in kdenetwork-3.4.2/kopete/protocols/oscar/liboscar/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/oscar/liboscar/Makefile.in 2005-07-20 20:17:02.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/oscar/liboscar/Makefile.in 2005-08-02 17:20:39.772445432 +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 = $(liboscar_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -270,6 +268,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14943,7 +16759,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -487,7 +490,7 @@
+@@ -488,7 +489,7 @@
.SUFFIXES:
.SUFFIXES: .c .cc .cpp .lo .o .obj
@@ -14952,7 +16768,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -525,9 +528,9 @@
+@@ -526,9 +527,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14964,7 +16780,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -889,18 +892,18 @@
+@@ -890,18 +891,18 @@
mocs: servicesetuptask.moc
#>+ 3
@@ -14989,7 +16805,7 @@
#>+ 3
bytestream.moc: $(srcdir)/bytestream.h
-@@ -931,18 +934,18 @@
+@@ -932,18 +933,18 @@
mocs: stream.moc
#>+ 3
@@ -15014,7 +16830,7 @@
#>+ 3
usersearchtask.moc: $(srcdir)/usersearchtask.h
-@@ -959,11 +962,11 @@
+@@ -960,11 +961,11 @@
mocs: rateclass.moc
#>+ 3
@@ -15029,7 +16845,7 @@
#>+ 3
rateinfotask.moc: $(srcdir)/rateinfotask.h
-@@ -973,11 +976,11 @@
+@@ -974,11 +975,11 @@
mocs: rateinfotask.moc
#>+ 3
@@ -15044,7 +16860,7 @@
#>+ 3
safedelete.moc: $(srcdir)/safedelete.h
-@@ -1043,18 +1046,18 @@
+@@ -1044,18 +1045,18 @@
mocs: oscarclientstream.moc
#>+ 3
@@ -15069,7 +16885,7 @@
#>+ 3
connector.moc: $(srcdir)/connector.h
-@@ -1106,25 +1109,25 @@
+@@ -1107,25 +1108,25 @@
mocs: oscarbytestream.moc
#>+ 3
@@ -15103,7 +16919,7 @@
#>+ 3
clean-closures:
-@@ -1172,7 +1175,7 @@
+@@ -1173,7 +1174,7 @@
#>+ 11
@@ -15112,10 +16928,25 @@
@echo 'creating liboscar_la.all_cpp.cpp ...'; \
rm -f liboscar_la.all_cpp.files liboscar_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> liboscar_la.all_cpp.final; \
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/oscar/liboscar/tests/Makefile.in kdenetwork-3.4.1/kopete/protocols/oscar/liboscar/tests/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/oscar/liboscar/tests/Makefile.in 2005-05-23 12:09:04.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/oscar/liboscar/tests/Makefile.in 2005-05-24 13:47:17.000000000 -0400
-@@ -238,6 +238,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/oscar/liboscar/tests/Makefile.in kdenetwork-3.4.2/kopete/protocols/oscar/liboscar/tests/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/oscar/liboscar/tests/Makefile.in 2005-07-20 20:17:03.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/oscar/liboscar/tests/Makefile.in 2005-08-02 17:20:39.808439960 +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@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(logintest_SOURCES) $(ssigrouptest_SOURCES) $(userinfotest_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -239,6 +237,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15125,7 +16956,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -441,7 +444,7 @@
+@@ -442,7 +443,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15134,7 +16965,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -479,9 +482,9 @@
+@@ -480,9 +481,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15146,7 +16977,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstPROGRAMS:
-@@ -734,18 +737,18 @@
+@@ -735,18 +736,18 @@
mocs: ssigrouptest.moc
#>+ 3
@@ -15171,7 +17002,7 @@
#>+ 3
clientstream_test.moc: $(srcdir)/clientstream_test.h
-@@ -756,7 +759,7 @@
+@@ -757,7 +758,7 @@
#>+ 3
clean-metasources:
@@ -15180,7 +17011,7 @@
#>+ 2
KDE_DIST=ssitest.h clientstream_test.h logintest.h ssigrouptest.h Makefile.in userinfotest.h Makefile.am
-@@ -835,7 +838,7 @@
+@@ -836,7 +837,7 @@
logintest.o: logintest.moc
logintest.lo: logintest.moc
ssitest.o: ssitest.moc
@@ -15189,10 +17020,25 @@
+ssitest.lo: ssitest.moc
clientstream_test.lo: clientstream_test.moc
userinfotest.lo: userinfotest.moc
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/oscar/Makefile.in kdenetwork-3.4.1/kopete/protocols/oscar/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/oscar/Makefile.in 2005-05-23 12:09:04.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/oscar/Makefile.in 2005-05-24 13:47:16.000000000 -0400
-@@ -250,6 +250,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/oscar/Makefile.in kdenetwork-3.4.2/kopete/protocols/oscar/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/oscar/Makefile.in 2005-07-20 20:17:01.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/oscar/Makefile.in 2005-08-02 17:20:39.461492704 +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@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libkopete_oscar_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -251,6 +249,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15202,7 +17048,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,7 +457,7 @@
+@@ -455,7 +456,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15211,7 +17057,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -492,9 +495,9 @@
+@@ -493,9 +494,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15223,10 +17069,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/sms/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/sms/icons/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/sms/icons/Makefile.in 2005-05-23 12:09:04.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/sms/icons/Makefile.in 2005-05-24 13:47:17.000000000 -0400
-@@ -188,6 +188,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/sms/icons/Makefile.in kdenetwork-3.4.2/kopete/protocols/sms/icons/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/sms/icons/Makefile.in 2005-07-20 20:17:03.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/sms/icons/Makefile.in 2005-08-02 17:20:39.872430232 +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@
+
+@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15236,7 +17088,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
+@@ -382,7 +385,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -15245,7 +17097,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -420,9 +423,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15257,7 +17109,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -573,21 +576,21 @@
+@@ -574,21 +577,21 @@
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps
$(INSTALL_DATA) $(srcdir)/cr64-app-sms_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/sms_protocol.png
@@ -15285,10 +17137,25 @@
#>+ 15
force-reedit:
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/sms/Makefile.in kdenetwork-3.4.1/kopete/protocols/sms/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/sms/Makefile.in 2005-05-23 12:09:04.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/sms/Makefile.in 2005-05-24 13:47:17.000000000 -0400
-@@ -256,6 +256,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/sms/Makefile.in kdenetwork-3.4.2/kopete/protocols/sms/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/sms/Makefile.in 2005-07-20 20:17:03.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/sms/Makefile.in 2005-08-02 17:20:39.856432664 +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 = $(kopete_sms_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -257,6 +255,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15298,7 +17165,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -471,7 +474,7 @@
+@@ -472,7 +473,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15307,7 +17174,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -509,9 +512,9 @@
+@@ -510,9 +511,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15319,7 +17186,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -936,11 +939,11 @@
+@@ -937,11 +938,11 @@
mocs: smsaddcontactpage.moc
#>+ 3
@@ -15334,7 +17201,7 @@
#>+ 3
smscontact.moc: $(srcdir)/smscontact.h
-@@ -950,15 +953,15 @@
+@@ -951,15 +952,15 @@
mocs: smscontact.moc
#>+ 3
@@ -15354,7 +17221,7 @@
#>+ 2
KDE_DIST=smsuserpreferences.h smscontact.h smsprotocol.h smsaddcontactpage.h serviceloader.h smsservice.h Makefile.in smsaccount.h smseditaccountwidget.h kopete_sms.desktop Makefile.am
-@@ -1009,7 +1012,7 @@
+@@ -1010,7 +1011,7 @@
#>+ 11
@@ -15363,10 +17230,25 @@
@echo 'creating kopete_sms_la.all_cpp.cpp ...'; \
rm -f kopete_sms_la.all_cpp.files kopete_sms_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kopete_sms_la.all_cpp.final; \
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/sms/services/Makefile.in kdenetwork-3.4.1/kopete/protocols/sms/services/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/sms/services/Makefile.in 2005-05-23 12:09:04.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/sms/services/Makefile.in 2005-05-24 13:47:17.000000000 -0400
-@@ -226,6 +226,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/sms/services/Makefile.in kdenetwork-3.4.2/kopete/protocols/sms/services/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/sms/services/Makefile.in 2005-07-20 20:17:03.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/sms/services/Makefile.in 2005-08-02 17:20:39.909424608 +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@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libkopetesmsservices_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -227,6 +225,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15376,7 +17258,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -431,7 +434,7 @@
+@@ -432,7 +433,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15385,7 +17267,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -469,9 +472,9 @@
+@@ -470,9 +471,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15397,10 +17279,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/sms/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/sms/ui/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/sms/ui/Makefile.in 2005-05-23 12:09:04.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/sms/ui/Makefile.in 2005-05-24 13:47:17.000000000 -0400
-@@ -223,6 +223,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/sms/ui/Makefile.in kdenetwork-3.4.2/kopete/protocols/sms/ui/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/sms/ui/Makefile.in 2005-07-20 20:17:03.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/sms/ui/Makefile.in 2005-08-02 17:20:39.931421264 +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@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libkopetesmsui_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -224,6 +222,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15410,7 +17307,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -424,7 +427,7 @@
+@@ -425,7 +426,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15419,7 +17316,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
@@ -15431,10 +17328,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/testbed/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/testbed/icons/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/testbed/icons/Makefile.in 2005-05-23 12:09:04.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/testbed/icons/Makefile.in 2005-05-24 13:47:17.000000000 -0400
-@@ -188,6 +188,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/testbed/icons/Makefile.in kdenetwork-3.4.2/kopete/protocols/testbed/icons/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/testbed/icons/Makefile.in 2005-07-20 20:17:03.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/testbed/icons/Makefile.in 2005-08-02 17:20:39.997411232 +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@
+
+@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15444,7 +17347,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
+@@ -382,7 +385,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -15453,7 +17356,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -420,9 +423,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15465,7 +17368,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -571,23 +574,23 @@
+@@ -572,23 +575,23 @@
#>+ 19
install-kde-icons:
@@ -15498,10 +17401,25 @@
#>+ 15
force-reedit:
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/testbed/Makefile.in kdenetwork-3.4.1/kopete/protocols/testbed/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/testbed/Makefile.in 2005-05-23 12:09:04.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/testbed/Makefile.in 2005-05-24 13:47:17.000000000 -0400
-@@ -260,6 +260,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/testbed/Makefile.in kdenetwork-3.4.2/kopete/protocols/testbed/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/testbed/Makefile.in 2005-07-20 20:17:03.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/testbed/Makefile.in 2005-08-02 17:20:39.972415032 +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 = $(kopete_testbed_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -261,6 +259,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15511,7 +17429,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -466,7 +469,7 @@
+@@ -467,7 +468,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15520,7 +17438,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -504,9 +507,9 @@
+@@ -505,9 +506,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15532,7 +17450,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -916,18 +919,18 @@
+@@ -917,18 +918,18 @@
mocs: testbedprotocol.moc
#>+ 3
@@ -15557,7 +17475,7 @@
#>+ 3
testbedaccount.moc: $(srcdir)/testbedaccount.h
-@@ -952,7 +955,7 @@
+@@ -953,7 +954,7 @@
#>+ 3
clean-metasources:
@@ -15566,7 +17484,7 @@
#>+ 2
KDE_DIST=testbedaddui.ui Makefile.in kopete_testbed.desktop testbedaccountpreferences.ui Makefile.am
-@@ -1052,8 +1055,8 @@
+@@ -1053,8 +1054,8 @@
testbedcontact.lo: testbedcontact.moc
$(srcdir)/testbedincomingmessage.cpp: testbedaddui.h testbedaccountpreferences.h
testbedcontact.o: testbedcontact.moc
@@ -15576,10 +17494,25 @@
testbededitaccountwidget.lo: testbededitaccountwidget.moc
nmcheck:
testbedaccount.lo: testbedaccount.moc
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/winpopup/config/Makefile.in kdenetwork-3.4.1/kopete/protocols/winpopup/config/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/winpopup/config/Makefile.in 2005-05-23 12:09:04.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/winpopup/config/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -237,6 +237,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/winpopup/config/Makefile.in kdenetwork-3.4.2/kopete/protocols/winpopup/config/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/winpopup/config/Makefile.in 2005-07-20 20:17:03.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/winpopup/config/Makefile.in 2005-08-02 17:20:40.057402112 +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_kopete_wp_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -238,6 +236,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15589,7 +17522,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -441,7 +444,7 @@
+@@ -442,7 +443,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15598,7 +17531,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -479,9 +482,9 @@
+@@ -480,9 +481,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15610,10 +17543,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/winpopup/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/winpopup/icons/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/winpopup/icons/Makefile.in 2005-05-23 12:09:04.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/winpopup/icons/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -188,6 +188,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/winpopup/icons/Makefile.in kdenetwork-3.4.2/kopete/protocols/winpopup/icons/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/winpopup/icons/Makefile.in 2005-07-20 20:17:03.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/winpopup/icons/Makefile.in 2005-08-02 17:20:40.082398312 +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@
+
+@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15623,7 +17562,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
+@@ -382,7 +385,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -15632,7 +17571,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -420,9 +423,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15644,7 +17583,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -571,26 +574,26 @@
+@@ -572,26 +575,26 @@
#>+ 22
install-kde-icons:
@@ -15677,10 +17616,25 @@
#>+ 15
force-reedit:
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/winpopup/libwinpopup/Makefile.in kdenetwork-3.4.1/kopete/protocols/winpopup/libwinpopup/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/winpopup/libwinpopup/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/winpopup/libwinpopup/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -220,6 +220,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/winpopup/libwinpopup/Makefile.in kdenetwork-3.4.2/kopete/protocols/winpopup/libwinpopup/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/winpopup/libwinpopup/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/winpopup/libwinpopup/Makefile.in 2005-08-02 17:20:40.103395120 +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@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libwinpopup_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -221,6 +219,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15690,7 +17644,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -419,7 +422,7 @@
+@@ -420,7 +421,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15699,7 +17653,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
@@ -15711,10 +17665,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/winpopup/Makefile.in kdenetwork-3.4.1/kopete/protocols/winpopup/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/winpopup/Makefile.in 2005-05-23 12:09:04.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/winpopup/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -257,6 +257,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/winpopup/Makefile.in kdenetwork-3.4.2/kopete/protocols/winpopup/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/winpopup/Makefile.in 2005-07-20 20:17:03.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/winpopup/Makefile.in 2005-08-02 17:20:40.031406064 +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 = $(kopete_wp_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -258,6 +256,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15724,7 +17693,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -470,7 +473,7 @@
+@@ -471,7 +472,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15733,7 +17702,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -508,9 +511,9 @@
+@@ -509,9 +510,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15745,7 +17714,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -939,13 +942,6 @@
+@@ -940,13 +941,6 @@
mocs: wpaccount.moc
#>+ 3
@@ -15759,7 +17728,7 @@
wpuserinfo.moc: $(srcdir)/wpuserinfo.h
$(MOC) $(srcdir)/wpuserinfo.h -o wpuserinfo.moc
-@@ -953,11 +949,11 @@
+@@ -954,11 +948,11 @@
mocs: wpuserinfo.moc
#>+ 3
@@ -15774,7 +17743,7 @@
#>+ 3
wpprotocol.moc: $(srcdir)/wpprotocol.h
-@@ -967,8 +963,15 @@
+@@ -968,8 +962,15 @@
mocs: wpprotocol.moc
#>+ 3
@@ -15791,7 +17760,7 @@
#>+ 2
KDE_DIST=wpdebug.h wpuserinfo.h wpeditaccount.h winpopup-send.sh wpaddcontact.h wpprotocol.h wpaccount.h kopete_wp.desktop Makefile.in winpopup-install.sh wpcontact.h Makefile.am
-@@ -1019,7 +1022,7 @@
+@@ -1020,7 +1021,7 @@
#>+ 11
@@ -15800,10 +17769,25 @@
@echo 'creating kopete_wp_la.all_cpp.cpp ...'; \
rm -f kopete_wp_la.all_cpp.files kopete_wp_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kopete_wp_la.all_cpp.final; \
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/winpopup/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/winpopup/ui/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/winpopup/ui/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/winpopup/ui/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -223,6 +223,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/winpopup/ui/Makefile.in kdenetwork-3.4.2/kopete/protocols/winpopup/ui/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/winpopup/ui/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/winpopup/ui/Makefile.in 2005-08-02 17:20:40.136390104 +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@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libkopetewpui_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -224,6 +222,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15813,7 +17797,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -425,7 +428,7 @@
+@@ -426,7 +427,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15822,7 +17806,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
@@ -15834,10 +17818,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/yahoo/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/yahoo/icons/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/yahoo/icons/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/yahoo/icons/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -188,6 +188,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/yahoo/icons/Makefile.in kdenetwork-3.4.2/kopete/protocols/yahoo/icons/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/yahoo/icons/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/yahoo/icons/Makefile.in 2005-08-02 17:20:40.214378248 +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@
+
+@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15847,7 +17837,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
+@@ -382,7 +385,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -15856,7 +17846,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -420,9 +423,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15868,7 +17858,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -572,37 +575,37 @@
+@@ -573,37 +576,37 @@
#>+ 34
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
@@ -15920,10 +17910,25 @@
#>+ 15
force-reedit:
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/yahoo/libyahoo2/Makefile.in kdenetwork-3.4.1/kopete/protocols/yahoo/libyahoo2/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/yahoo/libyahoo2/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/yahoo/libyahoo2/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -217,6 +217,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/yahoo/libyahoo2/Makefile.in kdenetwork-3.4.2/kopete/protocols/yahoo/libyahoo2/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/yahoo/libyahoo2/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/yahoo/libyahoo2/Makefile.in 2005-08-02 17:20:40.232375512 +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@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libyahoo2_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -218,6 +216,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15933,7 +17938,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -417,7 +420,7 @@
+@@ -418,7 +419,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -15942,7 +17947,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -455,9 +458,9 @@
+@@ -456,9 +457,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15954,10 +17959,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/yahoo/Makefile.in kdenetwork-3.4.1/kopete/protocols/yahoo/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/yahoo/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/yahoo/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -255,6 +255,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/yahoo/Makefile.in kdenetwork-3.4.2/kopete/protocols/yahoo/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/yahoo/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/yahoo/Makefile.in 2005-08-02 17:20:40.194381288 +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 = $(kopete_yahoo_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -256,6 +254,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15967,7 +17987,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,7 +463,7 @@
+@@ -461,7 +462,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15976,7 +17996,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
@@ -15988,7 +18008,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -910,18 +913,18 @@
+@@ -911,18 +912,18 @@
mocs: yahooprotocol.moc
#>+ 3
@@ -16013,7 +18033,7 @@
#>+ 3
yahooaddcontact.moc: $(srcdir)/yahooaddcontact.h
-@@ -946,7 +949,7 @@
+@@ -947,7 +948,7 @@
#>+ 3
clean-metasources:
@@ -16022,7 +18042,7 @@
#>+ 2
KDE_DIST=yahooconferencemessagemanager.h yahooaccount.h yahooprotocol.h yahoocontact.h yahooaddcontact.h yahooeditaccount.h kopete_yahoo.desktop Makefile.in kyahoo.h Makefile.am
-@@ -997,7 +1000,7 @@
+@@ -998,7 +999,7 @@
#>+ 11
@@ -16031,10 +18051,25 @@
@echo 'creating kopete_yahoo_la.all_cpp.cpp ...'; \
rm -f kopete_yahoo_la.all_cpp.files kopete_yahoo_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kopete_yahoo_la.all_cpp.final; \
-diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/yahoo/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/yahoo/ui/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/yahoo/ui/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/protocols/yahoo/ui/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -223,6 +223,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/protocols/yahoo/ui/Makefile.in kdenetwork-3.4.2/kopete/protocols/yahoo/ui/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/protocols/yahoo/ui/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/protocols/yahoo/ui/Makefile.in 2005-08-02 17:20:40.254372168 +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@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libkopeteyahooui_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -224,6 +222,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16044,7 +18079,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -425,7 +428,7 @@
+@@ -426,7 +427,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16053,7 +18088,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
@@ -16065,10 +18100,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdenetwork-3.4.1.orig/kopete/sounds/Makefile.in kdenetwork-3.4.1/kopete/sounds/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/sounds/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/sounds/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/sounds/Makefile.in kdenetwork-3.4.2/kopete/sounds/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/sounds/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/sounds/Makefile.in 2005-08-02 17:20:40.267370192 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16078,7 +18119,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -391,7 +394,7 @@
+@@ -392,7 +395,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16087,7 +18128,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -429,9 +432,9 @@
+@@ -430,9 +433,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16099,10 +18140,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/Adium/Makefile.in kdenetwork-3.4.1/kopete/styles/data/Adium/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/Adium/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/Adium/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/Adium/Makefile.in kdenetwork-3.4.2/kopete/styles/data/Adium/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/Adium/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/Adium/Makefile.in 2005-08-02 17:20:40.295365936 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16112,7 +18159,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16121,7 +18168,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16133,10 +18180,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/blue/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/blue/From/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/blue/From/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/blue/From/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat/blue/From/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat/blue/From/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat/blue/From/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat/blue/From/Makefile.in 2005-08-02 17:20:40.728300120 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16146,7 +18199,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16155,7 +18208,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16167,10 +18220,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/blue/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/blue/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/blue/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/blue/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -214,6 +214,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat/blue/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat/blue/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat/blue/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat/blue/Makefile.in 2005-08-02 17:20:40.743297840 +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@
+
+@@ -215,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16180,7 +18239,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -410,7 +413,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -16189,7 +18248,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -448,9 +451,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16201,10 +18260,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/blue/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/blue/To/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/blue/To/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/blue/To/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat/blue/To/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat/blue/To/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat/blue/To/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat/blue/To/Makefile.in 2005-08-02 17:20:40.756295864 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16214,7 +18279,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16223,7 +18288,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16235,10 +18300,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/clear/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/clear/From/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/clear/From/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/clear/From/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat/clear/From/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat/clear/From/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat/clear/From/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat/clear/From/Makefile.in 2005-08-02 17:20:40.777292672 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16248,7 +18319,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16257,7 +18328,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16269,10 +18340,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/clear/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/clear/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/clear/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/clear/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -214,6 +214,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat/clear/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat/clear/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat/clear/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat/clear/Makefile.in 2005-08-02 17:20:40.792290392 +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@
+
+@@ -215,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16282,7 +18359,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -410,7 +413,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -16291,7 +18368,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -448,9 +451,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16303,10 +18380,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/clear/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/clear/To/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/clear/To/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/clear/To/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat/clear/To/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat/clear/To/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat/clear/To/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat/clear/To/Makefile.in 2005-08-02 17:20:40.805288416 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16316,7 +18399,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16325,7 +18408,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16337,10 +18420,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/graphite/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/graphite/From/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/graphite/From/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/graphite/From/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat/graphite/From/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat/graphite/From/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat/graphite/From/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat/graphite/From/Makefile.in 2005-08-02 17:20:40.819286288 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16350,7 +18439,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16359,7 +18448,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16371,10 +18460,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/graphite/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/graphite/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/graphite/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/graphite/Makefile.in 2005-05-24 13:47:19.000000000 -0400
-@@ -214,6 +214,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat/graphite/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat/graphite/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat/graphite/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat/graphite/Makefile.in 2005-08-02 17:20:40.847282032 +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@
+
+@@ -215,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16384,7 +18479,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -410,7 +413,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -16393,7 +18488,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -448,9 +451,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16405,10 +18500,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/graphite/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/graphite/To/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/graphite/To/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/graphite/To/Makefile.in 2005-05-24 13:47:19.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat/graphite/To/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat/graphite/To/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat/graphite/To/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat/graphite/To/Makefile.in 2005-08-02 17:20:40.861279904 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16418,7 +18519,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16427,7 +18528,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16439,10 +18540,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/green/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/green/From/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/green/From/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/green/From/Makefile.in 2005-05-24 13:47:19.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat/green/From/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat/green/From/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat/green/From/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat/green/From/Makefile.in 2005-08-02 17:20:40.874277928 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16452,7 +18559,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16461,7 +18568,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16473,10 +18580,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/green/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/green/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/green/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/green/Makefile.in 2005-05-24 13:47:19.000000000 -0400
-@@ -214,6 +214,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat/green/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat/green/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat/green/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat/green/Makefile.in 2005-08-02 17:20:40.889275648 +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@
+
+@@ -215,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16486,7 +18599,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -410,7 +413,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -16495,7 +18608,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -448,9 +451,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16507,10 +18620,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/green/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/green/To/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/green/To/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/green/To/Makefile.in 2005-05-24 13:47:19.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat/green/To/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat/green/To/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat/green/To/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat/green/To/Makefile.in 2005-08-02 17:20:40.903273520 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16520,7 +18639,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16529,7 +18648,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16541,10 +18660,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -204,6 +204,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat/Makefile.in 2005-08-02 17:20:40.715302096 +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@
+
+@@ -205,6 +205,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16554,7 +18679,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
+@@ -397,7 +400,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -16563,7 +18688,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -435,9 +438,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16575,10 +18700,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/orange/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/orange/From/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/orange/From/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/orange/From/Makefile.in 2005-05-24 13:47:19.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat/orange/From/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat/orange/From/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat/orange/From/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat/orange/From/Makefile.in 2005-08-02 17:20:40.925270176 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16588,7 +18719,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16597,7 +18728,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16609,10 +18740,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/orange/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/orange/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/orange/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/orange/Makefile.in 2005-05-24 13:47:19.000000000 -0400
-@@ -214,6 +214,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat/orange/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat/orange/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat/orange/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat/orange/Makefile.in 2005-08-02 17:20:40.944267288 +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@
+
+@@ -215,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16622,7 +18759,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -410,7 +413,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -16631,7 +18768,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -448,9 +451,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16643,10 +18780,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/orange/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/orange/To/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/orange/To/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/orange/To/Makefile.in 2005-05-24 13:47:19.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat/orange/To/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat/orange/To/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat/orange/To/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat/orange/To/Makefile.in 2005-08-02 17:20:40.958265160 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16656,7 +18799,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16665,7 +18808,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16677,10 +18820,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/pink/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/pink/From/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/pink/From/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/pink/From/Makefile.in 2005-05-24 13:47:19.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat/pink/From/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat/pink/From/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat/pink/From/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat/pink/From/Makefile.in 2005-08-02 17:20:40.972263032 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16690,7 +18839,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16699,7 +18848,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16711,10 +18860,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/pink/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/pink/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/pink/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/pink/Makefile.in 2005-05-24 13:47:19.000000000 -0400
-@@ -214,6 +214,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat/pink/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat/pink/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat/pink/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat/pink/Makefile.in 2005-08-02 17:20:40.986260904 +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@
+
+@@ -215,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16724,7 +18879,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -410,7 +413,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -16733,7 +18888,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -448,9 +451,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16745,10 +18900,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/pink/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/pink/To/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/pink/To/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/pink/To/Makefile.in 2005-05-24 13:47:19.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat/pink/To/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat/pink/To/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat/pink/To/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat/pink/To/Makefile.in 2005-08-02 17:20:41.008257560 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16758,7 +18919,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16767,7 +18928,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16779,10 +18940,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/purple/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/purple/From/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/purple/From/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/purple/From/Makefile.in 2005-05-24 13:47:19.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat/purple/From/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat/purple/From/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat/purple/From/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat/purple/From/Makefile.in 2005-08-02 17:20:41.021255584 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16792,7 +18959,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16801,7 +18968,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16813,10 +18980,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/purple/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/purple/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/purple/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/purple/Makefile.in 2005-05-24 13:47:19.000000000 -0400
-@@ -214,6 +214,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat/purple/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat/purple/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat/purple/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat/purple/Makefile.in 2005-08-02 17:20:41.037253152 +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@
+
+@@ -215,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16826,7 +18999,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -410,7 +413,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -16835,7 +19008,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -448,9 +451,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16847,10 +19020,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/purple/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/purple/To/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/purple/To/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/purple/To/Makefile.in 2005-05-24 13:47:19.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat/purple/To/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat/purple/To/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat/purple/To/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat/purple/To/Makefile.in 2005-08-02 17:20:41.050251176 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16860,7 +19039,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16869,7 +19048,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16881,10 +19060,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/yellow/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/yellow/From/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/yellow/From/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/yellow/From/Makefile.in 2005-05-24 13:47:19.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat/yellow/From/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat/yellow/From/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat/yellow/From/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat/yellow/From/Makefile.in 2005-08-02 17:20:41.064249048 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16894,7 +19079,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16903,7 +19088,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16915,10 +19100,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/yellow/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/yellow/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/yellow/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/yellow/Makefile.in 2005-05-24 13:47:19.000000000 -0400
-@@ -214,6 +214,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat/yellow/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat/yellow/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat/yellow/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat/yellow/Makefile.in 2005-08-02 17:20:41.079246768 +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@
+
+@@ -215,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16928,7 +19119,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -410,7 +413,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -16937,7 +19128,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -448,9 +451,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16949,10 +19140,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/yellow/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/yellow/To/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/yellow/To/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/yellow/To/Makefile.in 2005-05-24 13:47:19.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat/yellow/To/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat/yellow/To/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat/yellow/To/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat/yellow/To/Makefile.in 2005-08-02 17:20:41.101243424 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16962,7 +19159,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16971,7 +19168,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16983,10 +19180,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/blue/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/blue/From/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/blue/From/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/blue/From/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/blue/From/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/blue/From/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/blue/From/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/blue/From/Makefile.in 2005-08-02 17:20:40.345358336 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16996,7 +19199,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17005,7 +19208,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17017,10 +19220,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/blue/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/blue/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/blue/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/blue/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -214,6 +214,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/blue/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/blue/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/blue/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/blue/Makefile.in 2005-08-02 17:20:40.361355904 +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@
+
+@@ -215,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17030,7 +19239,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -410,7 +413,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -17039,7 +19248,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -448,9 +451,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17051,10 +19260,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/blue/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/blue/To/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/blue/To/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/blue/To/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/blue/To/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/blue/To/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/blue/To/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/blue/To/Makefile.in 2005-08-02 17:20:40.374353928 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17064,7 +19279,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17073,7 +19288,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17085,10 +19300,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/clear/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/clear/From/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/clear/From/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/clear/From/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/clear/From/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/clear/From/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/clear/From/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/clear/From/Makefile.in 2005-08-02 17:20:40.387351952 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17098,7 +19319,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17107,7 +19328,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17119,10 +19340,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/clear/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/clear/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/clear/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/clear/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -214,6 +214,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/clear/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/clear/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/clear/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/clear/Makefile.in 2005-08-02 17:20:40.411348304 +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@
+
+@@ -215,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17132,7 +19359,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -410,7 +413,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -17141,7 +19368,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -448,9 +451,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17153,10 +19380,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/clear/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/clear/To/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/clear/To/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/clear/To/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/clear/To/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/clear/To/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/clear/To/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/clear/To/Makefile.in 2005-08-02 17:20:40.424346328 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17166,7 +19399,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17175,7 +19408,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17187,10 +19420,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/graphite/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/graphite/From/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/graphite/From/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/graphite/From/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/graphite/From/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/graphite/From/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/graphite/From/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/graphite/From/Makefile.in 2005-08-02 17:20:40.438344200 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17200,7 +19439,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17209,7 +19448,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17221,10 +19460,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/graphite/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/graphite/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/graphite/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/graphite/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -214,6 +214,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/graphite/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/graphite/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/graphite/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/graphite/Makefile.in 2005-08-02 17:20:40.454341768 +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@
+
+@@ -215,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17234,7 +19479,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -410,7 +413,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -17243,7 +19488,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -448,9 +451,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17255,10 +19500,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/graphite/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/graphite/To/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/graphite/To/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/graphite/To/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/graphite/To/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/graphite/To/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/graphite/To/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/graphite/To/Makefile.in 2005-08-02 17:20:40.467339792 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17268,7 +19519,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17277,7 +19528,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17289,10 +19540,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/green/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/green/From/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/green/From/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/green/From/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/green/From/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/green/From/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/green/From/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/green/From/Makefile.in 2005-08-02 17:20:40.480337816 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17302,7 +19559,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17311,7 +19568,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17323,10 +19580,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/green/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/green/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/green/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/green/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -214,6 +214,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/green/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/green/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/green/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/green/Makefile.in 2005-08-02 17:20:40.504334168 +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@
+
+@@ -215,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17336,7 +19599,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -410,7 +413,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -17345,7 +19608,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -448,9 +451,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17357,10 +19620,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/green/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/green/To/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/green/To/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/green/To/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/green/To/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/green/To/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/green/To/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/green/To/Makefile.in 2005-08-02 17:20:40.517332192 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17370,7 +19639,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17379,7 +19648,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17391,10 +19660,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -204,6 +204,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/Makefile.in 2005-08-02 17:20:40.332360312 +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@
+
+@@ -205,6 +205,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17404,7 +19679,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
+@@ -397,7 +400,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -17413,7 +19688,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -435,9 +438,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17425,10 +19700,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/orange/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/orange/From/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/orange/From/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/orange/From/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/orange/From/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/orange/From/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/orange/From/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/orange/From/Makefile.in 2005-08-02 17:20:40.530330216 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17438,7 +19719,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17447,7 +19728,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17459,10 +19740,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/orange/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/orange/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/orange/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/orange/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -214,6 +214,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/orange/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/orange/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/orange/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/orange/Makefile.in 2005-08-02 17:20:40.546327784 +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@
+
+@@ -215,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17472,7 +19759,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -410,7 +413,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -17481,7 +19768,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -448,9 +451,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17493,10 +19780,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/orange/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/orange/To/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/orange/To/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/orange/To/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/orange/To/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/orange/To/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/orange/To/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/orange/To/Makefile.in 2005-08-02 17:20:40.560325656 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17506,7 +19799,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17515,7 +19808,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17527,10 +19820,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/pink/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/pink/From/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/pink/From/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/pink/From/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/pink/From/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/pink/From/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/pink/From/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/pink/From/Makefile.in 2005-08-02 17:20:40.573323680 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17540,7 +19839,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17549,7 +19848,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17561,10 +19860,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/pink/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/pink/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/pink/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/pink/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -214,6 +214,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/pink/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/pink/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/pink/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/pink/Makefile.in 2005-08-02 17:20:40.596320184 +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@
+
+@@ -215,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17574,7 +19879,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -410,7 +413,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -17583,7 +19888,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -448,9 +451,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17595,10 +19900,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/pink/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/pink/To/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/pink/To/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/pink/To/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/pink/To/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/pink/To/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/pink/To/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/pink/To/Makefile.in 2005-08-02 17:20:40.610318056 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17608,7 +19919,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17617,7 +19928,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17629,10 +19940,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/purple/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/purple/From/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/purple/From/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/purple/From/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/purple/From/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/purple/From/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/purple/From/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/purple/From/Makefile.in 2005-08-02 17:20:40.623316080 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17642,7 +19959,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17651,7 +19968,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17663,10 +19980,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/purple/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/purple/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/purple/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/purple/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -214,6 +214,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/purple/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/purple/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/purple/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/purple/Makefile.in 2005-08-02 17:20:40.638313800 +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@
+
+@@ -215,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17676,7 +19999,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -410,7 +413,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -17685,7 +20008,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -448,9 +451,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17697,10 +20020,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/purple/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/purple/To/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/purple/To/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/purple/To/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/purple/To/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/purple/To/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/purple/To/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/purple/To/Makefile.in 2005-08-02 17:20:40.651311824 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17710,7 +20039,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17719,7 +20048,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17731,10 +20060,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/yellow/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/yellow/From/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/yellow/From/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/yellow/From/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/yellow/From/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/yellow/From/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/yellow/From/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/yellow/From/Makefile.in 2005-08-02 17:20:40.664309848 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17744,7 +20079,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17753,7 +20088,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17765,10 +20100,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/yellow/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/yellow/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/yellow/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/yellow/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -214,6 +214,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/yellow/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/yellow/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/yellow/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/yellow/Makefile.in 2005-08-02 17:20:40.687306352 +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@
+
+@@ -215,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17778,7 +20119,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -410,7 +413,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -17787,7 +20128,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -448,9 +451,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17799,10 +20140,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/yellow/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/yellow/To/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/yellow/To/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/yellow/To/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/yellow/To/Makefile.in kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/yellow/To/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/iChat-Trans/yellow/To/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/iChat-Trans/yellow/To/Makefile.in 2005-08-02 17:20:40.700304376 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17812,7 +20159,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17821,7 +20168,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17833,10 +20180,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/Makefile.in kdenetwork-3.4.1/kopete/styles/data/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/data/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -204,6 +204,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/data/Makefile.in kdenetwork-3.4.2/kopete/styles/data/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/data/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/data/Makefile.in 2005-08-02 17:20:40.318362440 +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@
+
+@@ -205,6 +205,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17846,7 +20199,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
+@@ -397,7 +400,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -17855,7 +20208,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -435,9 +438,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17867,10 +20220,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kopete/styles/Makefile.in kdenetwork-3.4.1/kopete/styles/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/Makefile.in 2005-05-23 12:09:05.000000000 -0400
-+++ kdenetwork-3.4.1/kopete/styles/Makefile.in 2005-05-24 13:47:18.000000000 -0400
-@@ -214,6 +214,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kopete/styles/Makefile.in kdenetwork-3.4.2/kopete/styles/Makefile.in
+--- kdenetwork-3.4.2.orig/kopete/styles/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kopete/styles/Makefile.in 2005-08-02 17:20:40.282367912 +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@
+
+@@ -215,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17880,7 +20239,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -420,7 +423,7 @@
+@@ -421,7 +424,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -17889,7 +20248,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -458,9 +461,9 @@
+@@ -459,9 +462,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17901,10 +20260,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kpf/Makefile.in kdenetwork-3.4.1/kpf/Makefile.in
---- kdenetwork-3.4.1.orig/kpf/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kpf/Makefile.in 2005-05-24 13:47:19.000000000 -0400
-@@ -216,6 +216,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kpf/Makefile.in kdenetwork-3.4.2/kpf/Makefile.in
+--- kdenetwork-3.4.2.orig/kpf/Makefile.in 2005-07-20 20:17:04.000000000 +0000
++++ kdenetwork-3.4.2/kpf/Makefile.in 2005-08-02 17:20:41.131238864 +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@
+
+@@ -217,6 +217,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17914,7 +20279,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -414,7 +417,7 @@
+@@ -415,7 +418,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -17923,7 +20288,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -452,9 +455,9 @@
+@@ -453,9 +456,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17935,7 +20300,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -792,17 +795,17 @@
+@@ -793,17 +796,17 @@
#>+ 13
install-kde-icons:
@@ -17959,10 +20324,25 @@
#>+ 15
force-reedit:
-diff -Nru kdenetwork-3.4.1.orig/kpf/src/Makefile.in kdenetwork-3.4.1/kpf/src/Makefile.in
---- kdenetwork-3.4.1.orig/kpf/src/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kpf/src/Makefile.in 2005-05-24 13:47:19.000000000 -0400
-@@ -263,6 +263,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kpf/src/Makefile.in kdenetwork-3.4.2/kpf/src/Makefile.in
+--- kdenetwork-3.4.2.orig/kpf/src/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kpf/src/Makefile.in 2005-08-02 17:20:41.245221536 +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 = $(kpf_panelapplet_la_SOURCES) $(kpfpropertiesdialog_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -264,6 +262,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17972,7 +20352,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -575,7 +578,7 @@
+@@ -576,7 +577,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17981,7 +20361,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -613,9 +616,9 @@
+@@ -614,9 +615,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17993,7 +20373,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -931,13 +934,6 @@
+@@ -932,13 +933,6 @@
#>+ 3
@@ -18007,7 +20387,7 @@
Server.moc: $(srcdir)/Server.h
$(MOC) $(srcdir)/Server.h -o Server.moc
-@@ -966,81 +962,88 @@
+@@ -967,81 +961,88 @@
mocs: Applet.moc
#>+ 3
@@ -18129,7 +20509,7 @@
#>+ 3
WebServerManager_stub.h: WebServerManager.kidl
-@@ -1057,7 +1060,7 @@
+@@ -1058,7 +1059,7 @@
#>+ 3
clean-metasources:
@@ -18138,7 +20518,7 @@
#>+ 2
KDE_DIST=Defines.h KPFInterface.h System.h Makefile.in KPFInterface.cpp Makefile.am
-@@ -1117,7 +1120,7 @@
+@@ -1118,7 +1119,7 @@
#>+ 11
@@ -18147,7 +20527,7 @@
@echo 'creating kpf_panelapplet_la.all_cpp.cpp ...'; \
rm -f kpf_panelapplet_la.all_cpp.files kpf_panelapplet_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kpf_panelapplet_la.all_cpp.final; \
-@@ -1129,7 +1132,7 @@
+@@ -1130,7 +1131,7 @@
rm -f kpf_panelapplet_la.all_cpp.final kpf_panelapplet_la.all_cpp.files
#>+ 11
@@ -18156,7 +20536,7 @@
@echo 'creating kpfpropertiesdialog_la.all_cpp.cpp ...'; \
rm -f kpfpropertiesdialog_la.all_cpp.files kpfpropertiesdialog_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kpfpropertiesdialog_la.all_cpp.final; \
-@@ -1177,8 +1180,8 @@
+@@ -1178,8 +1179,8 @@
$(srcdir)/ActiveMonitorItem.cpp: WebServer_stub.h
ActiveMonitor.o: ActiveMonitor.moc
SingleServerConfigDialog.lo: SingleServerConfigDialog.moc
@@ -18166,10 +20546,16 @@
nmcheck-am: nmcheck
BandwidthGraph.o: BandwidthGraph.moc
$(srcdir)/PortValidator.cpp: WebServer_stub.h
-diff -Nru kdenetwork-3.4.1.orig/kppp/DB/Makefile.in kdenetwork-3.4.1/kppp/DB/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/DB/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/DB/Makefile.in 2005-05-24 13:47:19.000000000 -0400
-@@ -204,6 +204,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/DB/Makefile.in kdenetwork-3.4.2/kppp/DB/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/DB/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/DB/Makefile.in 2005-08-02 17:20:41.259219408 +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@
+
+@@ -205,6 +205,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18179,7 +20565,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -397,7 +400,7 @@
+@@ -398,7 +401,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -18188,7 +20574,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -435,9 +438,9 @@
+@@ -436,9 +439,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18200,10 +20586,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/DB/Provider/Austria/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Austria/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/DB/Provider/Austria/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/DB/Provider/Austria/Makefile.in 2005-05-24 13:47:19.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/DB/Provider/Austria/Makefile.in kdenetwork-3.4.2/kppp/DB/Provider/Austria/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/DB/Provider/Austria/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/DB/Provider/Austria/Makefile.in 2005-08-02 17:20:41.272217432 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18213,7 +20605,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18222,7 +20614,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18234,10 +20626,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/DB/Provider/Belarus/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Belarus/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/DB/Provider/Belarus/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/DB/Provider/Belarus/Makefile.in 2005-05-24 13:47:19.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/DB/Provider/Belarus/Makefile.in kdenetwork-3.4.2/kppp/DB/Provider/Belarus/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/DB/Provider/Belarus/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/DB/Provider/Belarus/Makefile.in 2005-08-02 17:20:41.292214392 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18247,7 +20645,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18256,7 +20654,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18268,10 +20666,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/DB/Provider/Czech_Republic/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Czech_Republic/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/DB/Provider/Czech_Republic/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/DB/Provider/Czech_Republic/Makefile.in 2005-05-24 13:47:19.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/DB/Provider/Czech_Republic/Makefile.in kdenetwork-3.4.2/kppp/DB/Provider/Czech_Republic/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/DB/Provider/Czech_Republic/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/DB/Provider/Czech_Republic/Makefile.in 2005-08-02 17:20:41.307212112 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18281,7 +20685,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -406,7 +409,7 @@
+@@ -407,7 +410,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18290,7 +20694,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -444,9 +447,9 @@
+@@ -445,9 +448,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18302,7 +20706,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -605,7 +608,7 @@
+@@ -606,7 +609,7 @@
.NOEXPORT:
#>+ 2
@@ -18311,10 +20715,16 @@
#>+ 2
docs-am:
-diff -Nru kdenetwork-3.4.1.orig/kppp/DB/Provider/Denmark/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Denmark/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/DB/Provider/Denmark/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/DB/Provider/Denmark/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/DB/Provider/Denmark/Makefile.in kdenetwork-3.4.2/kppp/DB/Provider/Denmark/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/DB/Provider/Denmark/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/DB/Provider/Denmark/Makefile.in 2005-08-02 17:20:41.320210136 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18324,7 +20734,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18333,7 +20743,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18345,10 +20755,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/DB/Provider/France/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/France/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/DB/Provider/France/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/DB/Provider/France/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/DB/Provider/France/Makefile.in kdenetwork-3.4.2/kppp/DB/Provider/France/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/DB/Provider/France/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/DB/Provider/France/Makefile.in 2005-08-02 17:20:41.333208160 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18358,7 +20774,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18367,7 +20783,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18379,10 +20795,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/DB/Provider/Germany/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Germany/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/DB/Provider/Germany/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/DB/Provider/Germany/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/DB/Provider/Germany/Makefile.in kdenetwork-3.4.2/kppp/DB/Provider/Germany/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/DB/Provider/Germany/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/DB/Provider/Germany/Makefile.in 2005-08-02 17:20:41.346206184 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18392,7 +20814,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -395,7 +398,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18401,7 +20823,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -433,9 +436,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18413,10 +20835,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/DB/Provider/Ireland/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Ireland/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/DB/Provider/Ireland/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/DB/Provider/Ireland/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/DB/Provider/Ireland/Makefile.in kdenetwork-3.4.2/kppp/DB/Provider/Ireland/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/DB/Provider/Ireland/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/DB/Provider/Ireland/Makefile.in 2005-08-02 17:20:41.358204360 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18426,7 +20854,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18435,7 +20863,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18447,10 +20875,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/DB/Provider/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/DB/Provider/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/DB/Provider/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -204,6 +204,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/DB/Provider/Makefile.in kdenetwork-3.4.2/kppp/DB/Provider/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/DB/Provider/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/DB/Provider/Makefile.in 2005-08-02 17:20:41.381200864 +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@
+
+@@ -205,6 +205,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18460,7 +20894,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -399,7 +402,7 @@
+@@ -400,7 +403,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -18469,7 +20903,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -437,9 +440,9 @@
+@@ -438,9 +441,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18481,10 +20915,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/DB/Provider/Netherlands/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Netherlands/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/DB/Provider/Netherlands/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/DB/Provider/Netherlands/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/DB/Provider/Netherlands/Makefile.in kdenetwork-3.4.2/kppp/DB/Provider/Netherlands/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/DB/Provider/Netherlands/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/DB/Provider/Netherlands/Makefile.in 2005-08-02 17:20:41.398198280 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18494,7 +20934,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -456,7 +459,7 @@
+@@ -457,7 +460,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18503,7 +20943,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -494,9 +497,9 @@
+@@ -495,9 +498,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18515,7 +20955,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -655,7 +658,7 @@
+@@ -656,7 +659,7 @@
.NOEXPORT:
#>+ 2
@@ -18524,10 +20964,16 @@
#>+ 2
docs-am:
-diff -Nru kdenetwork-3.4.1.orig/kppp/DB/Provider/New_Zealand/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/New_Zealand/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/DB/Provider/New_Zealand/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/DB/Provider/New_Zealand/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/DB/Provider/New_Zealand/Makefile.in kdenetwork-3.4.2/kppp/DB/Provider/New_Zealand/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/DB/Provider/New_Zealand/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/DB/Provider/New_Zealand/Makefile.in 2005-08-02 17:20:41.411196304 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18537,7 +20983,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18546,7 +20992,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18558,7 +21004,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -591,7 +594,7 @@
+@@ -592,7 +595,7 @@
.NOEXPORT:
#>+ 2
@@ -18567,10 +21013,16 @@
#>+ 2
docs-am:
-diff -Nru kdenetwork-3.4.1.orig/kppp/DB/Provider/Norway/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Norway/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/DB/Provider/Norway/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/DB/Provider/Norway/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/DB/Provider/Norway/Makefile.in kdenetwork-3.4.2/kppp/DB/Provider/Norway/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/DB/Provider/Norway/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/DB/Provider/Norway/Makefile.in 2005-08-02 17:20:41.425194176 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18580,7 +21032,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18589,7 +21041,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18601,10 +21053,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/DB/Provider/Portugal/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Portugal/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/DB/Provider/Portugal/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/DB/Provider/Portugal/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/DB/Provider/Portugal/Makefile.in kdenetwork-3.4.2/kppp/DB/Provider/Portugal/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/DB/Provider/Portugal/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/DB/Provider/Portugal/Makefile.in 2005-08-02 17:20:41.439192048 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18614,7 +21072,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18623,7 +21081,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18635,10 +21093,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/DB/Provider/Slovenia/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Slovenia/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/DB/Provider/Slovenia/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/DB/Provider/Slovenia/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/DB/Provider/Slovenia/Makefile.in kdenetwork-3.4.2/kppp/DB/Provider/Slovenia/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/DB/Provider/Slovenia/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/DB/Provider/Slovenia/Makefile.in 2005-08-02 17:20:41.452190072 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18648,7 +21112,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18657,7 +21121,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18669,7 +21133,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -591,7 +594,7 @@
+@@ -592,7 +595,7 @@
.NOEXPORT:
#>+ 2
@@ -18678,10 +21142,16 @@
#>+ 2
docs-am:
-diff -Nru kdenetwork-3.4.1.orig/kppp/DB/Provider/Sweden/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Sweden/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/DB/Provider/Sweden/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/DB/Provider/Sweden/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/DB/Provider/Sweden/Makefile.in kdenetwork-3.4.2/kppp/DB/Provider/Sweden/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/DB/Provider/Sweden/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/DB/Provider/Sweden/Makefile.in 2005-08-02 17:20:41.465188096 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18691,7 +21161,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18700,7 +21170,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18712,10 +21182,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/DB/Provider/Switzerland/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Switzerland/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/DB/Provider/Switzerland/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/DB/Provider/Switzerland/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/DB/Provider/Switzerland/Makefile.in kdenetwork-3.4.2/kppp/DB/Provider/Switzerland/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/DB/Provider/Switzerland/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/DB/Provider/Switzerland/Makefile.in 2005-08-02 17:20:41.478186120 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18725,7 +21201,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18734,7 +21210,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18746,10 +21222,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/DB/Provider/Taiwan/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Taiwan/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/DB/Provider/Taiwan/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/DB/Provider/Taiwan/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/DB/Provider/Taiwan/Makefile.in kdenetwork-3.4.2/kppp/DB/Provider/Taiwan/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/DB/Provider/Taiwan/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/DB/Provider/Taiwan/Makefile.in 2005-08-02 17:20:41.491184144 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18759,7 +21241,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18768,7 +21250,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18780,10 +21262,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/DB/Provider/Ukraine/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Ukraine/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/DB/Provider/Ukraine/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/DB/Provider/Ukraine/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/DB/Provider/Ukraine/Makefile.in kdenetwork-3.4.2/kppp/DB/Provider/Ukraine/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/DB/Provider/Ukraine/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/DB/Provider/Ukraine/Makefile.in 2005-08-02 17:20:41.504182168 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18793,7 +21281,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18802,7 +21290,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18814,10 +21302,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/DB/Provider/United_Kingdom/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/United_Kingdom/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/DB/Provider/United_Kingdom/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/DB/Provider/United_Kingdom/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/DB/Provider/United_Kingdom/Makefile.in kdenetwork-3.4.2/kppp/DB/Provider/United_Kingdom/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/DB/Provider/United_Kingdom/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/DB/Provider/United_Kingdom/Makefile.in 2005-08-02 17:20:41.525178976 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18827,7 +21321,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
+@@ -397,7 +400,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18836,7 +21330,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -435,9 +438,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18848,10 +21342,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/DB/Provider/Yugoslavia/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Yugoslavia/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/DB/Provider/Yugoslavia/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/DB/Provider/Yugoslavia/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/DB/Provider/Yugoslavia/Makefile.in kdenetwork-3.4.2/kppp/DB/Provider/Yugoslavia/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/DB/Provider/Yugoslavia/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/DB/Provider/Yugoslavia/Makefile.in 2005-08-02 17:20:41.540176696 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18861,7 +21361,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -401,7 +404,7 @@
+@@ -402,7 +405,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18870,7 +21370,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -439,9 +442,9 @@
+@@ -440,9 +443,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18882,7 +21382,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -600,7 +603,7 @@
+@@ -601,7 +604,7 @@
.NOEXPORT:
#>+ 2
@@ -18891,10 +21391,16 @@
#>+ 2
docs-am:
-diff -Nru kdenetwork-3.4.1.orig/kppp/icons/Makefile.in kdenetwork-3.4.1/kppp/icons/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/icons/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/icons/Makefile.in 2005-05-24 13:47:22.000000000 -0400
-@@ -188,6 +188,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/icons/Makefile.in kdenetwork-3.4.2/kppp/icons/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/icons/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/icons/Makefile.in 2005-08-02 17:20:42.532025912 +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@
+
+@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18904,7 +21410,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -380,7 +383,7 @@
+@@ -381,7 +384,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18913,7 +21419,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -418,9 +421,9 @@
+@@ -419,9 +422,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18925,7 +21431,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -570,23 +573,23 @@
+@@ -571,23 +574,23 @@
#>+ 19
install-kde-icons:
@@ -18958,10 +21464,25 @@
#>+ 15
force-reedit:
-diff -Nru kdenetwork-3.4.1.orig/kppp/logview/Makefile.in kdenetwork-3.4.1/kppp/logview/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/logview/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/logview/Makefile.in 2005-05-24 13:47:22.000000000 -0400
-@@ -254,6 +254,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/logview/Makefile.in kdenetwork-3.4.2/kppp/logview/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/logview/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/logview/Makefile.in 2005-08-02 17:20:42.565020896 +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@
+
+@@ -30,8 +30,6 @@
+
+
+
+-SOURCES = $(kppplogview_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -255,6 +253,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18971,7 +21492,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -468,7 +471,7 @@
+@@ -469,7 +470,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18980,7 +21501,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
@@ -18992,10 +21513,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdenetwork-3.4.1.orig/kppp/Makefile.in kdenetwork-3.4.1/kppp/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -277,6 +277,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Makefile.in kdenetwork-3.4.2/kppp/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Makefile.in 2005-08-02 17:20:41.706151464 +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@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(kppp_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -278,6 +276,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19005,7 +21541,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -620,7 +623,7 @@
+@@ -621,7 +622,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19014,7 +21550,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -658,9 +661,9 @@
+@@ -659,9 +660,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19026,10 +21562,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdenetwork-3.4.1.orig/kppp/pixmaps/Makefile.in kdenetwork-3.4.1/kppp/pixmaps/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/pixmaps/Makefile.in 2005-05-23 12:09:07.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/pixmaps/Makefile.in 2005-05-24 13:47:22.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/pixmaps/Makefile.in kdenetwork-3.4.2/kppp/pixmaps/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/pixmaps/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/pixmaps/Makefile.in 2005-08-02 17:20:42.589017248 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19039,7 +21581,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -398,7 +401,7 @@
+@@ -399,7 +402,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19048,7 +21590,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -436,9 +439,9 @@
+@@ -437,9 +440,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19060,10 +21602,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Argentina/Makefile.in kdenetwork-3.4.1/kppp/Rules/Argentina/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Argentina/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Argentina/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Argentina/Makefile.in kdenetwork-3.4.2/kppp/Rules/Argentina/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Argentina/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Argentina/Makefile.in 2005-08-02 17:20:41.719149488 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19073,7 +21621,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19082,7 +21630,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19094,10 +21642,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Australia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Australia/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Australia/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Australia/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Australia/Makefile.in kdenetwork-3.4.2/kppp/Rules/Australia/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Australia/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Australia/Makefile.in 2005-08-02 17:20:41.731147664 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19107,7 +21661,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -398,7 +401,7 @@
+@@ -399,7 +402,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19116,7 +21670,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -436,9 +439,9 @@
+@@ -437,9 +440,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19128,10 +21682,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Austria/Business_1/Makefile.in kdenetwork-3.4.1/kppp/Rules/Austria/Business_1/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Austria/Business_1/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Austria/Business_1/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Austria/Business_1/Makefile.in kdenetwork-3.4.2/kppp/Rules/Austria/Business_1/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Austria/Business_1/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Austria/Business_1/Makefile.in 2005-08-02 17:20:41.745145536 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19141,7 +21701,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -395,7 +398,7 @@
+@@ -396,7 +399,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19150,7 +21710,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -433,9 +436,9 @@
+@@ -434,9 +437,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19162,10 +21722,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Austria/Business_2/Makefile.in kdenetwork-3.4.1/kppp/Rules/Austria/Business_2/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Austria/Business_2/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Austria/Business_2/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Austria/Business_2/Makefile.in kdenetwork-3.4.2/kppp/Rules/Austria/Business_2/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Austria/Business_2/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Austria/Business_2/Makefile.in 2005-08-02 17:20:41.757143712 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19175,7 +21741,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -395,7 +398,7 @@
+@@ -396,7 +399,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19184,7 +21750,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -433,9 +436,9 @@
+@@ -434,9 +437,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19196,10 +21762,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Austria/Makefile.in kdenetwork-3.4.1/kppp/Rules/Austria/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Austria/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Austria/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -204,6 +204,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Austria/Makefile.in kdenetwork-3.4.2/kppp/Rules/Austria/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Austria/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Austria/Makefile.in 2005-08-02 17:20:41.772141432 +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@
+
+@@ -205,6 +205,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19209,7 +21781,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -400,7 +403,7 @@
+@@ -401,7 +404,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -19218,7 +21790,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -438,9 +441,9 @@
+@@ -439,9 +442,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19230,10 +21802,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Austria/Minimum/Makefile.in kdenetwork-3.4.1/kppp/Rules/Austria/Minimum/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Austria/Minimum/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Austria/Minimum/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Austria/Minimum/Makefile.in kdenetwork-3.4.2/kppp/Rules/Austria/Minimum/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Austria/Minimum/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Austria/Minimum/Makefile.in 2005-08-02 17:20:41.784139608 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19243,7 +21821,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -395,7 +398,7 @@
+@@ -396,7 +399,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19252,7 +21830,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -433,9 +436,9 @@
+@@ -434,9 +437,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19264,10 +21842,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Austria/Standard/Makefile.in kdenetwork-3.4.1/kppp/Rules/Austria/Standard/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Austria/Standard/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Austria/Standard/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Austria/Standard/Makefile.in kdenetwork-3.4.2/kppp/Rules/Austria/Standard/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Austria/Standard/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Austria/Standard/Makefile.in 2005-08-02 17:20:41.806136264 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19277,7 +21861,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
+@@ -397,7 +400,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19286,7 +21870,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -435,9 +438,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19298,10 +21882,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Bangladesh/Makefile.in kdenetwork-3.4.1/kppp/Rules/Bangladesh/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Bangladesh/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Bangladesh/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Bangladesh/Makefile.in kdenetwork-3.4.2/kppp/Rules/Bangladesh/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Bangladesh/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Bangladesh/Makefile.in 2005-08-02 17:20:41.818134440 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19311,7 +21901,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -395,7 +398,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19320,7 +21910,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -433,9 +436,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19332,10 +21922,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Belgium/Makefile.in kdenetwork-3.4.1/kppp/Rules/Belgium/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Belgium/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Belgium/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Belgium/Makefile.in kdenetwork-3.4.2/kppp/Rules/Belgium/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Belgium/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Belgium/Makefile.in 2005-08-02 17:20:41.831132464 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19345,7 +21941,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -395,7 +398,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19354,7 +21950,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -433,9 +436,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19366,10 +21962,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Bosnia_and_Herzegovina/Makefile.in kdenetwork-3.4.1/kppp/Rules/Bosnia_and_Herzegovina/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Bosnia_and_Herzegovina/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Bosnia_and_Herzegovina/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Bosnia_and_Herzegovina/Makefile.in kdenetwork-3.4.2/kppp/Rules/Bosnia_and_Herzegovina/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Bosnia_and_Herzegovina/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Bosnia_and_Herzegovina/Makefile.in 2005-08-02 17:20:41.859128208 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19379,7 +21981,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
+@@ -397,7 +400,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19388,7 +21990,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -435,9 +438,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19400,10 +22002,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Brasil/Makefile.in kdenetwork-3.4.1/kppp/Rules/Brasil/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Brasil/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Brasil/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Brasil/Makefile.in kdenetwork-3.4.2/kppp/Rules/Brasil/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Brasil/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Brasil/Makefile.in 2005-08-02 17:20:41.872126232 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19413,7 +22021,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
+@@ -397,7 +400,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19422,7 +22030,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -435,9 +438,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19434,10 +22042,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Croatia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Croatia/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Croatia/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Croatia/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Croatia/Makefile.in kdenetwork-3.4.2/kppp/Rules/Croatia/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Croatia/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Croatia/Makefile.in 2005-08-02 17:20:41.896122584 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19447,7 +22061,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19456,7 +22070,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19468,10 +22082,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Czechia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Czechia/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Czechia/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Czechia/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Czechia/Makefile.in kdenetwork-3.4.2/kppp/Rules/Czechia/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Czechia/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Czechia/Makefile.in 2005-08-02 17:20:41.909120608 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19481,7 +22101,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -397,7 +400,7 @@
+@@ -398,7 +401,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19490,7 +22110,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -435,9 +438,9 @@
+@@ -436,9 +439,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19502,7 +22122,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -596,7 +599,7 @@
+@@ -597,7 +600,7 @@
.NOEXPORT:
#>+ 2
@@ -19511,10 +22131,16 @@
#>+ 2
docs-am:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Denmark/Makefile.in kdenetwork-3.4.1/kppp/Rules/Denmark/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Denmark/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Denmark/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Denmark/Makefile.in kdenetwork-3.4.2/kppp/Rules/Denmark/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Denmark/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Denmark/Makefile.in 2005-08-02 17:20:41.922118632 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19524,7 +22150,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -398,7 +401,7 @@
+@@ -399,7 +402,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19533,7 +22159,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -436,9 +439,9 @@
+@@ -437,9 +440,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19545,7 +22171,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -597,7 +600,7 @@
+@@ -598,7 +601,7 @@
.NOEXPORT:
#>+ 2
@@ -19554,10 +22180,16 @@
#>+ 2
docs-am:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Estonia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Estonia/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Estonia/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Estonia/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Estonia/Makefile.in kdenetwork-3.4.2/kppp/Rules/Estonia/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Estonia/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Estonia/Makefile.in 2005-08-02 17:20:41.940115896 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19567,7 +22199,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19576,7 +22208,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19588,10 +22220,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Finland/Makefile.in kdenetwork-3.4.1/kppp/Rules/Finland/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Finland/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Finland/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Finland/Makefile.in kdenetwork-3.4.2/kppp/Rules/Finland/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Finland/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Finland/Makefile.in 2005-08-02 17:20:41.953113920 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19601,7 +22239,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19610,7 +22248,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19622,10 +22260,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/France/Makefile.in kdenetwork-3.4.1/kppp/Rules/France/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/France/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/France/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/France/Makefile.in kdenetwork-3.4.2/kppp/Rules/France/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/France/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/France/Makefile.in 2005-08-02 17:20:41.966111944 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19635,7 +22279,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -395,7 +398,7 @@
+@@ -396,7 +399,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19644,7 +22288,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -433,9 +436,9 @@
+@@ -434,9 +437,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19656,10 +22300,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Germany/Makefile.in kdenetwork-3.4.1/kppp/Rules/Germany/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Germany/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Germany/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Germany/Makefile.in kdenetwork-3.4.2/kppp/Rules/Germany/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Germany/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Germany/Makefile.in 2005-08-02 17:20:41.991108144 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19669,7 +22319,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -421,7 +424,7 @@
+@@ -422,7 +425,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19678,7 +22328,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -459,9 +462,9 @@
+@@ -460,9 +463,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19690,7 +22340,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -620,7 +623,7 @@
+@@ -621,7 +624,7 @@
.NOEXPORT:
#>+ 2
@@ -19699,10 +22349,16 @@
#>+ 2
docs-am:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Greece/Makefile.in kdenetwork-3.4.1/kppp/Rules/Greece/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Greece/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Greece/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Greece/Makefile.in kdenetwork-3.4.2/kppp/Rules/Greece/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Greece/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Greece/Makefile.in 2005-08-02 17:20:42.004106168 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19712,7 +22368,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -397,7 +400,7 @@
+@@ -398,7 +401,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19721,7 +22377,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -435,9 +438,9 @@
+@@ -436,9 +439,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19733,10 +22389,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/HongKong/Makefile.in kdenetwork-3.4.1/kppp/Rules/HongKong/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/HongKong/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/HongKong/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/HongKong/Makefile.in kdenetwork-3.4.2/kppp/Rules/HongKong/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/HongKong/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/HongKong/Makefile.in 2005-08-02 17:20:42.016104344 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19746,7 +22408,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19755,7 +22417,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19767,10 +22429,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Hungary/Makefile.in kdenetwork-3.4.1/kppp/Rules/Hungary/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Hungary/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Hungary/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Hungary/Makefile.in kdenetwork-3.4.2/kppp/Rules/Hungary/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Hungary/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Hungary/Makefile.in 2005-08-02 17:20:42.030102216 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19780,7 +22448,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
+@@ -397,7 +400,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19789,7 +22457,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -435,9 +438,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19801,10 +22469,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Iceland/Makefile.in kdenetwork-3.4.1/kppp/Rules/Iceland/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Iceland/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Iceland/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Iceland/Makefile.in kdenetwork-3.4.2/kppp/Rules/Iceland/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Iceland/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Iceland/Makefile.in 2005-08-02 17:20:42.043100240 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19814,7 +22488,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19823,7 +22497,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19835,7 +22509,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -591,7 +594,7 @@
+@@ -592,7 +595,7 @@
.NOEXPORT:
#>+ 2
@@ -19844,10 +22518,16 @@
#>+ 2
docs-am:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/India/Makefile.in kdenetwork-3.4.1/kppp/Rules/India/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/India/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/India/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/India/Makefile.in kdenetwork-3.4.2/kppp/Rules/India/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/India/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/India/Makefile.in 2005-08-02 17:20:42.055098416 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19857,7 +22537,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -395,7 +398,7 @@
+@@ -396,7 +399,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19866,7 +22546,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -433,9 +436,9 @@
+@@ -434,9 +437,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19878,10 +22558,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Indonesia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Indonesia/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Indonesia/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Indonesia/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Indonesia/Makefile.in kdenetwork-3.4.2/kppp/Rules/Indonesia/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Indonesia/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Indonesia/Makefile.in 2005-08-02 17:20:42.079094768 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19891,7 +22577,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -395,7 +398,7 @@
+@@ -396,7 +399,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19900,7 +22586,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -433,9 +436,9 @@
+@@ -434,9 +437,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19912,7 +22598,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -594,7 +597,7 @@
+@@ -595,7 +598,7 @@
.NOEXPORT:
#>+ 2
@@ -19921,10 +22607,16 @@
#>+ 2
docs-am:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Ireland/Makefile.in kdenetwork-3.4.1/kppp/Rules/Ireland/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Ireland/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Ireland/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Ireland/Makefile.in kdenetwork-3.4.2/kppp/Rules/Ireland/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Ireland/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Ireland/Makefile.in 2005-08-02 17:20:42.091092944 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19934,7 +22626,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
+@@ -397,7 +400,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19943,7 +22635,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -435,9 +438,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19955,10 +22647,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Israel/Makefile.in kdenetwork-3.4.1/kppp/Rules/Israel/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Israel/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Israel/Makefile.in 2005-05-24 13:47:20.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Israel/Makefile.in kdenetwork-3.4.2/kppp/Rules/Israel/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Israel/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Israel/Makefile.in 2005-08-02 17:20:42.104090968 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19968,7 +22666,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -395,7 +398,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19977,7 +22675,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -433,9 +436,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19989,10 +22687,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Italy/Makefile.in kdenetwork-3.4.1/kppp/Rules/Italy/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Italy/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Italy/Makefile.in 2005-05-24 13:47:21.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Italy/Makefile.in kdenetwork-3.4.2/kppp/Rules/Italy/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Italy/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Italy/Makefile.in 2005-08-02 17:20:42.130087016 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20002,7 +22706,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -420,7 +423,7 @@
+@@ -421,7 +424,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20011,7 +22715,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -458,9 +461,9 @@
+@@ -459,9 +462,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20023,7 +22727,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -619,7 +622,7 @@
+@@ -620,7 +623,7 @@
.NOEXPORT:
#>+ 2
@@ -20032,10 +22736,16 @@
#>+ 2
docs-am:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Jamaica/Makefile.in kdenetwork-3.4.1/kppp/Rules/Jamaica/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Jamaica/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Jamaica/Makefile.in 2005-05-24 13:47:21.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Jamaica/Makefile.in kdenetwork-3.4.2/kppp/Rules/Jamaica/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Jamaica/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Jamaica/Makefile.in 2005-08-02 17:20:42.143085040 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20045,7 +22755,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -395,7 +398,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20054,7 +22764,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -433,9 +436,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20066,10 +22776,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Japan/Makefile.in kdenetwork-3.4.1/kppp/Rules/Japan/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Japan/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Japan/Makefile.in 2005-05-24 13:47:21.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Japan/Makefile.in kdenetwork-3.4.2/kppp/Rules/Japan/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Japan/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Japan/Makefile.in 2005-08-02 17:20:42.155083216 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20079,7 +22795,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20088,7 +22804,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20100,10 +22816,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Kazakhstan/Makefile.in kdenetwork-3.4.1/kppp/Rules/Kazakhstan/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Kazakhstan/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Kazakhstan/Makefile.in 2005-05-24 13:47:21.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Kazakhstan/Makefile.in kdenetwork-3.4.2/kppp/Rules/Kazakhstan/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Kazakhstan/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Kazakhstan/Makefile.in 2005-08-02 17:20:42.168081240 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20113,7 +22835,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20122,7 +22844,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20134,10 +22856,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Luxembourg/Makefile.in kdenetwork-3.4.1/kppp/Rules/Luxembourg/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Luxembourg/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Luxembourg/Makefile.in 2005-05-24 13:47:21.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Luxembourg/Makefile.in kdenetwork-3.4.2/kppp/Rules/Luxembourg/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Luxembourg/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Luxembourg/Makefile.in 2005-08-02 17:20:42.181079264 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20147,7 +22875,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20156,7 +22884,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20168,10 +22896,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Macedonia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Macedonia/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Macedonia/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Macedonia/Makefile.in 2005-05-24 13:47:21.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Macedonia/Makefile.in kdenetwork-3.4.2/kppp/Rules/Macedonia/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Macedonia/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Macedonia/Makefile.in 2005-08-02 17:20:42.193077440 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20181,7 +22915,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -395,7 +398,7 @@
+@@ -396,7 +399,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20190,7 +22924,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -433,9 +436,9 @@
+@@ -434,9 +437,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20202,10 +22936,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Makefile.in kdenetwork-3.4.1/kppp/Rules/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Makefile.in 2005-05-24 13:47:21.000000000 -0400
-@@ -217,6 +217,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Makefile.in kdenetwork-3.4.2/kppp/Rules/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Makefile.in 2005-08-02 17:20:42.224072728 +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@
+
+@@ -218,6 +218,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20215,7 +22955,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -406,7 +409,7 @@
xdg_menudir = @xdg_menudir@
#>- SUBDIRS = $(AUTODIRS)
#>+ 1
@@ -20224,7 +22964,7 @@
pkg_DATA = TEMPLATE
pkg_SCRIPTS = checkrules
pkgdir = $(kde_datadir)/kppp/Rules
-@@ -415,7 +418,7 @@
+@@ -416,7 +419,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -20233,7 +22973,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -453,9 +456,9 @@
+@@ -454,9 +457,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20245,10 +22985,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-pkgSCRIPTS: $(pkg_SCRIPTS)
@$(NORMAL_INSTALL)
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Malaysia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Malaysia/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Malaysia/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Malaysia/Makefile.in 2005-05-24 13:47:21.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Malaysia/Makefile.in kdenetwork-3.4.2/kppp/Rules/Malaysia/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Malaysia/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Malaysia/Makefile.in 2005-08-02 17:20:42.236070904 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20258,7 +23004,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20267,7 +23013,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20279,10 +23025,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Netherlands/Makefile.in kdenetwork-3.4.1/kppp/Rules/Netherlands/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Netherlands/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Netherlands/Makefile.in 2005-05-24 13:47:21.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Netherlands/Makefile.in kdenetwork-3.4.2/kppp/Rules/Netherlands/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Netherlands/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Netherlands/Makefile.in 2005-08-02 17:20:42.251068624 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20292,7 +23044,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -421,7 +424,7 @@
+@@ -422,7 +425,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20301,7 +23053,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -459,9 +462,9 @@
+@@ -460,9 +463,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20313,7 +23065,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -620,7 +623,7 @@
+@@ -621,7 +624,7 @@
.NOEXPORT:
#>+ 2
@@ -20322,10 +23074,16 @@
#>+ 2
docs-am:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Norway/Makefile.in kdenetwork-3.4.1/kppp/Rules/Norway/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Norway/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Norway/Makefile.in 2005-05-24 13:47:21.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Norway/Makefile.in kdenetwork-3.4.2/kppp/Rules/Norway/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Norway/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Norway/Makefile.in 2005-08-02 17:20:42.264066648 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20335,7 +23093,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -395,7 +398,7 @@
+@@ -396,7 +399,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20344,7 +23102,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -433,9 +436,9 @@
+@@ -434,9 +437,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20356,10 +23114,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Poland/Makefile.in kdenetwork-3.4.1/kppp/Rules/Poland/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Poland/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Poland/Makefile.in 2005-05-24 13:47:21.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Poland/Makefile.in kdenetwork-3.4.2/kppp/Rules/Poland/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Poland/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Poland/Makefile.in 2005-08-02 17:20:42.277064672 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20369,7 +23133,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -400,7 +403,7 @@
+@@ -401,7 +404,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20378,7 +23142,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -438,9 +441,9 @@
+@@ -439,9 +442,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20390,10 +23154,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Portugal/Makefile.in kdenetwork-3.4.1/kppp/Rules/Portugal/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Portugal/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Portugal/Makefile.in 2005-05-24 13:47:21.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Portugal/Makefile.in kdenetwork-3.4.2/kppp/Rules/Portugal/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Portugal/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Portugal/Makefile.in 2005-08-02 17:20:42.289062848 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20403,7 +23173,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -395,7 +398,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20412,7 +23182,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -433,9 +436,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20424,10 +23194,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Romania/Makefile.in kdenetwork-3.4.1/kppp/Rules/Romania/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Romania/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Romania/Makefile.in 2005-05-24 13:47:21.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Romania/Makefile.in kdenetwork-3.4.2/kppp/Rules/Romania/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Romania/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Romania/Makefile.in 2005-08-02 17:20:42.312059352 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20437,7 +23213,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -397,7 +400,7 @@
+@@ -398,7 +401,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20446,7 +23222,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -435,9 +438,9 @@
+@@ -436,9 +439,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20458,7 +23234,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -596,7 +599,7 @@
+@@ -597,7 +600,7 @@
.NOEXPORT:
#>+ 2
@@ -20467,10 +23243,16 @@
#>+ 2
docs-am:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Russia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Russia/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Russia/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Russia/Makefile.in 2005-05-24 13:47:21.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Russia/Makefile.in kdenetwork-3.4.2/kppp/Rules/Russia/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Russia/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Russia/Makefile.in 2005-08-02 17:20:42.325057376 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20480,7 +23262,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20489,7 +23271,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20501,10 +23283,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Singapore/Makefile.in kdenetwork-3.4.1/kppp/Rules/Singapore/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Singapore/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Singapore/Makefile.in 2005-05-24 13:47:21.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Singapore/Makefile.in kdenetwork-3.4.2/kppp/Rules/Singapore/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Singapore/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Singapore/Makefile.in 2005-08-02 17:20:42.337055552 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20514,7 +23302,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20523,7 +23311,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20535,10 +23323,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Slovakia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Slovakia/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Slovakia/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Slovakia/Makefile.in 2005-05-24 13:47:21.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Slovakia/Makefile.in kdenetwork-3.4.2/kppp/Rules/Slovakia/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Slovakia/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Slovakia/Makefile.in 2005-08-02 17:20:42.350053576 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20548,7 +23342,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -395,7 +398,7 @@
+@@ -396,7 +399,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20557,7 +23351,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -433,9 +436,9 @@
+@@ -434,9 +437,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20569,10 +23363,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Slovenia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Slovenia/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Slovenia/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Slovenia/Makefile.in 2005-05-24 13:47:21.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Slovenia/Makefile.in kdenetwork-3.4.2/kppp/Rules/Slovenia/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Slovenia/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Slovenia/Makefile.in 2005-08-02 17:20:42.363051600 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20582,7 +23382,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -395,7 +398,7 @@
+@@ -396,7 +399,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20591,7 +23391,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -433,9 +436,9 @@
+@@ -434,9 +437,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20603,10 +23403,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/SouthAfrica/Makefile.in kdenetwork-3.4.1/kppp/Rules/SouthAfrica/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/SouthAfrica/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/SouthAfrica/Makefile.in 2005-05-24 13:47:21.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/SouthAfrica/Makefile.in kdenetwork-3.4.2/kppp/Rules/SouthAfrica/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/SouthAfrica/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/SouthAfrica/Makefile.in 2005-08-02 17:20:42.376049624 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20616,7 +23422,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20625,7 +23431,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20637,10 +23443,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/SouthAfrika/Makefile.in kdenetwork-3.4.1/kppp/Rules/SouthAfrika/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/SouthAfrika/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/SouthAfrika/Makefile.in 2005-05-24 13:47:21.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/SouthAfrika/Makefile.in kdenetwork-3.4.2/kppp/Rules/SouthAfrika/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/SouthAfrika/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/SouthAfrika/Makefile.in 2005-08-02 17:20:42.388047800 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20650,7 +23462,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20659,7 +23471,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20671,10 +23483,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Spain/Makefile.in kdenetwork-3.4.1/kppp/Rules/Spain/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Spain/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Spain/Makefile.in 2005-05-24 13:47:21.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Spain/Makefile.in kdenetwork-3.4.2/kppp/Rules/Spain/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Spain/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Spain/Makefile.in 2005-08-02 17:20:42.412044152 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20684,7 +23502,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -397,7 +400,7 @@
+@@ -398,7 +401,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20693,7 +23511,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -435,9 +438,9 @@
+@@ -436,9 +439,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20705,7 +23523,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -596,7 +599,7 @@
+@@ -597,7 +600,7 @@
.NOEXPORT:
#>+ 2
@@ -20714,10 +23532,16 @@
#>+ 2
docs-am:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Sweden/Makefile.in kdenetwork-3.4.1/kppp/Rules/Sweden/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Sweden/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Sweden/Makefile.in 2005-05-24 13:47:21.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Sweden/Makefile.in kdenetwork-3.4.2/kppp/Rules/Sweden/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Sweden/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Sweden/Makefile.in 2005-08-02 17:20:42.427041872 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20727,7 +23551,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -400,7 +403,7 @@
+@@ -401,7 +404,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20736,7 +23560,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -438,9 +441,9 @@
+@@ -439,9 +442,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20748,7 +23572,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -599,7 +602,7 @@
+@@ -600,7 +603,7 @@
.NOEXPORT:
#>+ 2
@@ -20757,10 +23581,16 @@
#>+ 2
docs-am:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Switzerland/Makefile.in kdenetwork-3.4.1/kppp/Rules/Switzerland/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Switzerland/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Switzerland/Makefile.in 2005-05-24 13:47:21.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Switzerland/Makefile.in kdenetwork-3.4.2/kppp/Rules/Switzerland/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Switzerland/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Switzerland/Makefile.in 2005-08-02 17:20:42.442039592 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20770,7 +23600,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -398,7 +401,7 @@
+@@ -399,7 +402,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20779,7 +23609,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -436,9 +439,9 @@
+@@ -437,9 +440,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20791,10 +23621,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Turkey/Makefile.in kdenetwork-3.4.1/kppp/Rules/Turkey/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Turkey/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Turkey/Makefile.in 2005-05-24 13:47:21.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Turkey/Makefile.in kdenetwork-3.4.2/kppp/Rules/Turkey/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Turkey/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Turkey/Makefile.in 2005-08-02 17:20:42.454037768 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20804,7 +23640,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20813,7 +23649,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20825,10 +23661,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Ukraine/Makefile.in kdenetwork-3.4.1/kppp/Rules/Ukraine/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Ukraine/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Ukraine/Makefile.in 2005-05-24 13:47:21.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Ukraine/Makefile.in kdenetwork-3.4.2/kppp/Rules/Ukraine/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Ukraine/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Ukraine/Makefile.in 2005-08-02 17:20:42.467035792 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20838,7 +23680,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20847,7 +23689,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20859,10 +23701,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/United_Kingdom/Makefile.in kdenetwork-3.4.1/kppp/Rules/United_Kingdom/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/United_Kingdom/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/United_Kingdom/Makefile.in 2005-05-24 13:47:21.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/United_Kingdom/Makefile.in kdenetwork-3.4.2/kppp/Rules/United_Kingdom/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/United_Kingdom/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/United_Kingdom/Makefile.in 2005-08-02 17:20:42.480033816 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20872,7 +23720,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -400,7 +403,7 @@
+@@ -401,7 +404,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20881,7 +23729,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -438,9 +441,9 @@
+@@ -439,9 +442,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20893,10 +23741,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Uruguay/Makefile.in kdenetwork-3.4.1/kppp/Rules/Uruguay/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Uruguay/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Uruguay/Makefile.in 2005-05-24 13:47:21.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Uruguay/Makefile.in kdenetwork-3.4.2/kppp/Rules/Uruguay/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Uruguay/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Uruguay/Makefile.in 2005-08-02 17:20:42.503030320 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20906,7 +23760,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -393,7 +396,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20915,7 +23769,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -431,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20927,10 +23781,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Yugoslavia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Yugoslavia/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Yugoslavia/Makefile.in 2005-05-23 12:09:06.000000000 -0400
-+++ kdenetwork-3.4.1/kppp/Rules/Yugoslavia/Makefile.in 2005-05-24 13:47:22.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/kppp/Rules/Yugoslavia/Makefile.in kdenetwork-3.4.2/kppp/Rules/Yugoslavia/Makefile.in
+--- kdenetwork-3.4.2.orig/kppp/Rules/Yugoslavia/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/kppp/Rules/Yugoslavia/Makefile.in 2005-08-02 17:20:42.516028344 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20940,7 +23800,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
+@@ -397,7 +400,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20949,7 +23809,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -435,9 +438,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20961,7 +23821,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -595,7 +598,7 @@
+@@ -596,7 +599,7 @@
.NOEXPORT:
#>+ 2
@@ -20970,10 +23830,25 @@
#>+ 2
docs-am:
-diff -Nru kdenetwork-3.4.1.orig/krdc/Makefile.in kdenetwork-3.4.1/krdc/Makefile.in
---- kdenetwork-3.4.1.orig/krdc/Makefile.in 2005-05-23 12:09:07.000000000 -0400
-+++ kdenetwork-3.4.1/krdc/Makefile.in 2005-05-24 13:47:22.000000000 -0400
-@@ -273,6 +273,9 @@
+diff -Nru kdenetwork-3.4.2.orig/krdc/Makefile.in kdenetwork-3.4.2/krdc/Makefile.in
+--- kdenetwork-3.4.2.orig/krdc/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/krdc/Makefile.in 2005-08-02 17:20:42.657006912 +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 = $(krdc_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -274,6 +272,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20983,7 +23858,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -497,7 +500,7 @@
+@@ -498,7 +499,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20992,7 +23867,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -535,9 +538,9 @@
+@@ -536,9 +537,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21004,7 +23879,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1046,11 +1049,11 @@
+@@ -1047,11 +1048,11 @@
mocs: kfullscreenpanel.moc
#>+ 3
@@ -21019,7 +23894,7 @@
#>+ 3
keycapturedialog.moc: $(srcdir)/keycapturedialog.h
-@@ -1060,11 +1063,11 @@
+@@ -1061,11 +1062,11 @@
mocs: keycapturedialog.moc
#>+ 3
@@ -21034,7 +23909,7 @@
#>+ 3
maindialog.moc: $(srcdir)/maindialog.h
-@@ -1075,10 +1078,10 @@
+@@ -1076,10 +1077,10 @@
#>+ 3
clean-metasources:
@@ -21047,7 +23922,7 @@
#>+ 6
clean-ui:
-@@ -1092,14 +1095,14 @@
+@@ -1093,14 +1094,14 @@
#>+ 10
install-kde-icons:
@@ -21065,7 +23940,7 @@
#>+ 15
force-reedit:
-@@ -1140,7 +1143,7 @@
+@@ -1141,7 +1142,7 @@
#>+ 11
@@ -21074,10 +23949,25 @@
@echo 'creating krdc.all_cpp.cpp ...'; \
rm -f krdc.all_cpp.files krdc.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> krdc.all_cpp.final; \
-diff -Nru kdenetwork-3.4.1.orig/krdc/rdp/Makefile.in kdenetwork-3.4.1/krdc/rdp/Makefile.in
---- kdenetwork-3.4.1.orig/krdc/rdp/Makefile.in 2005-05-23 12:09:07.000000000 -0400
-+++ kdenetwork-3.4.1/krdc/rdp/Makefile.in 2005-05-24 13:47:22.000000000 -0400
-@@ -227,6 +227,9 @@
+diff -Nru kdenetwork-3.4.2.orig/krdc/rdp/Makefile.in kdenetwork-3.4.2/krdc/rdp/Makefile.in
+--- kdenetwork-3.4.2.orig/krdc/rdp/Makefile.in 2005-07-20 20:17:05.000000000 +0000
++++ kdenetwork-3.4.2/krdc/rdp/Makefile.in 2005-08-02 17:20:42.681003264 +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 = $(librdp_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -228,6 +226,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21087,7 +23977,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -428,7 +431,7 @@
+@@ -429,7 +430,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21096,7 +23986,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -466,9 +469,9 @@
+@@ -467,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21108,10 +23998,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdenetwork-3.4.1.orig/krdc/vnc/Makefile.in kdenetwork-3.4.1/krdc/vnc/Makefile.in
---- kdenetwork-3.4.1.orig/krdc/vnc/Makefile.in 2005-05-23 12:09:07.000000000 -0400
-+++ kdenetwork-3.4.1/krdc/vnc/Makefile.in 2005-05-24 13:47:22.000000000 -0400
-@@ -237,6 +237,9 @@
+diff -Nru kdenetwork-3.4.2.orig/krdc/vnc/Makefile.in kdenetwork-3.4.2/krdc/vnc/Makefile.in
+--- kdenetwork-3.4.2.orig/krdc/vnc/Makefile.in 2005-07-20 20:17:06.000000000 +0000
++++ kdenetwork-3.4.2/krdc/vnc/Makefile.in 2005-08-02 17:20:42.714998096 +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 = $(libvnc_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -238,6 +236,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21121,7 +24026,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,7 +447,7 @@
+@@ -445,7 +446,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -21130,7 +24035,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -482,9 +485,9 @@
+@@ -483,9 +484,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21142,10 +24047,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdenetwork-3.4.1.orig/krfb/kcm_krfb/Makefile.in kdenetwork-3.4.1/krfb/kcm_krfb/Makefile.in
---- kdenetwork-3.4.1.orig/krfb/kcm_krfb/Makefile.in 2005-05-23 12:09:07.000000000 -0400
-+++ kdenetwork-3.4.1/krfb/kcm_krfb/Makefile.in 2005-05-24 13:47:22.000000000 -0400
-@@ -237,6 +237,9 @@
+diff -Nru kdenetwork-3.4.2.orig/krfb/kcm_krfb/Makefile.in kdenetwork-3.4.2/krfb/kcm_krfb/Makefile.in
+--- kdenetwork-3.4.2.orig/krfb/kcm_krfb/Makefile.in 2005-07-20 20:17:06.000000000 +0000
++++ kdenetwork-3.4.2/krfb/kcm_krfb/Makefile.in 2005-08-02 17:20:42.753992168 +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_krfb_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -238,6 +236,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21155,7 +24075,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -447,7 +450,7 @@
+@@ -448,7 +449,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21164,7 +24084,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
@@ -21176,7 +24096,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -787,7 +790,7 @@
+@@ -788,7 +789,7 @@
-rm -f kcm_krfb.moc
#>+ 2
@@ -21185,10 +24105,25 @@
#>+ 4
clean-ui:
-diff -Nru kdenetwork-3.4.1.orig/krfb/kinetd/Makefile.in kdenetwork-3.4.1/krfb/kinetd/Makefile.in
---- kdenetwork-3.4.1.orig/krfb/kinetd/Makefile.in 2005-05-23 12:09:07.000000000 -0400
-+++ kdenetwork-3.4.1/krfb/kinetd/Makefile.in 2005-05-24 13:47:22.000000000 -0400
-@@ -238,6 +238,9 @@
+diff -Nru kdenetwork-3.4.2.orig/krfb/kinetd/Makefile.in kdenetwork-3.4.2/krfb/kinetd/Makefile.in
+--- kdenetwork-3.4.2.orig/krfb/kinetd/Makefile.in 2005-07-20 20:17:06.000000000 +0000
++++ kdenetwork-3.4.2/krfb/kinetd/Makefile.in 2005-08-02 17:20:42.778988368 +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 = $(kded_kinetd_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -239,6 +237,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21198,7 +24133,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -452,7 +455,7 @@
+@@ -453,7 +454,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21207,7 +24142,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -490,9 +493,9 @@
+@@ -491,9 +492,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21219,10 +24154,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdenetwork-3.4.1.orig/krfb/krfb/Makefile.in kdenetwork-3.4.1/krfb/krfb/Makefile.in
---- kdenetwork-3.4.1.orig/krfb/krfb/Makefile.in 2005-05-23 12:09:07.000000000 -0400
-+++ kdenetwork-3.4.1/krfb/krfb/Makefile.in 2005-05-24 13:47:22.000000000 -0400
-@@ -261,6 +261,9 @@
+diff -Nru kdenetwork-3.4.2.orig/krfb/krfb/Makefile.in kdenetwork-3.4.2/krfb/krfb/Makefile.in
+--- kdenetwork-3.4.2.orig/krfb/krfb/Makefile.in 2005-07-20 20:17:06.000000000 +0000
++++ kdenetwork-3.4.2/krfb/krfb/Makefile.in 2005-08-02 17:20:42.848977728 +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 = $(libkrfbconfig_la_SOURCES) $(krfb_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -262,6 +260,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21232,7 +24182,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -485,7 +488,7 @@
+@@ -486,7 +487,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -21241,7 +24191,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -523,9 +526,9 @@
+@@ -524,9 +525,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21253,7 +24203,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -961,7 +964,7 @@
+@@ -962,7 +963,7 @@
-rm -f invitedialog.moc trayicon.moc krfbifaceimpl.moc configuration.moc rfbcontroller.moc connectiondialog.moc
#>+ 2
@@ -21262,7 +24212,7 @@
#>+ 5
clean-idl:
-@@ -984,18 +987,18 @@
+@@ -985,18 +986,18 @@
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
$(INSTALL_DATA) $(srcdir)/lo32-app-krfb.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/krfb.png
@@ -21284,10 +24234,16 @@
#>+ 15
force-reedit:
-diff -Nru kdenetwork-3.4.1.orig/krfb/krfb_httpd/Makefile.in kdenetwork-3.4.1/krfb/krfb_httpd/Makefile.in
---- kdenetwork-3.4.1.orig/krfb/krfb_httpd/Makefile.in 2005-05-23 12:09:07.000000000 -0400
-+++ kdenetwork-3.4.1/krfb/krfb_httpd/Makefile.in 2005-05-24 13:47:22.000000000 -0400
-@@ -201,6 +201,9 @@
+diff -Nru kdenetwork-3.4.2.orig/krfb/krfb_httpd/Makefile.in kdenetwork-3.4.2/krfb/krfb_httpd/Makefile.in
+--- kdenetwork-3.4.2.orig/krfb/krfb_httpd/Makefile.in 2005-07-20 20:17:06.000000000 +0000
++++ kdenetwork-3.4.2/krfb/krfb_httpd/Makefile.in 2005-08-02 17:20:42.862975600 +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@
+
+@@ -202,6 +202,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21297,7 +24253,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -395,7 +398,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -21306,7 +24262,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -433,9 +436,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21318,10 +24274,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
-diff -Nru kdenetwork-3.4.1.orig/krfb/libvncserver/Makefile.in kdenetwork-3.4.1/krfb/libvncserver/Makefile.in
---- kdenetwork-3.4.1.orig/krfb/libvncserver/Makefile.in 2005-05-23 12:09:07.000000000 -0400
-+++ kdenetwork-3.4.1/krfb/libvncserver/Makefile.in 2005-05-24 13:47:22.000000000 -0400
-@@ -220,6 +220,9 @@
+diff -Nru kdenetwork-3.4.2.orig/krfb/libvncserver/Makefile.in kdenetwork-3.4.2/krfb/libvncserver/Makefile.in
+--- kdenetwork-3.4.2.orig/krfb/libvncserver/Makefile.in 2005-07-20 20:17:06.000000000 +0000
++++ kdenetwork-3.4.2/krfb/libvncserver/Makefile.in 2005-08-02 17:20:42.884972256 +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@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libvncserver_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -221,6 +219,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21331,7 +24302,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -423,7 +424,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -21340,7 +24311,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
@@ -21352,10 +24323,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdenetwork-3.4.1.orig/krfb/Makefile.in kdenetwork-3.4.1/krfb/Makefile.in
---- kdenetwork-3.4.1.orig/krfb/Makefile.in 2005-05-23 12:09:07.000000000 -0400
-+++ kdenetwork-3.4.1/krfb/Makefile.in 2005-05-24 13:47:22.000000000 -0400
-@@ -205,6 +205,9 @@
+diff -Nru kdenetwork-3.4.2.orig/krfb/Makefile.in kdenetwork-3.4.2/krfb/Makefile.in
+--- kdenetwork-3.4.2.orig/krfb/Makefile.in 2005-07-20 20:17:06.000000000 +0000
++++ kdenetwork-3.4.2/krfb/Makefile.in 2005-08-02 17:20:42.729995816 +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@
+
+@@ -206,6 +206,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21365,7 +24342,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -402,7 +405,7 @@
+@@ -403,7 +406,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -21374,7 +24351,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -440,9 +443,9 @@
+@@ -441,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21386,10 +24363,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/krfb/srvloc/Makefile.in kdenetwork-3.4.1/krfb/srvloc/Makefile.in
---- kdenetwork-3.4.1.orig/krfb/srvloc/Makefile.in 2005-05-23 12:09:07.000000000 -0400
-+++ kdenetwork-3.4.1/krfb/srvloc/Makefile.in 2005-05-24 13:47:22.000000000 -0400
-@@ -230,6 +230,9 @@
+diff -Nru kdenetwork-3.4.2.orig/krfb/srvloc/Makefile.in kdenetwork-3.4.2/krfb/srvloc/Makefile.in
+--- kdenetwork-3.4.2.orig/krfb/srvloc/Makefile.in 2005-07-20 20:17:06.000000000 +0000
++++ kdenetwork-3.4.2/krfb/srvloc/Makefile.in 2005-08-02 17:20:42.910968304 +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 = $(libsrvloc_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -231,6 +229,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21399,7 +24391,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -440,7 +443,7 @@
+@@ -441,7 +442,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21408,7 +24400,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
@@ -21420,10 +24412,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdenetwork-3.4.1.orig/ksirc/icons/Makefile.in kdenetwork-3.4.1/ksirc/icons/Makefile.in
---- kdenetwork-3.4.1.orig/ksirc/icons/Makefile.in 2005-05-23 12:09:08.000000000 -0400
-+++ kdenetwork-3.4.1/ksirc/icons/Makefile.in 2005-05-24 13:47:23.000000000 -0400
-@@ -188,6 +188,9 @@
+diff -Nru kdenetwork-3.4.2.orig/ksirc/icons/Makefile.in kdenetwork-3.4.2/ksirc/icons/Makefile.in
+--- kdenetwork-3.4.2.orig/ksirc/icons/Makefile.in 2005-07-20 20:17:06.000000000 +0000
++++ kdenetwork-3.4.2/ksirc/icons/Makefile.in 2005-08-02 17:20:43.304908416 +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@
+
+@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21433,7 +24431,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -384,7 +387,7 @@
+@@ -385,7 +388,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -21442,7 +24440,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -422,9 +425,9 @@
+@@ -423,9 +426,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21454,7 +24452,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -574,15 +577,15 @@
+@@ -575,15 +578,15 @@
#>+ 33
install-kde-icons:
@@ -21473,7 +24471,7 @@
$(mkinstalldirs) $(DESTDIR)$(ksircicondir)/crystalsvg/48x48/apps
$(INSTALL_DATA) $(srcdir)/cr48-app-ksirc.png $(DESTDIR)$(ksircicondir)/crystalsvg/48x48/apps/ksirc.png
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-@@ -595,11 +598,11 @@
+@@ -596,11 +599,11 @@
$(INSTALL_DATA) $(srcdir)/cr48-app-ksirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ksirc.png
uninstall-kde-icons:
@@ -21487,10 +24485,16 @@
-rm -f $(DESTDIR)$(ksircicondir)/crystalsvg/48x48/apps/ksirc.png
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksirc.png
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksirc.png
-diff -Nru kdenetwork-3.4.1.orig/ksirc/img/emoticons/Makefile.in kdenetwork-3.4.1/ksirc/img/emoticons/Makefile.in
---- kdenetwork-3.4.1.orig/ksirc/img/emoticons/Makefile.in 2005-05-23 12:09:08.000000000 -0400
-+++ kdenetwork-3.4.1/ksirc/img/emoticons/Makefile.in 2005-05-24 13:47:23.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/ksirc/img/emoticons/Makefile.in kdenetwork-3.4.2/ksirc/img/emoticons/Makefile.in
+--- kdenetwork-3.4.2.orig/ksirc/img/emoticons/Makefile.in 2005-07-20 20:17:06.000000000 +0000
++++ kdenetwork-3.4.2/ksirc/img/emoticons/Makefile.in 2005-08-02 17:20:43.347901880 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21500,7 +24504,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -395,7 +398,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -21509,7 +24513,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -433,9 +436,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21521,10 +24525,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/ksirc/img/Makefile.in kdenetwork-3.4.1/ksirc/img/Makefile.in
---- kdenetwork-3.4.1.orig/ksirc/img/Makefile.in 2005-05-23 12:09:08.000000000 -0400
-+++ kdenetwork-3.4.1/ksirc/img/Makefile.in 2005-05-24 13:47:23.000000000 -0400
-@@ -214,6 +214,9 @@
+diff -Nru kdenetwork-3.4.2.orig/ksirc/img/Makefile.in kdenetwork-3.4.2/ksirc/img/Makefile.in
+--- kdenetwork-3.4.2.orig/ksirc/img/Makefile.in 2005-07-20 20:17:06.000000000 +0000
++++ kdenetwork-3.4.2/ksirc/img/Makefile.in 2005-08-02 17:20:43.334903856 +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@
+
+@@ -215,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21534,7 +24544,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -423,7 +426,7 @@
+@@ -424,7 +427,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -21543,7 +24553,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -461,9 +464,9 @@
+@@ -462,9 +465,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21555,7 +24565,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -771,7 +774,7 @@
+@@ -772,7 +775,7 @@
.NOEXPORT:
#>+ 2
@@ -21564,10 +24574,25 @@
#>+ 2
docs-am:
-diff -Nru kdenetwork-3.4.1.orig/ksirc/KSOpenkSirc/Makefile.in kdenetwork-3.4.1/ksirc/KSOpenkSirc/Makefile.in
---- kdenetwork-3.4.1.orig/ksirc/KSOpenkSirc/Makefile.in 2005-05-23 12:09:07.000000000 -0400
-+++ kdenetwork-3.4.1/ksirc/KSOpenkSirc/Makefile.in 2005-05-24 13:47:22.000000000 -0400
-@@ -238,6 +238,9 @@
+diff -Nru kdenetwork-3.4.2.orig/ksirc/KSOpenkSirc/Makefile.in kdenetwork-3.4.2/ksirc/KSOpenkSirc/Makefile.in
+--- kdenetwork-3.4.2.orig/ksirc/KSOpenkSirc/Makefile.in 2005-07-20 20:17:06.000000000 +0000
++++ kdenetwork-3.4.2/ksirc/KSOpenkSirc/Makefile.in 2005-08-02 17:20:42.942963440 +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 = $(libksopenksirc_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -239,6 +237,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21577,7 +24602,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,7 +463,7 @@
+@@ -461,7 +462,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21586,7 +24611,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
@@ -21598,10 +24623,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdenetwork-3.4.1.orig/ksirc/KSPrefs/Makefile.in kdenetwork-3.4.1/ksirc/KSPrefs/Makefile.in
---- kdenetwork-3.4.1.orig/ksirc/KSPrefs/Makefile.in 2005-05-23 12:09:07.000000000 -0400
-+++ kdenetwork-3.4.1/ksirc/KSPrefs/Makefile.in 2005-05-24 13:47:23.000000000 -0400
-@@ -232,6 +232,9 @@
+diff -Nru kdenetwork-3.4.2.orig/ksirc/KSPrefs/Makefile.in kdenetwork-3.4.2/ksirc/KSPrefs/Makefile.in
+--- kdenetwork-3.4.2.orig/ksirc/KSPrefs/Makefile.in 2005-07-20 20:17:06.000000000 +0000
++++ kdenetwork-3.4.2/ksirc/KSPrefs/Makefile.in 2005-08-02 17:20:42.984957056 +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 = $(libksprefs_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -233,6 +231,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21611,7 +24651,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -492,7 +495,7 @@
+@@ -493,7 +494,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21620,7 +24660,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -530,9 +533,9 @@
+@@ -531,9 +532,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21632,10 +24672,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdenetwork-3.4.1.orig/ksirc/KSProgress/Makefile.in kdenetwork-3.4.1/ksirc/KSProgress/Makefile.in
---- kdenetwork-3.4.1.orig/ksirc/KSProgress/Makefile.in 2005-05-23 12:09:07.000000000 -0400
-+++ kdenetwork-3.4.1/ksirc/KSProgress/Makefile.in 2005-05-24 13:47:23.000000000 -0400
-@@ -226,6 +226,9 @@
+diff -Nru kdenetwork-3.4.2.orig/ksirc/KSProgress/Makefile.in kdenetwork-3.4.2/ksirc/KSProgress/Makefile.in
+--- kdenetwork-3.4.2.orig/ksirc/KSProgress/Makefile.in 2005-07-20 20:17:06.000000000 +0000
++++ kdenetwork-3.4.2/ksirc/KSProgress/Makefile.in 2005-08-02 17:20:43.007953560 +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 = $(libksprogress_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -227,6 +225,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21645,7 +24700,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -424,7 +427,7 @@
+@@ -425,7 +426,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21654,7 +24709,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
@@ -21666,10 +24721,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdenetwork-3.4.1.orig/ksirc/KSTicker/Makefile.in kdenetwork-3.4.1/ksirc/KSTicker/Makefile.in
---- kdenetwork-3.4.1.orig/ksirc/KSTicker/Makefile.in 2005-05-23 12:09:08.000000000 -0400
-+++ kdenetwork-3.4.1/ksirc/KSTicker/Makefile.in 2005-05-24 13:47:23.000000000 -0400
-@@ -236,6 +236,9 @@
+diff -Nru kdenetwork-3.4.2.orig/ksirc/KSTicker/Makefile.in kdenetwork-3.4.2/ksirc/KSTicker/Makefile.in
+--- kdenetwork-3.4.2.orig/ksirc/KSTicker/Makefile.in 2005-07-20 20:17:06.000000000 +0000
++++ kdenetwork-3.4.2/ksirc/KSTicker/Makefile.in 2005-08-02 17:20:43.038948848 +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 = $(libksticker_la_SOURCES) $(ksttest_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -237,6 +235,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21679,7 +24749,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -440,7 +443,7 @@
+@@ -441,7 +442,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21688,7 +24758,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
@@ -21700,10 +24770,40 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdenetwork-3.4.1.orig/ksirc/Makefile.in kdenetwork-3.4.1/ksirc/Makefile.in
---- kdenetwork-3.4.1.orig/ksirc/Makefile.in 2005-05-23 12:09:08.000000000 -0400
-+++ kdenetwork-3.4.1/ksirc/Makefile.in 2005-05-24 13:47:23.000000000 -0400
-@@ -316,6 +316,9 @@
+diff -Nru kdenetwork-3.4.2.orig/ksirc/Makefile.in kdenetwork-3.4.2/ksirc/Makefile.in
+--- kdenetwork-3.4.2.orig/ksirc/Makefile.in 2005-07-20 20:17:06.000000000 +0000
++++ kdenetwork-3.4.2/ksirc/Makefile.in 2005-08-02 17:20:43.283911608 +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@
+
+@@ -19,10 +19,6 @@
+
+
+
+-#>- SOURCES = $(ksirc_la_SOURCES) $(dccMgrTest_SOURCES) $(getdate_SOURCES) $(testview_SOURCES)
+-#>+ 1
+-SOURCES = $(ksirc_la_SOURCES) $(dccMgrTest_SOURCES) $(getdate_SOURCES) $(testview_SOURCES) $(ksirc_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -149,8 +145,11 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- SOURCES = $(ksirc_la_SOURCES) $(dccMgrTest_SOURCES) $(getdate_SOURCES) \
++#>- $(testview_SOURCES)
++#>+ 2
+ SOURCES = $(ksirc_la_SOURCES) $(dccMgrTest_SOURCES) $(getdate_SOURCES) \
+- $(testview_SOURCES)
++ $(testview_SOURCES) $(ksirc_SOURCES)
+ #>- DIST_SOURCES = $(ksirc_la_SOURCES) $(dccMgrTest_SOURCES) \
+ #>- $(getdate_SOURCES) $(testview_SOURCES)
+ #>+ 2
+@@ -317,6 +316,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21713,7 +24813,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -675,7 +678,7 @@
+@@ -676,7 +678,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -21722,7 +24822,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -713,9 +716,9 @@
+@@ -714,9 +716,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21734,7 +24834,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1343,18 +1346,18 @@
+@@ -1344,18 +1346,18 @@
ksirc_DEPENDENCIES = libkdeinit_ksirc.la
#>+ 3
@@ -21759,7 +24859,7 @@
#>+ 3
ioDCC.moc: $(srcdir)/ioDCC.h
-@@ -1371,13 +1374,6 @@
+@@ -1372,13 +1374,6 @@
mocs: ssfeprompt.moc
#>+ 3
@@ -21773,7 +24873,7 @@
FilterRuleEditor.moc: $(srcdir)/FilterRuleEditor.h
$(MOC) $(srcdir)/FilterRuleEditor.h -o FilterRuleEditor.moc
-@@ -1392,6 +1388,13 @@
+@@ -1393,6 +1388,13 @@
mocs: ahistlineedit.moc
#>+ 3
@@ -21787,7 +24887,7 @@
alistbox.moc: $(srcdir)/alistbox.h
$(MOC) $(srcdir)/alistbox.h -o alistbox.moc
-@@ -1420,13 +1423,6 @@
+@@ -1421,13 +1423,6 @@
mocs: ksview.moc
#>+ 3
@@ -21801,7 +24901,7 @@
ioLAG.moc: $(srcdir)/ioLAG.h
$(MOC) $(srcdir)/ioLAG.h -o ioLAG.moc
-@@ -1434,18 +1430,18 @@
+@@ -1435,18 +1430,18 @@
mocs: ioLAG.moc
#>+ 3
@@ -21826,7 +24926,7 @@
#>+ 3
colorpicker.moc: $(srcdir)/colorpicker.h
-@@ -1462,6 +1458,13 @@
+@@ -1463,6 +1458,13 @@
mocs: objFinder.moc
#>+ 3
@@ -21840,7 +24940,7 @@
displayMgrMDI.moc: $(srcdir)/displayMgrMDI.h
$(MOC) $(srcdir)/displayMgrMDI.h -o displayMgrMDI.moc
-@@ -1490,18 +1493,18 @@
+@@ -1491,18 +1493,18 @@
mocs: dccToplevel.moc
#>+ 3
@@ -21865,7 +24965,7 @@
#>+ 3
dockservercontroller.moc: $(srcdir)/dockservercontroller.h
-@@ -1526,7 +1529,7 @@
+@@ -1527,7 +1529,7 @@
#>+ 3
clean-metasources:
@@ -21874,7 +24974,7 @@
#>+ 2
KDE_DIST=chanButtons.h topic.h advfollow.pl sirc.help.gz nickColourMaker.h ksircrc eventsrc displayMgrMDI.h ksircserver.h ksirc.pl Artistic stringparserstate.h FilterRuleEditor.dlg ksirc.desktop default.pl dccNewbase.ui kstextview.h charSelector.h ksircchannel.h FAQ relnotes filters.pl logfile.h colorpicker.h openksircproc.dlg FilterRuleWidget.ui servercontroller.dlg Makefile.in dsirc mditoplevel.h autodcc.pl version.h Makefile.am dccManagerbase.ui
-@@ -1580,7 +1583,7 @@
+@@ -1581,7 +1583,7 @@
#>+ 11
@@ -21883,10 +24983,25 @@
@echo 'creating libkdeinit_ksirc_la.all_cpp.cpp ...'; \
rm -f libkdeinit_ksirc_la.all_cpp.files libkdeinit_ksirc_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkdeinit_ksirc_la.all_cpp.final; \
-diff -Nru kdenetwork-3.4.1.orig/ksirc/puke/Makefile.in kdenetwork-3.4.1/ksirc/puke/Makefile.in
---- kdenetwork-3.4.1.orig/ksirc/puke/Makefile.in 2005-05-23 12:09:08.000000000 -0400
-+++ kdenetwork-3.4.1/ksirc/puke/Makefile.in 2005-05-24 13:47:23.000000000 -0400
-@@ -242,6 +242,9 @@
+diff -Nru kdenetwork-3.4.2.orig/ksirc/puke/Makefile.in kdenetwork-3.4.2/ksirc/puke/Makefile.in
+--- kdenetwork-3.4.2.orig/ksirc/puke/Makefile.in 2005-07-20 20:17:06.000000000 +0000
++++ kdenetwork-3.4.2/ksirc/puke/Makefile.in 2005-08-02 17:20:43.408892608 +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 = $(libpuke_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -243,6 +241,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21896,7 +25011,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -471,7 +474,7 @@
+@@ -472,7 +473,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21905,7 +25020,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -509,9 +512,9 @@
+@@ -510,9 +511,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21917,7 +25032,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -885,18 +888,18 @@
+@@ -886,18 +887,18 @@
mocs: ptablevw.moc
#>+ 3
@@ -21942,7 +25057,7 @@
#>+ 3
pkfiledialog.moc: $(srcdir)/pkfiledialog.h
-@@ -907,10 +910,10 @@
+@@ -908,10 +909,10 @@
#>+ 3
clean-metasources:
@@ -21955,7 +25070,7 @@
#>+ 2
docs-am:
-@@ -954,7 +957,7 @@
+@@ -955,7 +956,7 @@
#>+ 11
@@ -21964,10 +25079,25 @@
@echo 'creating libpuke_la.all_cpp.cpp ...'; \
rm -f libpuke_la.all_cpp.files libpuke_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libpuke_la.all_cpp.final; \
-diff -Nru kdenetwork-3.4.1.orig/ktalkd/kcmktalkd/Makefile.in kdenetwork-3.4.1/ktalkd/kcmktalkd/Makefile.in
---- kdenetwork-3.4.1.orig/ktalkd/kcmktalkd/Makefile.in 2005-05-23 12:09:08.000000000 -0400
-+++ kdenetwork-3.4.1/ktalkd/kcmktalkd/Makefile.in 2005-05-24 13:47:23.000000000 -0400
-@@ -239,6 +239,9 @@
+diff -Nru kdenetwork-3.4.2.orig/ktalkd/kcmktalkd/Makefile.in kdenetwork-3.4.2/ktalkd/kcmktalkd/Makefile.in
+--- kdenetwork-3.4.2.orig/ktalkd/kcmktalkd/Makefile.in 2005-07-20 20:17:06.000000000 +0000
++++ kdenetwork-3.4.2/ktalkd/kcmktalkd/Makefile.in 2005-08-02 17:20:43.458885008 +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_ktalkd_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -240,6 +238,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21977,7 +25107,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -441,7 +444,7 @@
+@@ -442,7 +443,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21986,7 +25116,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -479,9 +482,9 @@
+@@ -480,9 +481,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21998,7 +25128,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -786,18 +789,18 @@
+@@ -787,18 +788,18 @@
mocs: answmachpage.moc
#>+ 3
@@ -22023,7 +25153,7 @@
#>+ 3
forwmachpage.moc: $(srcdir)/forwmachpage.h
-@@ -808,10 +811,10 @@
+@@ -809,10 +810,10 @@
#>+ 3
clean-metasources:
@@ -22036,7 +25166,7 @@
#>+ 3
clean-closures:
-@@ -822,20 +825,20 @@
+@@ -823,20 +824,20 @@
#>+ 16
install-kde-icons:
@@ -22063,7 +25193,7 @@
#>+ 15
force-reedit:
-@@ -876,7 +879,7 @@
+@@ -877,7 +878,7 @@
#>+ 11
@@ -22072,10 +25202,25 @@
@echo 'creating kcm_ktalkd_la.all_cpp.cpp ...'; \
rm -f kcm_ktalkd_la.all_cpp.files kcm_ktalkd_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kcm_ktalkd_la.all_cpp.final; \
-diff -Nru kdenetwork-3.4.1.orig/ktalkd/ktalkd/machines/Makefile.in kdenetwork-3.4.1/ktalkd/ktalkd/machines/Makefile.in
---- kdenetwork-3.4.1.orig/ktalkd/ktalkd/machines/Makefile.in 2005-05-23 12:09:08.000000000 -0400
-+++ kdenetwork-3.4.1/ktalkd/ktalkd/machines/Makefile.in 2005-05-24 13:47:23.000000000 -0400
-@@ -235,6 +235,9 @@
+diff -Nru kdenetwork-3.4.2.orig/ktalkd/ktalkd/machines/Makefile.in kdenetwork-3.4.2/ktalkd/ktalkd/machines/Makefile.in
+--- kdenetwork-3.4.2.orig/ktalkd/ktalkd/machines/Makefile.in 2005-07-20 20:17:06.000000000 +0000
++++ kdenetwork-3.4.2/ktalkd/ktalkd/machines/Makefile.in 2005-08-02 17:20:43.502878320 +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@
+
+@@ -21,8 +21,6 @@
+ ####### Paths
+
+
+-SOURCES = $(libmach_a_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -236,6 +234,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22085,7 +25230,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -431,7 +434,7 @@
+@@ -432,7 +433,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22094,7 +25239,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -469,9 +472,9 @@
+@@ -470,9 +471,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22106,10 +25251,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLIBRARIES:
-diff -Nru kdenetwork-3.4.1.orig/ktalkd/ktalkd/Makefile.in kdenetwork-3.4.1/ktalkd/ktalkd/Makefile.in
---- kdenetwork-3.4.1.orig/ktalkd/ktalkd/Makefile.in 2005-05-23 12:09:08.000000000 -0400
-+++ kdenetwork-3.4.1/ktalkd/ktalkd/Makefile.in 2005-05-24 13:47:23.000000000 -0400
-@@ -258,6 +258,9 @@
+diff -Nru kdenetwork-3.4.2.orig/ktalkd/ktalkd/Makefile.in kdenetwork-3.4.2/ktalkd/ktalkd/Makefile.in
+--- kdenetwork-3.4.2.orig/ktalkd/ktalkd/Makefile.in 2005-07-20 20:17:06.000000000 +0000
++++ kdenetwork-3.4.2/ktalkd/ktalkd/Makefile.in 2005-08-02 17:20:43.483881208 +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 @@
+
+ # Ktalkd - Makefile.am
+
+-SOURCES = $(ktalkd_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -259,6 +257,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22119,7 +25279,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -473,7 +476,7 @@
+@@ -474,7 +475,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -22128,7 +25288,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -511,9 +514,9 @@
+@@ -512,9 +513,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22140,7 +25300,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -911,7 +914,7 @@
+@@ -912,7 +913,7 @@
.NOEXPORT:
#>+ 2
@@ -22149,10 +25309,25 @@
#>+ 2
docs-am:
-diff -Nru kdenetwork-3.4.1.orig/ktalkd/ktalkdlg/Makefile.in kdenetwork-3.4.1/ktalkd/ktalkdlg/Makefile.in
---- kdenetwork-3.4.1.orig/ktalkd/ktalkdlg/Makefile.in 2005-05-23 12:09:08.000000000 -0400
-+++ kdenetwork-3.4.1/ktalkd/ktalkdlg/Makefile.in 2005-05-24 13:47:23.000000000 -0400
-@@ -226,6 +226,9 @@
+diff -Nru kdenetwork-3.4.2.orig/ktalkd/ktalkdlg/Makefile.in kdenetwork-3.4.2/ktalkd/ktalkdlg/Makefile.in
+--- kdenetwork-3.4.2.orig/ktalkd/ktalkdlg/Makefile.in 2005-07-20 20:17:06.000000000 +0000
++++ kdenetwork-3.4.2/ktalkd/ktalkdlg/Makefile.in 2005-08-02 17:20:43.520875584 +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 @@
+
+ # Ktalkdlg - Makefile.am
+
+-SOURCES = $(ktalkdlg_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -227,6 +225,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22162,7 +25337,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -423,7 +426,7 @@
+@@ -424,7 +425,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22171,7 +25346,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
@@ -22183,10 +25358,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdenetwork-3.4.1.orig/ktalkd/mail.local/Makefile.in kdenetwork-3.4.1/ktalkd/mail.local/Makefile.in
---- kdenetwork-3.4.1.orig/ktalkd/mail.local/Makefile.in 2005-05-23 12:09:08.000000000 -0400
-+++ kdenetwork-3.4.1/ktalkd/mail.local/Makefile.in 2005-05-24 13:47:23.000000000 -0400
-@@ -220,6 +220,9 @@
+diff -Nru kdenetwork-3.4.2.orig/ktalkd/mail.local/Makefile.in kdenetwork-3.4.2/ktalkd/mail.local/Makefile.in
+--- kdenetwork-3.4.2.orig/ktalkd/mail.local/Makefile.in 2005-07-20 20:17:06.000000000 +0000
++++ kdenetwork-3.4.2/ktalkd/mail.local/Makefile.in 2005-08-02 17:20:43.537873000 +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 @@
+ # Ktalkd - mail.local/Makefile.am
+
+
+-SOURCES = $(mail_local_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -221,6 +219,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22196,7 +25386,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -415,7 +418,7 @@
+@@ -416,7 +417,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -22205,7 +25395,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
@@ -22217,10 +25407,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdenetwork-3.4.1.orig/ktalkd/Makefile.in kdenetwork-3.4.1/ktalkd/Makefile.in
---- kdenetwork-3.4.1.orig/ktalkd/Makefile.in 2005-05-23 12:09:08.000000000 -0400
-+++ kdenetwork-3.4.1/ktalkd/Makefile.in 2005-05-24 13:47:23.000000000 -0400
-@@ -207,6 +207,9 @@
+diff -Nru kdenetwork-3.4.2.orig/ktalkd/Makefile.in kdenetwork-3.4.2/ktalkd/Makefile.in
+--- kdenetwork-3.4.2.orig/ktalkd/Makefile.in 2005-07-20 20:17:06.000000000 +0000
++++ kdenetwork-3.4.2/ktalkd/Makefile.in 2005-08-02 17:20:43.424890176 +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@
+
+@@ -208,6 +208,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22230,7 +25426,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -401,7 +404,7 @@
+@@ -402,7 +405,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -22239,7 +25435,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -439,9 +442,9 @@
+@@ -440,9 +443,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22251,10 +25447,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/lanbrowsing/kcmlisa/Makefile.in kdenetwork-3.4.1/lanbrowsing/kcmlisa/Makefile.in
---- kdenetwork-3.4.1.orig/lanbrowsing/kcmlisa/Makefile.in 2005-05-23 12:09:08.000000000 -0400
-+++ kdenetwork-3.4.1/lanbrowsing/kcmlisa/Makefile.in 2005-05-24 13:47:23.000000000 -0400
-@@ -250,6 +250,9 @@
+diff -Nru kdenetwork-3.4.2.orig/lanbrowsing/kcmlisa/Makefile.in kdenetwork-3.4.2/lanbrowsing/kcmlisa/Makefile.in
+--- kdenetwork-3.4.2.orig/lanbrowsing/kcmlisa/Makefile.in 2005-07-20 20:17:06.000000000 +0000
++++ kdenetwork-3.4.2/lanbrowsing/kcmlisa/Makefile.in 2005-08-02 17:20:43.593864488 +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_lanbrowser_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -251,6 +249,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22264,7 +25475,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -451,7 +454,7 @@
+@@ -452,7 +453,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22273,7 +25484,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
@@ -22285,7 +25496,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -890,18 +893,18 @@
+@@ -891,18 +892,18 @@
#>+ 3
@@ -22310,7 +25521,7 @@
#>+ 3
kcmkiolan.moc: $(srcdir)/kcmkiolan.h
-@@ -926,7 +929,7 @@
+@@ -927,7 +928,7 @@
#>+ 3
clean-metasources:
@@ -22319,7 +25530,7 @@
#>+ 2
KDE_DIST=kcmreslisa.desktop findnic.h kcmreslisa.h kcmlisa.desktop kcmkiolan.desktop portsettingsbar.h configure.in.in kcmlisa.h Makefile.in kcmkiolan.h setupwizard.h Makefile.am
-@@ -977,7 +980,7 @@
+@@ -978,7 +979,7 @@
#>+ 11
@@ -22328,10 +25539,25 @@
@echo 'creating kcm_lanbrowser_la.all_cpp.cpp ...'; \
rm -f kcm_lanbrowser_la.all_cpp.files kcm_lanbrowser_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kcm_lanbrowser_la.all_cpp.final; \
-diff -Nru kdenetwork-3.4.1.orig/lanbrowsing/kio_lan/Makefile.in kdenetwork-3.4.1/lanbrowsing/kio_lan/Makefile.in
---- kdenetwork-3.4.1.orig/lanbrowsing/kio_lan/Makefile.in 2005-05-23 12:09:08.000000000 -0400
-+++ kdenetwork-3.4.1/lanbrowsing/kio_lan/Makefile.in 2005-05-24 13:47:23.000000000 -0400
-@@ -241,6 +241,9 @@
+diff -Nru kdenetwork-3.4.2.orig/lanbrowsing/kio_lan/Makefile.in kdenetwork-3.4.2/lanbrowsing/kio_lan/Makefile.in
+--- kdenetwork-3.4.2.orig/lanbrowsing/kio_lan/Makefile.in 2005-07-20 20:17:06.000000000 +0000
++++ kdenetwork-3.4.2/lanbrowsing/kio_lan/Makefile.in 2005-08-02 17:20:43.618860688 +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 = $(kio_lan_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -242,6 +240,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22341,7 +25567,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -452,7 +455,7 @@
+@@ -453,7 +454,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22350,7 +25576,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -490,9 +493,9 @@
+@@ -491,9 +492,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22362,10 +25588,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdenetwork-3.4.1.orig/lanbrowsing/lisa/Makefile.in kdenetwork-3.4.1/lanbrowsing/lisa/Makefile.in
---- kdenetwork-3.4.1.orig/lanbrowsing/lisa/Makefile.in 2005-05-23 12:09:08.000000000 -0400
-+++ kdenetwork-3.4.1/lanbrowsing/lisa/Makefile.in 2005-05-24 13:47:23.000000000 -0400
-@@ -253,6 +253,9 @@
+diff -Nru kdenetwork-3.4.2.orig/lanbrowsing/lisa/Makefile.in kdenetwork-3.4.2/lanbrowsing/lisa/Makefile.in
+--- kdenetwork-3.4.2.orig/lanbrowsing/lisa/Makefile.in 2005-07-20 20:17:07.000000000 +0000
++++ kdenetwork-3.4.2/lanbrowsing/lisa/Makefile.in 2005-08-02 17:20:43.642857040 +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 = $(lisa_SOURCES) $(reslisa_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -254,6 +252,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22375,7 +25616,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -477,7 +480,7 @@
+@@ -478,7 +479,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22384,7 +25625,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -515,9 +518,9 @@
+@@ -516,9 +517,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22396,10 +25637,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdenetwork-3.4.1.orig/lanbrowsing/Makefile.in kdenetwork-3.4.1/lanbrowsing/Makefile.in
---- kdenetwork-3.4.1.orig/lanbrowsing/Makefile.in 2005-05-23 12:09:08.000000000 -0400
-+++ kdenetwork-3.4.1/lanbrowsing/Makefile.in 2005-05-24 13:47:23.000000000 -0400
-@@ -204,6 +204,9 @@
+diff -Nru kdenetwork-3.4.2.orig/lanbrowsing/Makefile.in kdenetwork-3.4.2/lanbrowsing/Makefile.in
+--- kdenetwork-3.4.2.orig/lanbrowsing/Makefile.in 2005-07-20 20:17:06.000000000 +0000
++++ kdenetwork-3.4.2/lanbrowsing/Makefile.in 2005-08-02 17:20:43.551870872 +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@
+
+@@ -205,6 +205,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22409,7 +25656,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
+@@ -397,7 +400,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -22418,7 +25665,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -435,9 +438,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22430,10 +25677,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/librss/Makefile.in kdenetwork-3.4.1/librss/Makefile.in
---- kdenetwork-3.4.1.orig/librss/Makefile.in 2005-05-23 12:09:08.000000000 -0400
-+++ kdenetwork-3.4.1/librss/Makefile.in 2005-05-24 13:47:24.000000000 -0400
-@@ -245,6 +245,9 @@
+diff -Nru kdenetwork-3.4.2.orig/librss/Makefile.in kdenetwork-3.4.2/librss/Makefile.in
+--- kdenetwork-3.4.2.orig/librss/Makefile.in 2005-07-20 20:17:07.000000000 +0000
++++ kdenetwork-3.4.2/librss/Makefile.in 2005-08-02 17:20:43.674852176 +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 = $(librss_la_SOURCES) $(testlibrss_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -246,6 +244,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22443,7 +25705,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,7 +457,7 @@
+@@ -455,7 +456,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22452,7 +25714,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -492,9 +495,9 @@
+@@ -493,9 +494,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22464,7 +25726,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -818,7 +821,7 @@
+@@ -819,7 +820,7 @@
-rm -f loader.moc image.moc testlibrss.moc
#>+ 2
@@ -22473,10 +25735,16 @@
#>+ 3
clean-closures:
-diff -Nru kdenetwork-3.4.1.orig/Makefile.in kdenetwork-3.4.1/Makefile.in
---- kdenetwork-3.4.1.orig/Makefile.in 2005-05-23 12:09:01.000000000 -0400
-+++ kdenetwork-3.4.1/Makefile.in 2005-05-24 13:47:07.000000000 -0400
-@@ -221,6 +221,9 @@
+diff -Nru kdenetwork-3.4.2.orig/Makefile.in kdenetwork-3.4.2/Makefile.in
+--- kdenetwork-3.4.2.orig/Makefile.in 2005-07-20 20:16:57.000000000 +0000
++++ kdenetwork-3.4.2/Makefile.in 2005-08-02 17:20:34.152299824 +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@
+
+@@ -222,6 +222,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22486,7 +25754,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -421,7 +424,7 @@
+@@ -422,7 +425,7 @@
.SUFFIXES:
am--refresh:
@:
@@ -22495,7 +25763,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -463,12 +466,12 @@
+@@ -464,12 +467,12 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -22510,7 +25778,7 @@
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
config.h: stamp-h1
-@@ -480,7 +483,7 @@
+@@ -481,7 +484,7 @@
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
@@ -22519,7 +25787,7 @@
cd $(top_srcdir) && $(AUTOHEADER)
rm -f stamp-h1
touch $@
-@@ -897,7 +900,7 @@
+@@ -898,7 +901,7 @@
.NOEXPORT:
#>+ 2
@@ -22528,10 +25796,25 @@
#>+ 2
docs-am:
-diff -Nru kdenetwork-3.4.1.orig/wifi/kcmwifi/Makefile.in kdenetwork-3.4.1/wifi/kcmwifi/Makefile.in
---- kdenetwork-3.4.1.orig/wifi/kcmwifi/Makefile.in 2005-05-23 12:09:08.000000000 -0400
-+++ kdenetwork-3.4.1/wifi/kcmwifi/Makefile.in 2005-05-24 13:47:24.000000000 -0400
-@@ -241,6 +241,9 @@
+diff -Nru kdenetwork-3.4.2.orig/wifi/kcmwifi/Makefile.in kdenetwork-3.4.2/wifi/kcmwifi/Makefile.in
+--- kdenetwork-3.4.2.orig/wifi/kcmwifi/Makefile.in 2005-07-20 20:17:07.000000000 +0000
++++ kdenetwork-3.4.2/wifi/kcmwifi/Makefile.in 2005-08-02 17:20:43.777836520 +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_wifi_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -242,6 +240,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22541,7 +25824,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -450,7 +453,7 @@
+@@ -451,7 +452,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22550,7 +25833,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -488,9 +491,9 @@
+@@ -489,9 +490,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22562,7 +25845,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -789,22 +792,22 @@
+@@ -790,22 +791,22 @@
mocs: mainconfig.moc
#>+ 3
@@ -22592,7 +25875,7 @@
#>+ 2
KDE_DIST=mainconfigbase.ui mainconfig.h ifconfigpagebase.ui kcmwifi.desktop wificonfig.h configadvanced.ui configcrypto.ui configcrypto.ui.h configpower.ui configpower.ui.h kcmwifi.h Makefile.in ifconfigpage.h Makefile.am
-@@ -863,7 +866,7 @@
+@@ -864,7 +865,7 @@
#>+ 11
@@ -22601,10 +25884,25 @@
@echo 'creating kcm_wifi_la.all_cpp.cpp ...'; \
rm -f kcm_wifi_la.all_cpp.files kcm_wifi_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kcm_wifi_la.all_cpp.final; \
-diff -Nru kdenetwork-3.4.1.orig/wifi/kwireless/Makefile.in kdenetwork-3.4.1/wifi/kwireless/Makefile.in
---- kdenetwork-3.4.1.orig/wifi/kwireless/Makefile.in 2005-05-23 12:09:08.000000000 -0400
-+++ kdenetwork-3.4.1/wifi/kwireless/Makefile.in 2005-05-24 13:47:24.000000000 -0400
-@@ -237,6 +237,9 @@
+diff -Nru kdenetwork-3.4.2.orig/wifi/kwireless/Makefile.in kdenetwork-3.4.2/wifi/kwireless/Makefile.in
+--- kdenetwork-3.4.2.orig/wifi/kwireless/Makefile.in 2005-07-20 20:17:07.000000000 +0000
++++ kdenetwork-3.4.2/wifi/kwireless/Makefile.in 2005-08-02 17:20:43.808831808 +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 = $(libkwireless_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -238,6 +236,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22614,7 +25912,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -446,7 +449,7 @@
+@@ -447,7 +448,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22623,7 +25921,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -484,9 +487,9 @@
+@@ -485,9 +486,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22635,10 +25933,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdenetwork-3.4.1.orig/wifi/locations/Makefile.in kdenetwork-3.4.1/wifi/locations/Makefile.in
---- kdenetwork-3.4.1.orig/wifi/locations/Makefile.in 2005-05-23 12:09:08.000000000 -0400
-+++ kdenetwork-3.4.1/wifi/locations/Makefile.in 2005-05-24 13:47:24.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/wifi/locations/Makefile.in kdenetwork-3.4.2/wifi/locations/Makefile.in
+--- kdenetwork-3.4.2.orig/wifi/locations/Makefile.in 2005-07-20 20:17:07.000000000 +0000
++++ kdenetwork-3.4.2/wifi/locations/Makefile.in 2005-08-02 17:20:43.822829680 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22648,7 +25952,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -395,7 +398,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -22657,7 +25961,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -433,9 +436,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22669,10 +25973,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdenetwork-3.4.1.orig/wifi/Makefile.in kdenetwork-3.4.1/wifi/Makefile.in
---- kdenetwork-3.4.1.orig/wifi/Makefile.in 2005-05-23 12:09:08.000000000 -0400
-+++ kdenetwork-3.4.1/wifi/Makefile.in 2005-05-24 13:47:24.000000000 -0400
-@@ -266,6 +266,9 @@
+diff -Nru kdenetwork-3.4.2.orig/wifi/Makefile.in kdenetwork-3.4.2/wifi/Makefile.in
+--- kdenetwork-3.4.2.orig/wifi/Makefile.in 2005-07-20 20:17:07.000000000 +0000
++++ kdenetwork-3.4.2/wifi/Makefile.in 2005-08-02 17:20:43.746841232 +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@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(kwifimanager_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -267,6 +265,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22682,7 +26001,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -507,7 +510,7 @@
+@@ -508,7 +509,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22691,7 +26010,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -545,9 +548,9 @@
+@@ -546,9 +547,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22703,7 +26022,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1006,29 +1009,29 @@
+@@ -1007,29 +1008,29 @@
#>+ 25
install-kde-icons:
@@ -22745,10 +26064,16 @@
#>+ 15
force-reedit:
-diff -Nru kdenetwork-3.4.1.orig/wifi/pixmaps/Makefile.in kdenetwork-3.4.1/wifi/pixmaps/Makefile.in
---- kdenetwork-3.4.1.orig/wifi/pixmaps/Makefile.in 2005-05-23 12:09:08.000000000 -0400
-+++ kdenetwork-3.4.1/wifi/pixmaps/Makefile.in 2005-05-24 13:47:24.000000000 -0400
-@@ -198,6 +198,9 @@
+diff -Nru kdenetwork-3.4.2.orig/wifi/pixmaps/Makefile.in kdenetwork-3.4.2/wifi/pixmaps/Makefile.in
+--- kdenetwork-3.4.2.orig/wifi/pixmaps/Makefile.in 2005-07-20 20:17:07.000000000 +0000
++++ kdenetwork-3.4.2/wifi/pixmaps/Makefile.in 2005-08-02 17:20:43.849825576 +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@
+
+@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22758,7 +26083,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -402,7 +405,7 @@
+@@ -403,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -22767,7 +26092,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -440,9 +443,9 @@
+@@ -441,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22779,7 +26104,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -601,7 +604,7 @@
+@@ -602,7 +605,7 @@
.NOEXPORT:
#>+ 2
More information about the Pkg-kde-commits
mailing list