[Pkg-kde-commits] rev 1483 - branches/kde-3.4.0/packages/kdelibs/debian/patches

Thu Aug 18 17:20:50 UTC 2005

Author: adeodato
Date: 2005-08-18 17:20:41 +0000 (Thu, 18 Aug 2005)
New Revision: 1483

Modified:
   branches/kde-3.4.0/packages/kdelibs/debian/patches/98_buildprep.diff
Log:
Apply filter-buildprep in kdelibs. As one of the pending changes
requires a regeneration, we'll see how much diff readability improves.


Modified: branches/kde-3.4.0/packages/kdelibs/debian/patches/98_buildprep.diff
===================================================================

--- branches/kde-3.4.0/packages/kdelibs/debian/patches/98_buildprep.diff	2005-08-18 17:16:32 UTC (rev 1482)
+++ branches/kde-3.4.0/packages/kdelibs/debian/patches/98_buildprep.diff	2005-08-18 17:20:41 UTC (rev 1483)
@@ -1,6 +1,7 @@
-diff -Nru kdelibs-3.4.2.orig/acinclude.m4 kdelibs-3.4.2/acinclude.m4
---- kdelibs-3.4.2.orig/acinclude.m4	2005-07-20 17:15:17.000000000 -0400
-+++ kdelibs-3.4.2/acinclude.m4	2005-08-16 10:53:45.000000000 -0400
+#DPATCHLEVEL=0
+# vi: ft=diff
+--- acinclude.m4
++++ acinclude.m4
 @@ -1688,15 +1688,6 @@
         KDE_USE_CLOSURE_TRUE="#"
         KDE_USE_CLOSURE_FALSE=""
@@ -1516,9 +1517,8 @@
  AC_MSG_RESULT([$SED])
  ])
  
-diff -Nru kdelibs-3.4.2.orig/aclocal.m4 kdelibs-3.4.2/aclocal.m4
---- kdelibs-3.4.2.orig/aclocal.m4	2005-07-20 17:16:07.000000000 -0400
-+++ kdelibs-3.4.2/aclocal.m4	2005-08-16 10:54:13.000000000 -0400
+--- aclocal.m4
++++ aclocal.m4
 @@ -1,4 +1,4 @@
 -# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
 +# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
@@ -1570,9 +1570,8 @@
  # Check to see how 'make' treats includes.	            -*- Autoconf -*-
  
  # Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-diff -Nru kdelibs-3.4.2.orig/arts/kde/Makefile.in kdelibs-3.4.2/arts/kde/Makefile.in
---- kdelibs-3.4.2.orig/arts/kde/Makefile.in	2005-07-20 17:20:03.000000000 -0400
-+++ kdelibs-3.4.2/arts/kde/Makefile.in	2005-08-16 10:58:18.000000000 -0400
+--- arts/kde/Makefile.in
++++ arts/kde/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -1712,9 +1711,8 @@
  	@echo 'creating libartskde_la.all_cpp.cpp ...'; \
  	rm -f libartskde_la.all_cpp.files libartskde_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libartskde_la.all_cpp.final; \
-diff -Nru kdelibs-3.4.2.orig/arts/kde/mcop-dcop/Makefile.in kdelibs-3.4.2/arts/kde/mcop-dcop/Makefile.in
---- kdelibs-3.4.2.orig/arts/kde/mcop-dcop/Makefile.in	2005-07-20 17:20:03.000000000 -0400
-+++ kdelibs-3.4.2/arts/kde/mcop-dcop/Makefile.in	2005-08-16 10:58:19.000000000 -0400
+--- arts/kde/mcop-dcop/Makefile.in
++++ arts/kde/mcop-dcop/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -1774,9 +1772,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/arts/knotify/Makefile.in kdelibs-3.4.2/arts/knotify/Makefile.in
---- kdelibs-3.4.2.orig/arts/knotify/Makefile.in	2005-07-20 17:20:03.000000000 -0400
-+++ kdelibs-3.4.2/arts/knotify/Makefile.in	2005-08-16 10:58:19.000000000 -0400
+--- arts/knotify/Makefile.in
++++ arts/knotify/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -1823,9 +1820,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/arts/Makefile.in kdelibs-3.4.2/arts/Makefile.in
---- kdelibs-3.4.2.orig/arts/Makefile.in	2005-07-20 17:20:03.000000000 -0400
-+++ kdelibs-3.4.2/arts/Makefile.in	2005-08-16 10:58:18.000000000 -0400
+--- arts/Makefile.in
++++ arts/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -1872,9 +1868,8 @@
  
  #>+ 2
  docs-am:
-diff -Nru kdelibs-3.4.2.orig/arts/message/Makefile.in kdelibs-3.4.2/arts/message/Makefile.in
---- kdelibs-3.4.2.orig/arts/message/Makefile.in	2005-07-20 17:20:03.000000000 -0400
-+++ kdelibs-3.4.2/arts/message/Makefile.in	2005-08-16 10:58:19.000000000 -0400
+--- arts/message/Makefile.in
++++ arts/message/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -1921,9 +1916,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/config.h.in kdelibs-3.4.2/config.h.in
---- kdelibs-3.4.2.orig/config.h.in	2005-07-20 17:16:31.000000000 -0400
-+++ kdelibs-3.4.2/config.h.in	2005-08-16 10:54:29.000000000 -0400
+--- config.h.in
++++ config.h.in
 @@ -1037,9 +1037,6 @@
  /* execprefix or NONE if not set, for libloading */
  #undef __KDE_EXECPREFIX
@@ -1934,9 +1928,8 @@
  /* path to su */
  #undef __PATH_SU
  
-diff -Nru kdelibs-3.4.2.orig/configure kdelibs-3.4.2/configure
---- kdelibs-3.4.2.orig/configure	2005-07-20 17:20:28.000000000 -0400
-+++ kdelibs-3.4.2/configure	2005-08-16 10:58:58.000000000 -0400
+--- configure
++++ configure
 @@ -464,7 +464,7 @@
  # include <unistd.h>
  #endif"
@@ -8941,9 +8934,8 @@
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
    sed "$ac_vpsub
-diff -Nru kdelibs-3.4.2.orig/configure.in kdelibs-3.4.2/configure.in
---- kdelibs-3.4.2.orig/configure.in	2005-07-20 17:15:30.000000000 -0400
-+++ kdelibs-3.4.2/configure.in	2005-08-16 10:53:47.000000000 -0400
+--- configure.in
++++ configure.in
 @@ -23,6 +23,8 @@
  dnl Automake doc recommends to do this only here. (Janos)
  AM_INIT_AUTOMAKE(kdelibs, "3.4.2") dnl searches for some needed programs
@@ -8970,9 +8962,8 @@
  AC_CREATE_KFSSTND(default)
  AC_SUBST_KFSSTND
  
-diff -Nru kdelibs-3.4.2.orig/dcop/client/Makefile.in kdelibs-3.4.2/dcop/client/Makefile.in
---- kdelibs-3.4.2.orig/dcop/client/Makefile.in	2005-07-20 17:20:03.000000000 -0400
-+++ kdelibs-3.4.2/dcop/client/Makefile.in	2005-08-16 10:58:19.000000000 -0400
+--- dcop/client/Makefile.in
++++ dcop/client/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -9019,9 +9010,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/dcop/dcopidl/Makefile.in kdelibs-3.4.2/dcop/dcopidl/Makefile.in
---- kdelibs-3.4.2.orig/dcop/dcopidl/Makefile.in	2005-07-20 17:20:03.000000000 -0400
-+++ kdelibs-3.4.2/dcop/dcopidl/Makefile.in	2005-08-16 10:58:19.000000000 -0400
+--- dcop/dcopidl/Makefile.in
++++ dcop/dcopidl/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -9068,9 +9058,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/dcop/dcopidl2cpp/Makefile.in kdelibs-3.4.2/dcop/dcopidl2cpp/Makefile.in
---- kdelibs-3.4.2.orig/dcop/dcopidl2cpp/Makefile.in	2005-07-20 17:20:04.000000000 -0400
-+++ kdelibs-3.4.2/dcop/dcopidl2cpp/Makefile.in	2005-08-16 10:58:19.000000000 -0400
+--- dcop/dcopidl2cpp/Makefile.in
++++ dcop/dcopidl2cpp/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -9117,9 +9106,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/dcop/dcopidlng/Makefile.in kdelibs-3.4.2/dcop/dcopidlng/Makefile.in
---- kdelibs-3.4.2.orig/dcop/dcopidlng/Makefile.in	2005-07-20 17:20:04.000000000 -0400
-+++ kdelibs-3.4.2/dcop/dcopidlng/Makefile.in	2005-08-16 10:58:20.000000000 -0400
+--- dcop/dcopidlng/Makefile.in
++++ dcop/dcopidlng/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -9166,9 +9154,8 @@
  
  #>+ 2
  docs-am:
-diff -Nru kdelibs-3.4.2.orig/dcop/KDE-ICE/Makefile.in kdelibs-3.4.2/dcop/KDE-ICE/Makefile.in
---- kdelibs-3.4.2.orig/dcop/KDE-ICE/Makefile.in	2005-07-20 17:20:03.000000000 -0400
-+++ kdelibs-3.4.2/dcop/KDE-ICE/Makefile.in	2005-08-16 10:58:19.000000000 -0400
+--- dcop/KDE-ICE/Makefile.in
++++ dcop/KDE-ICE/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -9215,9 +9202,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nru kdelibs-3.4.2.orig/dcop/Makefile.in kdelibs-3.4.2/dcop/Makefile.in
---- kdelibs-3.4.2.orig/dcop/Makefile.in	2005-07-20 17:20:03.000000000 -0400
-+++ kdelibs-3.4.2/dcop/Makefile.in	2005-08-16 10:58:19.000000000 -0400
+--- dcop/Makefile.in
++++ dcop/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -9334,9 +9320,8 @@
  libkdeinit_dcopserver.la: $(libkdeinit_dcopserver_la_OBJECTS) $(libkdeinit_dcopserver_la_DEPENDENCIES)
  	$(CXXLINK) -rpath $(libdir) $(libkdeinit_dcopserver_la_LDFLAGS) $(libkdeinit_dcopserver_la_OBJECTS) $(libkdeinit_dcopserver_la_LIBADD) $(LIBS)
  
-diff -Nru kdelibs-3.4.2.orig/dcop/tests/Makefile.in kdelibs-3.4.2/dcop/tests/Makefile.in
---- kdelibs-3.4.2.orig/dcop/tests/Makefile.in	2005-07-20 17:20:04.000000000 -0400
-+++ kdelibs-3.4.2/dcop/tests/Makefile.in	2005-08-16 10:58:20.000000000 -0400
+--- dcop/tests/Makefile.in
++++ dcop/tests/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -9383,9 +9368,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstPROGRAMS:
-diff -Nru kdelibs-3.4.2.orig/dnssd/Makefile.in kdelibs-3.4.2/dnssd/Makefile.in
---- kdelibs-3.4.2.orig/dnssd/Makefile.in	2005-07-20 17:20:04.000000000 -0400
-+++ kdelibs-3.4.2/dnssd/Makefile.in	2005-08-16 10:58:20.000000000 -0400
+--- dnssd/Makefile.in
++++ dnssd/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -9432,9 +9416,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/doc/common/Makefile.in kdelibs-3.4.2/doc/common/Makefile.in
---- kdelibs-3.4.2.orig/doc/common/Makefile.in	2005-07-20 17:20:04.000000000 -0400
-+++ kdelibs-3.4.2/doc/common/Makefile.in	2005-08-16 10:58:20.000000000 -0400
+--- doc/common/Makefile.in
++++ doc/common/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -9481,9 +9464,8 @@
  
  #>+ 2
  docs-am:
-diff -Nru kdelibs-3.4.2.orig/doc/kdelibs/Makefile.in kdelibs-3.4.2/doc/kdelibs/Makefile.in
---- kdelibs-3.4.2.orig/doc/kdelibs/Makefile.in	2005-07-20 17:20:04.000000000 -0400
-+++ kdelibs-3.4.2/doc/kdelibs/Makefile.in	2005-08-16 10:58:20.000000000 -0400
+--- doc/kdelibs/Makefile.in
++++ doc/kdelibs/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -9521,9 +9503,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nru kdelibs-3.4.2.orig/doc/kspell/Makefile.in kdelibs-3.4.2/doc/kspell/Makefile.in
---- kdelibs-3.4.2.orig/doc/kspell/Makefile.in	2005-07-20 17:20:04.000000000 -0400
-+++ kdelibs-3.4.2/doc/kspell/Makefile.in	2005-08-16 10:58:20.000000000 -0400
+--- doc/kspell/Makefile.in
++++ doc/kspell/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -9561,9 +9542,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nru kdelibs-3.4.2.orig/doc/Makefile.in kdelibs-3.4.2/doc/Makefile.in
---- kdelibs-3.4.2.orig/doc/Makefile.in	2005-07-20 17:20:04.000000000 -0400
-+++ kdelibs-3.4.2/doc/Makefile.in	2005-08-16 10:58:20.000000000 -0400
+--- doc/Makefile.in
++++ doc/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -9601,9 +9581,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nru kdelibs-3.4.2.orig/interfaces/khexedit/Makefile.in kdelibs-3.4.2/interfaces/khexedit/Makefile.in
---- kdelibs-3.4.2.orig/interfaces/khexedit/Makefile.in	2005-07-20 17:20:04.000000000 -0400
-+++ kdelibs-3.4.2/interfaces/khexedit/Makefile.in	2005-08-16 10:58:20.000000000 -0400
+--- interfaces/khexedit/Makefile.in
++++ interfaces/khexedit/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -9641,9 +9620,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nru kdelibs-3.4.2.orig/interfaces/kimproxy/interface/Makefile.in kdelibs-3.4.2/interfaces/kimproxy/interface/Makefile.in
---- kdelibs-3.4.2.orig/interfaces/kimproxy/interface/Makefile.in	2005-07-20 17:20:04.000000000 -0400
-+++ kdelibs-3.4.2/interfaces/kimproxy/interface/Makefile.in	2005-08-16 10:58:20.000000000 -0400
+--- interfaces/kimproxy/interface/Makefile.in
++++ interfaces/kimproxy/interface/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -9681,9 +9659,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nru kdelibs-3.4.2.orig/interfaces/kimproxy/library/icons/Makefile.in kdelibs-3.4.2/interfaces/kimproxy/library/icons/Makefile.in
---- kdelibs-3.4.2.orig/interfaces/kimproxy/library/icons/Makefile.in	2005-07-20 17:20:04.000000000 -0400
-+++ kdelibs-3.4.2/interfaces/kimproxy/library/icons/Makefile.in	2005-08-16 10:58:20.000000000 -0400
+--- interfaces/kimproxy/library/icons/Makefile.in
++++ interfaces/kimproxy/library/icons/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -9768,9 +9745,8 @@
  
  #>+ 15
  force-reedit:
-diff -Nru kdelibs-3.4.2.orig/interfaces/kimproxy/library/Makefile.in kdelibs-3.4.2/interfaces/kimproxy/library/Makefile.in
---- kdelibs-3.4.2.orig/interfaces/kimproxy/library/Makefile.in	2005-07-20 17:20:04.000000000 -0400
-+++ kdelibs-3.4.2/interfaces/kimproxy/library/Makefile.in	2005-08-16 10:58:20.000000000 -0400
+--- interfaces/kimproxy/library/Makefile.in
++++ interfaces/kimproxy/library/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -9817,9 +9793,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/interfaces/kimproxy/Makefile.in kdelibs-3.4.2/interfaces/kimproxy/Makefile.in
---- kdelibs-3.4.2.orig/interfaces/kimproxy/Makefile.in	2005-07-20 17:20:04.000000000 -0400
-+++ kdelibs-3.4.2/interfaces/kimproxy/Makefile.in	2005-08-16 10:58:20.000000000 -0400
+--- interfaces/kimproxy/Makefile.in
++++ interfaces/kimproxy/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -9857,9 +9832,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nru kdelibs-3.4.2.orig/interfaces/kio/Makefile.in kdelibs-3.4.2/interfaces/kio/Makefile.in
---- kdelibs-3.4.2.orig/interfaces/kio/Makefile.in	2005-07-20 17:20:04.000000000 -0400
-+++ kdelibs-3.4.2/interfaces/kio/Makefile.in	2005-08-16 10:58:20.000000000 -0400
+--- interfaces/kio/Makefile.in
++++ interfaces/kio/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -9897,9 +9871,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nru kdelibs-3.4.2.orig/interfaces/kmediaplayer/kfileaudiopreview/Makefile.in kdelibs-3.4.2/interfaces/kmediaplayer/kfileaudiopreview/Makefile.in
---- kdelibs-3.4.2.orig/interfaces/kmediaplayer/kfileaudiopreview/Makefile.in	2005-07-20 17:20:04.000000000 -0400
-+++ kdelibs-3.4.2/interfaces/kmediaplayer/kfileaudiopreview/Makefile.in	2005-08-16 10:58:21.000000000 -0400
+--- interfaces/kmediaplayer/kfileaudiopreview/Makefile.in
++++ interfaces/kmediaplayer/kfileaudiopreview/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -9946,9 +9919,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/interfaces/kmediaplayer/Makefile.in kdelibs-3.4.2/interfaces/kmediaplayer/Makefile.in
---- kdelibs-3.4.2.orig/interfaces/kmediaplayer/Makefile.in	2005-07-20 17:20:04.000000000 -0400
-+++ kdelibs-3.4.2/interfaces/kmediaplayer/Makefile.in	2005-08-16 10:58:21.000000000 -0400
+--- interfaces/kmediaplayer/Makefile.in
++++ interfaces/kmediaplayer/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -9995,9 +9967,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/interfaces/kregexpeditor/Makefile.in kdelibs-3.4.2/interfaces/kregexpeditor/Makefile.in
---- kdelibs-3.4.2.orig/interfaces/kregexpeditor/Makefile.in	2005-07-20 17:20:04.000000000 -0400
-+++ kdelibs-3.4.2/interfaces/kregexpeditor/Makefile.in	2005-08-16 10:58:21.000000000 -0400
+--- interfaces/kregexpeditor/Makefile.in
++++ interfaces/kregexpeditor/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -10035,9 +10006,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nru kdelibs-3.4.2.orig/interfaces/kscript/Makefile.in kdelibs-3.4.2/interfaces/kscript/Makefile.in
---- kdelibs-3.4.2.orig/interfaces/kscript/Makefile.in	2005-07-20 17:20:04.000000000 -0400
-+++ kdelibs-3.4.2/interfaces/kscript/Makefile.in	2005-08-16 10:58:21.000000000 -0400
+--- interfaces/kscript/Makefile.in
++++ interfaces/kscript/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -10084,9 +10054,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/interfaces/kscript/sample/Makefile.in kdelibs-3.4.2/interfaces/kscript/sample/Makefile.in
---- kdelibs-3.4.2.orig/interfaces/kscript/sample/Makefile.in	2005-07-20 17:20:04.000000000 -0400
-+++ kdelibs-3.4.2/interfaces/kscript/sample/Makefile.in	2005-08-16 10:58:21.000000000 -0400
+--- interfaces/kscript/sample/Makefile.in
++++ interfaces/kscript/sample/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -10133,9 +10102,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/interfaces/kspeech/Makefile.in kdelibs-3.4.2/interfaces/kspeech/Makefile.in
---- kdelibs-3.4.2.orig/interfaces/kspeech/Makefile.in	2005-07-20 17:20:04.000000000 -0400
-+++ kdelibs-3.4.2/interfaces/kspeech/Makefile.in	2005-08-16 10:58:21.000000000 -0400
+--- interfaces/kspeech/Makefile.in
++++ interfaces/kspeech/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -10173,9 +10141,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nru kdelibs-3.4.2.orig/interfaces/ktexteditor/Makefile.in kdelibs-3.4.2/interfaces/ktexteditor/Makefile.in
---- kdelibs-3.4.2.orig/interfaces/ktexteditor/Makefile.in	2005-07-20 17:20:05.000000000 -0400
-+++ kdelibs-3.4.2/interfaces/ktexteditor/Makefile.in	2005-08-16 10:58:21.000000000 -0400
+--- interfaces/ktexteditor/Makefile.in
++++ interfaces/ktexteditor/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -10261,9 +10228,8 @@
  	@echo 'creating libktexteditor_la.all_cpp.cpp ...'; \
  	rm -f libktexteditor_la.all_cpp.files libktexteditor_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libktexteditor_la.all_cpp.final; \
-diff -Nru kdelibs-3.4.2.orig/interfaces/Makefile.in kdelibs-3.4.2/interfaces/Makefile.in
---- kdelibs-3.4.2.orig/interfaces/Makefile.in	2005-07-20 17:20:04.000000000 -0400
-+++ kdelibs-3.4.2/interfaces/Makefile.in	2005-08-16 10:58:20.000000000 -0400
+--- interfaces/Makefile.in
++++ interfaces/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -10301,9 +10267,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nru kdelibs-3.4.2.orig/interfaces/terminal/Makefile.in kdelibs-3.4.2/interfaces/terminal/Makefile.in
---- kdelibs-3.4.2.orig/interfaces/terminal/Makefile.in	2005-07-20 17:20:05.000000000 -0400
-+++ kdelibs-3.4.2/interfaces/terminal/Makefile.in	2005-08-16 10:58:21.000000000 -0400
+--- interfaces/terminal/Makefile.in
++++ interfaces/terminal/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -10341,9 +10306,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nru kdelibs-3.4.2.orig/interfaces/terminal/test/Makefile.in kdelibs-3.4.2/interfaces/terminal/test/Makefile.in
---- kdelibs-3.4.2.orig/interfaces/terminal/test/Makefile.in	2005-07-20 17:20:05.000000000 -0400
-+++ kdelibs-3.4.2/interfaces/terminal/test/Makefile.in	2005-08-16 10:58:21.000000000 -0400
+--- interfaces/terminal/test/Makefile.in
++++ interfaces/terminal/test/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -10390,9 +10354,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-checkPROGRAMS:
-diff -Nru kdelibs-3.4.2.orig/kab/Makefile.in kdelibs-3.4.2/kab/Makefile.in
---- kdelibs-3.4.2.orig/kab/Makefile.in	2005-07-20 17:20:05.000000000 -0400
-+++ kdelibs-3.4.2/kab/Makefile.in	2005-08-16 10:58:21.000000000 -0400
+--- kab/Makefile.in
++++ kab/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -10482,9 +10445,8 @@
  	@echo 'creating libkab_la.all_cc.cc ...'; \
  	rm -f libkab_la.all_cc.files libkab_la.all_cc.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkab_la.all_cc.final; \
-diff -Nru kdelibs-3.4.2.orig/kabc/formats/Makefile.in kdelibs-3.4.2/kabc/formats/Makefile.in
---- kdelibs-3.4.2.orig/kabc/formats/Makefile.in	2005-07-20 17:20:05.000000000 -0400
-+++ kdelibs-3.4.2/kabc/formats/Makefile.in	2005-08-16 10:58:24.000000000 -0400
+--- kabc/formats/Makefile.in
++++ kabc/formats/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -10531,9 +10493,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kabc/Makefile.in kdelibs-3.4.2/kabc/Makefile.in
---- kdelibs-3.4.2.orig/kabc/Makefile.in	2005-07-20 17:20:05.000000000 -0400
-+++ kdelibs-3.4.2/kabc/Makefile.in	2005-08-16 10:58:24.000000000 -0400
+--- kabc/Makefile.in
++++ kabc/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -10666,9 +10627,8 @@
  	@echo 'creating libkabc_la.all_cpp.cpp ...'; \
  	rm -f libkabc_la.all_cpp.files libkabc_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkabc_la.all_cpp.final; \
-diff -Nru kdelibs-3.4.2.orig/kabc/plugins/dir/Makefile.in kdelibs-3.4.2/kabc/plugins/dir/Makefile.in
---- kdelibs-3.4.2.orig/kabc/plugins/dir/Makefile.in	2005-07-20 17:20:05.000000000 -0400
-+++ kdelibs-3.4.2/kabc/plugins/dir/Makefile.in	2005-08-16 10:58:24.000000000 -0400
+--- kabc/plugins/dir/Makefile.in
++++ kabc/plugins/dir/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -10715,9 +10675,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kabc/plugins/evolution/Makefile.in kdelibs-3.4.2/kabc/plugins/evolution/Makefile.in
---- kdelibs-3.4.2.orig/kabc/plugins/evolution/Makefile.in	2005-07-20 17:20:05.000000000 -0400
-+++ kdelibs-3.4.2/kabc/plugins/evolution/Makefile.in	2005-08-16 10:58:24.000000000 -0400
+--- kabc/plugins/evolution/Makefile.in
++++ kabc/plugins/evolution/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -10764,9 +10723,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kabc/plugins/file/Makefile.in kdelibs-3.4.2/kabc/plugins/file/Makefile.in
---- kdelibs-3.4.2.orig/kabc/plugins/file/Makefile.in	2005-07-20 17:20:05.000000000 -0400
-+++ kdelibs-3.4.2/kabc/plugins/file/Makefile.in	2005-08-16 10:58:25.000000000 -0400
+--- kabc/plugins/file/Makefile.in
++++ kabc/plugins/file/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -10813,9 +10771,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kabc/plugins/ldapkio/Makefile.in kdelibs-3.4.2/kabc/plugins/ldapkio/Makefile.in
---- kdelibs-3.4.2.orig/kabc/plugins/ldapkio/Makefile.in	2005-07-20 17:20:05.000000000 -0400
-+++ kdelibs-3.4.2/kabc/plugins/ldapkio/Makefile.in	2005-08-16 10:58:25.000000000 -0400
+--- kabc/plugins/ldapkio/Makefile.in
++++ kabc/plugins/ldapkio/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -10862,9 +10819,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kabc/plugins/Makefile.in kdelibs-3.4.2/kabc/plugins/Makefile.in
---- kdelibs-3.4.2.orig/kabc/plugins/Makefile.in	2005-07-20 17:20:05.000000000 -0400
-+++ kdelibs-3.4.2/kabc/plugins/Makefile.in	2005-08-16 10:58:24.000000000 -0400
+--- kabc/plugins/Makefile.in
++++ kabc/plugins/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -10902,9 +10858,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nru kdelibs-3.4.2.orig/kabc/plugins/net/Makefile.in kdelibs-3.4.2/kabc/plugins/net/Makefile.in
---- kdelibs-3.4.2.orig/kabc/plugins/net/Makefile.in	2005-07-20 17:20:05.000000000 -0400
-+++ kdelibs-3.4.2/kabc/plugins/net/Makefile.in	2005-08-16 10:58:25.000000000 -0400
+--- kabc/plugins/net/Makefile.in
++++ kabc/plugins/net/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -10951,9 +10906,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kabc/plugins/sql/Makefile.in kdelibs-3.4.2/kabc/plugins/sql/Makefile.in
---- kdelibs-3.4.2.orig/kabc/plugins/sql/Makefile.in	2005-07-20 17:20:06.000000000 -0400
-+++ kdelibs-3.4.2/kabc/plugins/sql/Makefile.in	2005-08-16 10:58:25.000000000 -0400
+--- kabc/plugins/sql/Makefile.in
++++ kabc/plugins/sql/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -11000,9 +10954,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kabc/scripts/Makefile.in kdelibs-3.4.2/kabc/scripts/Makefile.in
---- kdelibs-3.4.2.orig/kabc/scripts/Makefile.in	2005-07-20 17:20:06.000000000 -0400
-+++ kdelibs-3.4.2/kabc/scripts/Makefile.in	2005-08-16 10:58:25.000000000 -0400
+--- kabc/scripts/Makefile.in
++++ kabc/scripts/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -11040,9 +10993,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nru kdelibs-3.4.2.orig/kabc/vcard/Makefile.in kdelibs-3.4.2/kabc/vcard/Makefile.in
---- kdelibs-3.4.2.orig/kabc/vcard/Makefile.in	2005-07-20 17:20:06.000000000 -0400
-+++ kdelibs-3.4.2/kabc/vcard/Makefile.in	2005-08-16 10:58:25.000000000 -0400
+--- kabc/vcard/Makefile.in
++++ kabc/vcard/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -11098,9 +11050,8 @@
  
  #>+ 2
  docs-am:
-diff -Nru kdelibs-3.4.2.orig/kabc/vcardparser/Makefile.in kdelibs-3.4.2/kabc/vcardparser/Makefile.in
---- kdelibs-3.4.2.orig/kabc/vcardparser/Makefile.in	2005-07-20 17:20:06.000000000 -0400
-+++ kdelibs-3.4.2/kabc/vcardparser/Makefile.in	2005-08-16 10:58:25.000000000 -0400
+--- kabc/vcardparser/Makefile.in
++++ kabc/vcardparser/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -11147,9 +11098,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nru kdelibs-3.4.2.orig/kate/data/Makefile.in kdelibs-3.4.2/kate/data/Makefile.in
---- kdelibs-3.4.2.orig/kate/data/Makefile.in	2005-07-20 17:20:06.000000000 -0400
-+++ kdelibs-3.4.2/kate/data/Makefile.in	2005-08-16 10:58:25.000000000 -0400
+--- kate/data/Makefile.in
++++ kate/data/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -11196,9 +11146,8 @@
  
  #>+ 2
  docs-am:
-diff -Nru kdelibs-3.4.2.orig/kate/interfaces/Makefile.in kdelibs-3.4.2/kate/interfaces/Makefile.in
---- kdelibs-3.4.2.orig/kate/interfaces/Makefile.in	2005-07-20 17:20:06.000000000 -0400
-+++ kdelibs-3.4.2/kate/interfaces/Makefile.in	2005-08-16 10:58:25.000000000 -0400
+--- kate/interfaces/Makefile.in
++++ kate/interfaces/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -11245,9 +11194,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kate/Makefile.in kdelibs-3.4.2/kate/Makefile.in
---- kdelibs-3.4.2.orig/kate/Makefile.in	2005-07-20 17:20:06.000000000 -0400
-+++ kdelibs-3.4.2/kate/Makefile.in	2005-08-16 10:58:25.000000000 -0400
+--- kate/Makefile.in
++++ kate/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -11285,9 +11233,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nru kdelibs-3.4.2.orig/kate/part/Makefile.in kdelibs-3.4.2/kate/part/Makefile.in
---- kdelibs-3.4.2.orig/kate/part/Makefile.in	2005-07-20 17:20:06.000000000 -0400
-+++ kdelibs-3.4.2/kate/part/Makefile.in	2005-08-16 10:58:26.000000000 -0400
+--- kate/part/Makefile.in
++++ kate/part/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -11484,9 +11431,8 @@
  katefiletype.lo: katefiletype.moc 
  kateview.lo: kateview.moc 
  nmcheck: 
-diff -Nru kdelibs-3.4.2.orig/kate/plugins/autobookmarker/Makefile.in kdelibs-3.4.2/kate/plugins/autobookmarker/Makefile.in
---- kdelibs-3.4.2.orig/kate/plugins/autobookmarker/Makefile.in	2005-07-20 17:20:06.000000000 -0400
-+++ kdelibs-3.4.2/kate/plugins/autobookmarker/Makefile.in	2005-08-16 10:58:26.000000000 -0400
+--- kate/plugins/autobookmarker/Makefile.in
++++ kate/plugins/autobookmarker/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -11533,9 +11479,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kate/plugins/insertfile/Makefile.in kdelibs-3.4.2/kate/plugins/insertfile/Makefile.in
---- kdelibs-3.4.2.orig/kate/plugins/insertfile/Makefile.in	2005-07-20 17:20:06.000000000 -0400
-+++ kdelibs-3.4.2/kate/plugins/insertfile/Makefile.in	2005-08-16 10:58:26.000000000 -0400
+--- kate/plugins/insertfile/Makefile.in
++++ kate/plugins/insertfile/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -11582,9 +11527,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kate/plugins/isearch/Makefile.in kdelibs-3.4.2/kate/plugins/isearch/Makefile.in
---- kdelibs-3.4.2.orig/kate/plugins/isearch/Makefile.in	2005-07-20 17:20:06.000000000 -0400
-+++ kdelibs-3.4.2/kate/plugins/isearch/Makefile.in	2005-08-16 10:58:26.000000000 -0400
+--- kate/plugins/isearch/Makefile.in
++++ kate/plugins/isearch/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -11631,9 +11575,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kate/plugins/kdatatool/Makefile.in kdelibs-3.4.2/kate/plugins/kdatatool/Makefile.in
---- kdelibs-3.4.2.orig/kate/plugins/kdatatool/Makefile.in	2005-07-20 17:20:06.000000000 -0400
-+++ kdelibs-3.4.2/kate/plugins/kdatatool/Makefile.in	2005-08-16 10:58:26.000000000 -0400
+--- kate/plugins/kdatatool/Makefile.in
++++ kate/plugins/kdatatool/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -11680,9 +11623,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kate/plugins/Makefile.in kdelibs-3.4.2/kate/plugins/Makefile.in
---- kdelibs-3.4.2.orig/kate/plugins/Makefile.in	2005-07-20 17:20:06.000000000 -0400
-+++ kdelibs-3.4.2/kate/plugins/Makefile.in	2005-08-16 10:58:26.000000000 -0400
+--- kate/plugins/Makefile.in
++++ kate/plugins/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -11720,9 +11662,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nru kdelibs-3.4.2.orig/kate/plugins/wordcompletion/Makefile.in kdelibs-3.4.2/kate/plugins/wordcompletion/Makefile.in
---- kdelibs-3.4.2.orig/kate/plugins/wordcompletion/Makefile.in	2005-07-20 17:20:06.000000000 -0400
-+++ kdelibs-3.4.2/kate/plugins/wordcompletion/Makefile.in	2005-08-16 10:58:26.000000000 -0400
+--- kate/plugins/wordcompletion/Makefile.in
++++ kate/plugins/wordcompletion/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -11769,9 +11710,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kcert/Makefile.in kdelibs-3.4.2/kcert/Makefile.in
---- kdelibs-3.4.2.orig/kcert/Makefile.in	2005-07-20 17:20:06.000000000 -0400
-+++ kdelibs-3.4.2/kcert/Makefile.in	2005-08-16 10:58:26.000000000 -0400
+--- kcert/Makefile.in
++++ kcert/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -11818,9 +11758,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kcmshell/Makefile.in kdelibs-3.4.2/kcmshell/Makefile.in
---- kdelibs-3.4.2.orig/kcmshell/Makefile.in	2005-07-20 17:20:06.000000000 -0400
-+++ kdelibs-3.4.2/kcmshell/Makefile.in	2005-08-16 10:58:26.000000000 -0400
+--- kcmshell/Makefile.in
++++ kcmshell/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -11880,9 +11819,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kconf_update/Makefile.in kdelibs-3.4.2/kconf_update/Makefile.in
---- kdelibs-3.4.2.orig/kconf_update/Makefile.in	2005-07-20 17:20:06.000000000 -0400
-+++ kdelibs-3.4.2/kconf_update/Makefile.in	2005-08-16 10:58:26.000000000 -0400
+--- kconf_update/Makefile.in
++++ kconf_update/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -11942,9 +11880,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kdecore/kconfig_compiler/Makefile.in kdelibs-3.4.2/kdecore/kconfig_compiler/Makefile.in
---- kdelibs-3.4.2.orig/kdecore/kconfig_compiler/Makefile.in	2005-07-20 17:20:08.000000000 -0400
-+++ kdelibs-3.4.2/kdecore/kconfig_compiler/Makefile.in	2005-08-16 10:58:28.000000000 -0400
+--- kdecore/kconfig_compiler/Makefile.in
++++ kdecore/kconfig_compiler/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -11991,9 +11928,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kdecore/kconfig_compiler/tests/Makefile.in kdelibs-3.4.2/kdecore/kconfig_compiler/tests/Makefile.in
---- kdelibs-3.4.2.orig/kdecore/kconfig_compiler/tests/Makefile.in	2005-07-20 17:20:08.000000000 -0400
-+++ kdelibs-3.4.2/kdecore/kconfig_compiler/tests/Makefile.in	2005-08-16 10:58:28.000000000 -0400
+--- kdecore/kconfig_compiler/tests/Makefile.in
++++ kdecore/kconfig_compiler/tests/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -12049,9 +11985,8 @@
  
  #>+ 2
  docs-am:
-diff -Nru kdelibs-3.4.2.orig/kdecore/Makefile.in kdelibs-3.4.2/kdecore/Makefile.in
---- kdelibs-3.4.2.orig/kdecore/Makefile.in	2005-07-20 17:20:08.000000000 -0400
-+++ kdelibs-3.4.2/kdecore/Makefile.in	2005-08-16 10:58:28.000000000 -0400
+--- kdecore/Makefile.in
++++ kdecore/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -12200,9 +12135,8 @@
  	@echo 'creating libkdecore_la.all_cpp.cpp ...'; \
  	rm -f libkdecore_la.all_cpp.files libkdecore_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkdecore_la.all_cpp.final; \
-diff -Nru kdelibs-3.4.2.orig/kdecore/malloc/Makefile.in kdelibs-3.4.2/kdecore/malloc/Makefile.in
---- kdelibs-3.4.2.orig/kdecore/malloc/Makefile.in	2005-07-20 17:20:08.000000000 -0400
-+++ kdelibs-3.4.2/kdecore/malloc/Makefile.in	2005-08-16 10:58:28.000000000 -0400
+--- kdecore/malloc/Makefile.in
++++ kdecore/malloc/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -12249,9 +12183,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nru kdelibs-3.4.2.orig/kdecore/network/Makefile.in kdelibs-3.4.2/kdecore/network/Makefile.in
---- kdelibs-3.4.2.orig/kdecore/network/Makefile.in	2005-07-20 17:20:08.000000000 -0400
-+++ kdelibs-3.4.2/kdecore/network/Makefile.in	2005-08-16 10:58:28.000000000 -0400
+--- kdecore/network/Makefile.in
++++ kdecore/network/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -12351,9 +12284,8 @@
 +kdatagramsocket.lo: kdatagramsocket.moc 
  kresolver.o: kresolver.moc 
  kclientsocketbase.lo: kclientsocketbase.moc 
-diff -Nru kdelibs-3.4.2.orig/kdecore/svgicons/Makefile.in kdelibs-3.4.2/kdecore/svgicons/Makefile.in
---- kdelibs-3.4.2.orig/kdecore/svgicons/Makefile.in	2005-07-20 17:20:08.000000000 -0400
-+++ kdelibs-3.4.2/kdecore/svgicons/Makefile.in	2005-08-16 10:58:28.000000000 -0400
+--- kdecore/svgicons/Makefile.in
++++ kdecore/svgicons/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -12400,9 +12332,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nru kdelibs-3.4.2.orig/kdecore/tests/Makefile.in kdelibs-3.4.2/kdecore/tests/Makefile.in
---- kdelibs-3.4.2.orig/kdecore/tests/Makefile.in	2005-07-20 17:20:08.000000000 -0400
-+++ kdelibs-3.4.2/kdecore/tests/Makefile.in	2005-08-16 10:58:29.000000000 -0400
+--- kdecore/tests/Makefile.in
++++ kdecore/tests/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -12483,9 +12414,8 @@
  
  #>+ 2
  KDE_DIST=Makefile.in Makefile.am 
-diff -Nru kdelibs-3.4.2.orig/kded/Makefile.in kdelibs-3.4.2/kded/Makefile.in
---- kdelibs-3.4.2.orig/kded/Makefile.in	2005-07-20 17:20:08.000000000 -0400
-+++ kdelibs-3.4.2/kded/Makefile.in	2005-08-16 10:58:29.000000000 -0400
+--- kded/Makefile.in
++++ kded/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -12581,9 +12511,8 @@
  
  #>+ 2
  KDE_DIST=DESIGN kded.upd Makefile.in HOWTO vfolder_menu.h applications.menu kded.h kdedmodule.desktop README.kded kctimefactory.h Makefile.am 
-diff -Nru kdelibs-3.4.2.orig/kded/test/Makefile.in kdelibs-3.4.2/kded/test/Makefile.in
---- kdelibs-3.4.2.orig/kded/test/Makefile.in	2005-07-20 17:20:08.000000000 -0400
-+++ kdelibs-3.4.2/kded/test/Makefile.in	2005-08-16 10:58:29.000000000 -0400
+--- kded/test/Makefile.in
++++ kded/test/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -12630,9 +12559,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kdefx/Makefile.in kdelibs-3.4.2/kdefx/Makefile.in
---- kdelibs-3.4.2.orig/kdefx/Makefile.in	2005-07-20 17:20:08.000000000 -0400
-+++ kdelibs-3.4.2/kdefx/Makefile.in	2005-08-16 10:58:30.000000000 -0400
+--- kdefx/Makefile.in
++++ kdefx/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -12679,9 +12607,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kdeprint/cups/cupsdconf2/Makefile.in kdelibs-3.4.2/kdeprint/cups/cupsdconf2/Makefile.in
---- kdelibs-3.4.2.orig/kdeprint/cups/cupsdconf2/Makefile.in	2005-07-20 17:20:09.000000000 -0400
-+++ kdelibs-3.4.2/kdeprint/cups/cupsdconf2/Makefile.in	2005-08-16 10:58:31.000000000 -0400
+--- kdeprint/cups/cupsdconf2/Makefile.in
++++ kdeprint/cups/cupsdconf2/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -12789,9 +12716,8 @@
  	@echo 'creating cupsdconf_la.all_cpp.cpp ...'; \
  	rm -f cupsdconf_la.all_cpp.files cupsdconf_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> cupsdconf_la.all_cpp.final; \
-diff -Nru kdelibs-3.4.2.orig/kdeprint/cups/Makefile.in kdelibs-3.4.2/kdeprint/cups/Makefile.in
---- kdelibs-3.4.2.orig/kdeprint/cups/Makefile.in	2005-07-20 17:20:09.000000000 -0400
-+++ kdelibs-3.4.2/kdeprint/cups/Makefile.in	2005-08-16 10:58:31.000000000 -0400
+--- kdeprint/cups/Makefile.in
++++ kdeprint/cups/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -12881,9 +12807,8 @@
  	@echo 'creating kdeprint_cups_la.all_cpp.cpp ...'; \
  	rm -f kdeprint_cups_la.all_cpp.files kdeprint_cups_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> kdeprint_cups_la.all_cpp.final; \
-diff -Nru kdelibs-3.4.2.orig/kdeprint/ext/Makefile.in kdelibs-3.4.2/kdeprint/ext/Makefile.in
---- kdelibs-3.4.2.orig/kdeprint/ext/Makefile.in	2005-07-20 17:20:09.000000000 -0400
-+++ kdelibs-3.4.2/kdeprint/ext/Makefile.in	2005-08-16 10:58:31.000000000 -0400
+--- kdeprint/ext/Makefile.in
++++ kdeprint/ext/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -12930,9 +12855,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kdeprint/filters/Makefile.in kdelibs-3.4.2/kdeprint/filters/Makefile.in
---- kdelibs-3.4.2.orig/kdeprint/filters/Makefile.in	2005-07-20 17:20:09.000000000 -0400
-+++ kdelibs-3.4.2/kdeprint/filters/Makefile.in	2005-08-16 10:58:31.000000000 -0400
+--- kdeprint/filters/Makefile.in
++++ kdeprint/filters/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -12970,9 +12894,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binSCRIPTS: $(bin_SCRIPTS)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kdeprint/foomatic/Makefile.in kdelibs-3.4.2/kdeprint/foomatic/Makefile.in
---- kdelibs-3.4.2.orig/kdeprint/foomatic/Makefile.in	2005-07-20 17:20:09.000000000 -0400
-+++ kdelibs-3.4.2/kdeprint/foomatic/Makefile.in	2005-08-16 10:58:31.000000000 -0400
+--- kdeprint/foomatic/Makefile.in
++++ kdeprint/foomatic/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -13019,9 +12942,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kdeprint/lpd/Makefile.in kdelibs-3.4.2/kdeprint/lpd/Makefile.in
---- kdelibs-3.4.2.orig/kdeprint/lpd/Makefile.in	2005-07-20 17:20:09.000000000 -0400
-+++ kdelibs-3.4.2/kdeprint/lpd/Makefile.in	2005-08-16 10:58:31.000000000 -0400
+--- kdeprint/lpd/Makefile.in
++++ kdeprint/lpd/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -13068,9 +12990,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kdeprint/lpdunix/Makefile.in kdelibs-3.4.2/kdeprint/lpdunix/Makefile.in
---- kdelibs-3.4.2.orig/kdeprint/lpdunix/Makefile.in	2005-07-20 17:20:09.000000000 -0400
-+++ kdelibs-3.4.2/kdeprint/lpdunix/Makefile.in	2005-08-16 10:58:31.000000000 -0400
+--- kdeprint/lpdunix/Makefile.in
++++ kdeprint/lpdunix/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -13117,9 +13038,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kdeprint/lpr/Makefile.in kdelibs-3.4.2/kdeprint/lpr/Makefile.in
---- kdelibs-3.4.2.orig/kdeprint/lpr/Makefile.in	2005-07-20 17:20:09.000000000 -0400
-+++ kdelibs-3.4.2/kdeprint/lpr/Makefile.in	2005-08-16 10:58:32.000000000 -0400
+--- kdeprint/lpr/Makefile.in
++++ kdeprint/lpr/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -13166,9 +13086,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kdeprint/Makefile.in kdelibs-3.4.2/kdeprint/Makefile.in
---- kdelibs-3.4.2.orig/kdeprint/Makefile.in	2005-07-20 17:20:09.000000000 -0400
-+++ kdelibs-3.4.2/kdeprint/Makefile.in	2005-08-16 10:58:31.000000000 -0400
+--- kdeprint/Makefile.in
++++ kdeprint/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -13372,9 +13291,8 @@
  
  #>+ 2
  KDE_DIST=ppdparser.y testprint.ps kdeprintrc.upd Makefile.in specials.desktop fooparser.cpp.h kdeprintrc configure.in.in kdeprintd.desktop signal_proc.c ppdscanner.l ppdparser.cpp.h Makefile.am 
-diff -Nru kdelibs-3.4.2.orig/kdeprint/management/Makefile.in kdelibs-3.4.2/kdeprint/management/Makefile.in
---- kdelibs-3.4.2.orig/kdeprint/management/Makefile.in	2005-07-20 17:20:09.000000000 -0400
-+++ kdelibs-3.4.2/kdeprint/management/Makefile.in	2005-08-16 10:58:32.000000000 -0400
+--- kdeprint/management/Makefile.in
++++ kdeprint/management/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -13621,9 +13539,8 @@
  kmwdriverselect.lo: kmwdriverselect.moc 
  kmdriverdbwidget.o: kmdriverdbwidget.moc 
  pluginaction.lo: pluginaction.moc 
-diff -Nru kdelibs-3.4.2.orig/kdeprint/pics/Makefile.in kdelibs-3.4.2/kdeprint/pics/Makefile.in
---- kdelibs-3.4.2.orig/kdeprint/pics/Makefile.in	2005-07-20 17:20:10.000000000 -0400
-+++ kdelibs-3.4.2/kdeprint/pics/Makefile.in	2005-08-16 10:58:32.000000000 -0400
+--- kdeprint/pics/Makefile.in
++++ kdeprint/pics/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -13886,9 +13803,8 @@
  
  #>+ 15
  force-reedit:
-diff -Nru kdelibs-3.4.2.orig/kdeprint/rlpr/Makefile.in kdelibs-3.4.2/kdeprint/rlpr/Makefile.in
---- kdelibs-3.4.2.orig/kdeprint/rlpr/Makefile.in	2005-07-20 17:20:10.000000000 -0400
-+++ kdelibs-3.4.2/kdeprint/rlpr/Makefile.in	2005-08-16 10:58:33.000000000 -0400
+--- kdeprint/rlpr/Makefile.in
++++ kdeprint/rlpr/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -13935,9 +13851,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kdeprint/tests/Makefile.in kdelibs-3.4.2/kdeprint/tests/Makefile.in
---- kdelibs-3.4.2.orig/kdeprint/tests/Makefile.in	2005-07-20 17:20:10.000000000 -0400
-+++ kdelibs-3.4.2/kdeprint/tests/Makefile.in	2005-08-16 10:58:33.000000000 -0400
+--- kdeprint/tests/Makefile.in
++++ kdeprint/tests/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -13984,9 +13899,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-checkPROGRAMS:
-diff -Nru kdelibs-3.4.2.orig/kdeprint/tools/escputil/Makefile.in kdelibs-3.4.2/kdeprint/tools/escputil/Makefile.in
---- kdelibs-3.4.2.orig/kdeprint/tools/escputil/Makefile.in	2005-07-20 17:20:10.000000000 -0400
-+++ kdelibs-3.4.2/kdeprint/tools/escputil/Makefile.in	2005-08-16 10:58:33.000000000 -0400
+--- kdeprint/tools/escputil/Makefile.in
++++ kdeprint/tools/escputil/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -14033,9 +13947,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kdeprint/tools/Makefile.in kdelibs-3.4.2/kdeprint/tools/Makefile.in
---- kdelibs-3.4.2.orig/kdeprint/tools/Makefile.in	2005-07-20 17:20:10.000000000 -0400
-+++ kdelibs-3.4.2/kdeprint/tools/Makefile.in	2005-08-16 10:58:33.000000000 -0400
+--- kdeprint/tools/Makefile.in
++++ kdeprint/tools/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -14073,9 +13986,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nru kdelibs-3.4.2.orig/kdesu/Makefile.in kdelibs-3.4.2/kdesu/Makefile.in
---- kdelibs-3.4.2.orig/kdesu/Makefile.in	2005-07-20 17:20:10.000000000 -0400
-+++ kdelibs-3.4.2/kdesu/Makefile.in	2005-08-16 10:58:33.000000000 -0400
+--- kdesu/Makefile.in
++++ kdesu/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -14122,9 +14034,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kdeui/about/Makefile.in kdelibs-3.4.2/kdeui/about/Makefile.in
---- kdelibs-3.4.2.orig/kdeui/about/Makefile.in	2005-07-20 17:20:11.000000000 -0400
-+++ kdelibs-3.4.2/kdeui/about/Makefile.in	2005-08-16 10:58:35.000000000 -0400
+--- kdeui/about/Makefile.in
++++ kdeui/about/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -14162,9 +14073,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nru kdelibs-3.4.2.orig/kdeui/colors/Makefile.in kdelibs-3.4.2/kdeui/colors/Makefile.in
---- kdelibs-3.4.2.orig/kdeui/colors/Makefile.in	2005-07-20 17:20:11.000000000 -0400
-+++ kdelibs-3.4.2/kdeui/colors/Makefile.in	2005-08-16 10:58:35.000000000 -0400
+--- kdeui/colors/Makefile.in
++++ kdeui/colors/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -14202,9 +14112,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nru kdelibs-3.4.2.orig/kdeui/kdetrayproxy/Makefile.in kdelibs-3.4.2/kdeui/kdetrayproxy/Makefile.in
---- kdelibs-3.4.2.orig/kdeui/kdetrayproxy/Makefile.in	2005-07-20 17:20:11.000000000 -0400
-+++ kdelibs-3.4.2/kdeui/kdetrayproxy/Makefile.in	2005-08-16 10:58:35.000000000 -0400
+--- kdeui/kdetrayproxy/Makefile.in
++++ kdeui/kdetrayproxy/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -14251,9 +14160,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kdeui/Makefile.in kdelibs-3.4.2/kdeui/Makefile.in
---- kdelibs-3.4.2.orig/kdeui/Makefile.in	2005-07-20 17:20:11.000000000 -0400
-+++ kdelibs-3.4.2/kdeui/Makefile.in	2005-08-16 10:58:35.000000000 -0400
+--- kdeui/Makefile.in
++++ kdeui/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -14630,9 +14538,8 @@
  	@echo 'creating libkdeui_la.all_cpp.cpp ...'; \
  	rm -f libkdeui_la.all_cpp.files libkdeui_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkdeui_la.all_cpp.final; \
-diff -Nru kdelibs-3.4.2.orig/kdeui/tests/Makefile.in kdelibs-3.4.2/kdeui/tests/Makefile.in
---- kdelibs-3.4.2.orig/kdeui/tests/Makefile.in	2005-07-20 17:20:11.000000000 -0400
-+++ kdelibs-3.4.2/kdeui/tests/Makefile.in	2005-08-16 10:58:36.000000000 -0400
+--- kdeui/tests/Makefile.in
++++ kdeui/tests/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -14763,9 +14670,8 @@
  
  #>+ 2
  KDE_DIST=kdockwidgettest.h background_1.png kmainwindowtest.h Makefile.in kmainwindowrestoretest.h ktoolbarlabelactiontestui.rc ktabwidgettest.h kcompletiontest.h kstatusbartest.h kxmlguitest_shell.rc kunbalancedgrdtest.h ktabctltest.h kdocktest.h knuminputtest.h kdualcolortest.h RayTracedGear.png khashtest.h kwindowtest.h klineedittest.h kledtest.h kcomboboxtest.h kdockwidgetdemo.h krulertest.h kcolortest.h kalphaicontest.h kblendtest.h kgradienttest.h itemcontainertest.h kxmlguitest_part.rc kpanelmenutest.h testimage.png go.png kdesattest.h Makefile.am 
-diff -Nru kdelibs-3.4.2.orig/kdewidgets/Makefile.in kdelibs-3.4.2/kdewidgets/Makefile.in
---- kdelibs-3.4.2.orig/kdewidgets/Makefile.in	2005-07-20 17:20:11.000000000 -0400
-+++ kdelibs-3.4.2/kdewidgets/Makefile.in	2005-08-16 10:58:36.000000000 -0400
+--- kdewidgets/Makefile.in
++++ kdewidgets/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -14812,9 +14718,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_widgetLTLIBRARIES: $(kde_widget_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kdewidgets/pics/Makefile.in kdelibs-3.4.2/kdewidgets/pics/Makefile.in
---- kdelibs-3.4.2.orig/kdewidgets/pics/Makefile.in	2005-07-20 17:20:11.000000000 -0400
-+++ kdelibs-3.4.2/kdewidgets/pics/Makefile.in	2005-08-16 10:58:36.000000000 -0400
+--- kdewidgets/pics/Makefile.in
++++ kdewidgets/pics/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -14852,9 +14757,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nru kdelibs-3.4.2.orig/kdewidgets/tests/Makefile.in kdelibs-3.4.2/kdewidgets/tests/Makefile.in
---- kdelibs-3.4.2.orig/kdewidgets/tests/Makefile.in	2005-07-20 17:20:11.000000000 -0400
-+++ kdelibs-3.4.2/kdewidgets/tests/Makefile.in	2005-08-16 10:58:36.000000000 -0400
+--- kdewidgets/tests/Makefile.in
++++ kdewidgets/tests/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -14892,9 +14796,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nru kdelibs-3.4.2.orig/kdoctools/Makefile.in kdelibs-3.4.2/kdoctools/Makefile.in
---- kdelibs-3.4.2.orig/kdoctools/Makefile.in	2005-07-20 17:20:12.000000000 -0400
-+++ kdelibs-3.4.2/kdoctools/Makefile.in	2005-08-16 10:58:36.000000000 -0400
+--- kdoctools/Makefile.in
++++ kdoctools/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -14941,9 +14844,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  checkXML: $(top_builddir)/config.status $(srcdir)/checkXML.in
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-diff -Nru kdelibs-3.4.2.orig/khtml/css/Makefile.in kdelibs-3.4.2/khtml/css/Makefile.in
---- kdelibs-3.4.2.orig/khtml/css/Makefile.in	2005-07-20 17:20:13.000000000 -0400
-+++ kdelibs-3.4.2/khtml/css/Makefile.in	2005-08-16 10:58:39.000000000 -0400
+--- khtml/css/Makefile.in
++++ khtml/css/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -14999,9 +14901,8 @@
  
  #>+ 2
  docs-am:
-diff -Nru kdelibs-3.4.2.orig/khtml/dom/Makefile.in kdelibs-3.4.2/khtml/dom/Makefile.in
---- kdelibs-3.4.2.orig/khtml/dom/Makefile.in	2005-07-20 17:20:13.000000000 -0400
-+++ kdelibs-3.4.2/khtml/dom/Makefile.in	2005-08-16 10:58:40.000000000 -0400
+--- khtml/dom/Makefile.in
++++ khtml/dom/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -15048,9 +14949,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nru kdelibs-3.4.2.orig/khtml/ecma/Makefile.in kdelibs-3.4.2/khtml/ecma/Makefile.in
---- kdelibs-3.4.2.orig/khtml/ecma/Makefile.in	2005-07-20 17:20:13.000000000 -0400
-+++ kdelibs-3.4.2/khtml/ecma/Makefile.in	2005-08-16 10:58:40.000000000 -0400
+--- khtml/ecma/Makefile.in
++++ khtml/ecma/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -15097,9 +14997,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nru kdelibs-3.4.2.orig/khtml/html/Makefile.in kdelibs-3.4.2/khtml/html/Makefile.in
---- kdelibs-3.4.2.orig/khtml/html/Makefile.in	2005-07-20 17:20:13.000000000 -0400
-+++ kdelibs-3.4.2/khtml/html/Makefile.in	2005-08-16 10:58:40.000000000 -0400
+--- khtml/html/Makefile.in
++++ khtml/html/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -15146,9 +15045,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nru kdelibs-3.4.2.orig/khtml/java/dummy/Makefile.in kdelibs-3.4.2/khtml/java/dummy/Makefile.in
---- kdelibs-3.4.2.orig/khtml/java/dummy/Makefile.in	2005-07-20 17:20:13.000000000 -0400
-+++ kdelibs-3.4.2/khtml/java/dummy/Makefile.in	2005-08-16 10:58:40.000000000 -0400
+--- khtml/java/dummy/Makefile.in
++++ khtml/java/dummy/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -15195,9 +15093,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/khtml/java/Makefile.in kdelibs-3.4.2/khtml/java/Makefile.in
---- kdelibs-3.4.2.orig/khtml/java/Makefile.in	2005-07-20 17:20:13.000000000 -0400
-+++ kdelibs-3.4.2/khtml/java/Makefile.in	2005-08-16 10:58:40.000000000 -0400
+--- khtml/java/Makefile.in
++++ khtml/java/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -15324,9 +15221,8 @@
  kjavadownloader.lo: kjavadownloader.moc 
  kjavaapplet.lo: kjavaapplet.moc 
  nmcheck: 
-diff -Nru kdelibs-3.4.2.orig/khtml/java/tests/Makefile.in kdelibs-3.4.2/khtml/java/tests/Makefile.in
---- kdelibs-3.4.2.orig/khtml/java/tests/Makefile.in	2005-07-20 17:20:13.000000000 -0400
-+++ kdelibs-3.4.2/khtml/java/tests/Makefile.in	2005-08-16 10:58:41.000000000 -0400
+--- khtml/java/tests/Makefile.in
++++ khtml/java/tests/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -15373,9 +15269,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-checkPROGRAMS:
-diff -Nru kdelibs-3.4.2.orig/khtml/kmultipart/Makefile.in kdelibs-3.4.2/khtml/kmultipart/Makefile.in
---- kdelibs-3.4.2.orig/khtml/kmultipart/Makefile.in	2005-07-20 17:20:13.000000000 -0400
-+++ kdelibs-3.4.2/khtml/kmultipart/Makefile.in	2005-08-16 10:58:41.000000000 -0400
+--- khtml/kmultipart/Makefile.in
++++ khtml/kmultipart/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -15422,9 +15317,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/khtml/Makefile.in kdelibs-3.4.2/khtml/Makefile.in
---- kdelibs-3.4.2.orig/khtml/Makefile.in	2005-07-20 17:20:13.000000000 -0400
-+++ kdelibs-3.4.2/khtml/Makefile.in	2005-08-16 10:58:39.000000000 -0400
+--- khtml/Makefile.in
++++ khtml/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -15471,9 +15365,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/khtml/misc/Makefile.in kdelibs-3.4.2/khtml/misc/Makefile.in
---- kdelibs-3.4.2.orig/khtml/misc/Makefile.in	2005-07-20 17:20:13.000000000 -0400
-+++ kdelibs-3.4.2/khtml/misc/Makefile.in	2005-08-16 10:58:41.000000000 -0400
+--- khtml/misc/Makefile.in
++++ khtml/misc/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -15520,9 +15413,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nru kdelibs-3.4.2.orig/khtml/pics/Makefile.in kdelibs-3.4.2/khtml/pics/Makefile.in
---- kdelibs-3.4.2.orig/khtml/pics/Makefile.in	2005-07-20 17:20:13.000000000 -0400
-+++ kdelibs-3.4.2/khtml/pics/Makefile.in	2005-08-16 10:58:42.000000000 -0400
+--- khtml/pics/Makefile.in
++++ khtml/pics/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -15614,9 +15506,8 @@
  	-rm -f $(DESTDIR)$(khtmliconsdir)/crystalsvg/22x22/actions/images_display.png
  
  #>+ 15
-diff -Nru kdelibs-3.4.2.orig/khtml/rendering/Makefile.in kdelibs-3.4.2/khtml/rendering/Makefile.in
---- kdelibs-3.4.2.orig/khtml/rendering/Makefile.in	2005-07-20 17:20:13.000000000 -0400
-+++ kdelibs-3.4.2/khtml/rendering/Makefile.in	2005-08-16 10:58:43.000000000 -0400
+--- khtml/rendering/Makefile.in
++++ khtml/rendering/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -15715,9 +15606,8 @@
 +render_form.lo: render_form.moc 
  render_frames.lo: render_frames.moc 
  render_layer.lo: render_layer.moc 
-diff -Nru kdelibs-3.4.2.orig/khtml/xml/Makefile.in kdelibs-3.4.2/khtml/xml/Makefile.in
---- kdelibs-3.4.2.orig/khtml/xml/Makefile.in	2005-07-20 17:20:13.000000000 -0400
-+++ kdelibs-3.4.2/khtml/xml/Makefile.in	2005-08-16 10:58:43.000000000 -0400
+--- khtml/xml/Makefile.in
++++ khtml/xml/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -15764,9 +15654,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nru kdelibs-3.4.2.orig/kimgio/Makefile.in kdelibs-3.4.2/kimgio/Makefile.in
---- kdelibs-3.4.2.orig/kimgio/Makefile.in	2005-07-20 17:20:14.000000000 -0400
-+++ kdelibs-3.4.2/kimgio/Makefile.in	2005-08-16 10:58:43.000000000 -0400
+--- kimgio/Makefile.in
++++ kimgio/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -15813,9 +15702,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kinit/Makefile.in kdelibs-3.4.2/kinit/Makefile.in
---- kdelibs-3.4.2.orig/kinit/Makefile.in	2005-07-20 17:20:14.000000000 -0400
-+++ kdelibs-3.4.2/kinit/Makefile.in	2005-08-16 10:58:44.000000000 -0400
+--- kinit/Makefile.in
++++ kinit/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -15881,9 +15769,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kinit/tests/Makefile.in kdelibs-3.4.2/kinit/tests/Makefile.in
---- kdelibs-3.4.2.orig/kinit/tests/Makefile.in	2005-07-20 17:20:14.000000000 -0400
-+++ kdelibs-3.4.2/kinit/tests/Makefile.in	2005-08-16 10:58:44.000000000 -0400
+--- kinit/tests/Makefile.in
++++ kinit/tests/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -15930,9 +15817,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-checkPROGRAMS:
-diff -Nru kdelibs-3.4.2.orig/kio/bookmarks/Makefile.in kdelibs-3.4.2/kio/bookmarks/Makefile.in
---- kdelibs-3.4.2.orig/kio/bookmarks/Makefile.in	2005-07-20 17:20:14.000000000 -0400
-+++ kdelibs-3.4.2/kio/bookmarks/Makefile.in	2005-08-16 10:58:45.000000000 -0400
+--- kio/bookmarks/Makefile.in
++++ kio/bookmarks/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -15979,9 +15865,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nru kdelibs-3.4.2.orig/kio/httpfilter/Makefile.in kdelibs-3.4.2/kio/httpfilter/Makefile.in
---- kdelibs-3.4.2.orig/kio/httpfilter/Makefile.in	2005-07-20 17:20:14.000000000 -0400
-+++ kdelibs-3.4.2/kio/httpfilter/Makefile.in	2005-08-16 10:58:45.000000000 -0400
+--- kio/httpfilter/Makefile.in
++++ kio/httpfilter/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -16028,9 +15913,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nru kdelibs-3.4.2.orig/kio/kfile/Makefile.in kdelibs-3.4.2/kio/kfile/Makefile.in
---- kdelibs-3.4.2.orig/kio/kfile/Makefile.in	2005-07-20 17:20:15.000000000 -0400
-+++ kdelibs-3.4.2/kio/kfile/Makefile.in	2005-08-16 10:58:45.000000000 -0400
+--- kio/kfile/Makefile.in
++++ kio/kfile/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -16441,9 +16325,8 @@
  $(srcdir)/kfiletreeviewitem.cpp: knotifywidgetbase.h kpropertiesdesktopbase.h kpropertiesdesktopadvbase.h kpropertiesmimetypebase.h $(srcdir)/../kio/kdirnotify_stub.h 
  $(srcdir)/kpropertiesdialog.cpp: knotifywidgetbase.h kpropertiesdesktopbase.h kpropertiesdesktopadvbase.h kpropertiesmimetypebase.h $(srcdir)/../kio/kdirnotify_stub.h 
  kurlrequester.o: kurlrequester.moc 
-diff -Nru kdelibs-3.4.2.orig/kio/kfile/tests/Makefile.in kdelibs-3.4.2/kio/kfile/tests/Makefile.in
---- kdelibs-3.4.2.orig/kio/kfile/tests/Makefile.in	2005-07-20 17:20:15.000000000 -0400
-+++ kdelibs-3.4.2/kio/kfile/tests/Makefile.in	2005-08-16 10:58:45.000000000 -0400
+--- kio/kfile/tests/Makefile.in
++++ kio/kfile/tests/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -16490,9 +16373,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-checkPROGRAMS:
-diff -Nru kdelibs-3.4.2.orig/kio/kio/Makefile.in kdelibs-3.4.2/kio/kio/Makefile.in
---- kdelibs-3.4.2.orig/kio/kio/Makefile.in	2005-07-20 17:20:17.000000000 -0400
-+++ kdelibs-3.4.2/kio/kio/Makefile.in	2005-08-16 10:58:46.000000000 -0400
+--- kio/kio/Makefile.in
++++ kio/kio/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -16712,9 +16594,8 @@
  kshellcompletion.o: kshellcompletion.moc 
  dataslave.lo: dataslave.moc 
  $(srcdir)/tcpslavebase.cpp: observer_stub.h uiserver_stub.h 
-diff -Nru kdelibs-3.4.2.orig/kio/kioexec/Makefile.in kdelibs-3.4.2/kio/kioexec/Makefile.in
---- kdelibs-3.4.2.orig/kio/kioexec/Makefile.in	2005-07-20 17:20:17.000000000 -0400
-+++ kdelibs-3.4.2/kio/kioexec/Makefile.in	2005-08-16 10:58:46.000000000 -0400
+--- kio/kioexec/Makefile.in
++++ kio/kioexec/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -16761,9 +16642,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kio/kpasswdserver/Makefile.in kdelibs-3.4.2/kio/kpasswdserver/Makefile.in
---- kdelibs-3.4.2.orig/kio/kpasswdserver/Makefile.in	2005-07-20 17:20:17.000000000 -0400
-+++ kdelibs-3.4.2/kio/kpasswdserver/Makefile.in	2005-08-16 10:58:46.000000000 -0400
+--- kio/kpasswdserver/Makefile.in
++++ kio/kpasswdserver/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -16810,9 +16690,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kio/kssl/kssl/caroot/Makefile.in kdelibs-3.4.2/kio/kssl/kssl/caroot/Makefile.in
---- kdelibs-3.4.2.orig/kio/kssl/kssl/caroot/Makefile.in	2005-07-20 17:20:17.000000000 -0400
-+++ kdelibs-3.4.2/kio/kssl/kssl/caroot/Makefile.in	2005-08-16 10:58:47.000000000 -0400
+--- kio/kssl/kssl/caroot/Makefile.in
++++ kio/kssl/kssl/caroot/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -16850,9 +16729,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nru kdelibs-3.4.2.orig/kio/kssl/kssl/Makefile.in kdelibs-3.4.2/kio/kssl/kssl/Makefile.in
---- kdelibs-3.4.2.orig/kio/kssl/kssl/Makefile.in	2005-07-20 17:20:17.000000000 -0400
-+++ kdelibs-3.4.2/kio/kssl/kssl/Makefile.in	2005-08-16 10:58:46.000000000 -0400
+--- kio/kssl/kssl/Makefile.in
++++ kio/kssl/kssl/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -16890,9 +16768,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nru kdelibs-3.4.2.orig/kio/kssl/Makefile.in kdelibs-3.4.2/kio/kssl/Makefile.in
---- kdelibs-3.4.2.orig/kio/kssl/Makefile.in	2005-07-20 17:20:17.000000000 -0400
-+++ kdelibs-3.4.2/kio/kssl/Makefile.in	2005-08-16 10:58:46.000000000 -0400
+--- kio/kssl/Makefile.in
++++ kio/kssl/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -16948,9 +16825,8 @@
  	cd $(top_srcdir) && $(AUTOHEADER)
  	rm -f stamp-h4
  	touch $@
-diff -Nru kdelibs-3.4.2.orig/kio/Makefile.in kdelibs-3.4.2/kio/Makefile.in
---- kdelibs-3.4.2.orig/kio/Makefile.in	2005-07-20 17:20:14.000000000 -0400
-+++ kdelibs-3.4.2/kio/Makefile.in	2005-08-16 10:58:44.000000000 -0400
+--- kio/Makefile.in
++++ kio/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -16997,9 +16873,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kio/misc/kdesasl/Makefile.in kdelibs-3.4.2/kio/misc/kdesasl/Makefile.in
---- kdelibs-3.4.2.orig/kio/misc/kdesasl/Makefile.in	2005-07-20 17:20:17.000000000 -0400
-+++ kdelibs-3.4.2/kio/misc/kdesasl/Makefile.in	2005-08-16 10:58:47.000000000 -0400
+--- kio/misc/kdesasl/Makefile.in
++++ kio/misc/kdesasl/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -17046,9 +16921,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kio/misc/kfile/Makefile.in kdelibs-3.4.2/kio/misc/kfile/Makefile.in
---- kdelibs-3.4.2.orig/kio/misc/kfile/Makefile.in	2005-07-20 17:20:17.000000000 -0400
-+++ kdelibs-3.4.2/kio/misc/kfile/Makefile.in	2005-08-16 10:58:47.000000000 -0400
+--- kio/misc/kfile/Makefile.in
++++ kio/misc/kfile/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -17095,9 +16969,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kio/misc/kntlm/Makefile.in kdelibs-3.4.2/kio/misc/kntlm/Makefile.in
---- kdelibs-3.4.2.orig/kio/misc/kntlm/Makefile.in	2005-07-20 17:20:17.000000000 -0400
-+++ kdelibs-3.4.2/kio/misc/kntlm/Makefile.in	2005-08-16 10:58:47.000000000 -0400
+--- kio/misc/kntlm/Makefile.in
++++ kio/misc/kntlm/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -17144,9 +17017,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kio/misc/kpac/Makefile.in kdelibs-3.4.2/kio/misc/kpac/Makefile.in
---- kdelibs-3.4.2.orig/kio/misc/kpac/Makefile.in	2005-07-20 17:20:17.000000000 -0400
-+++ kdelibs-3.4.2/kio/misc/kpac/Makefile.in	2005-08-16 10:58:47.000000000 -0400
+--- kio/misc/kpac/Makefile.in
++++ kio/misc/kpac/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -17193,9 +17065,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kio/misc/ksendbugmail/Makefile.in kdelibs-3.4.2/kio/misc/ksendbugmail/Makefile.in
---- kdelibs-3.4.2.orig/kio/misc/ksendbugmail/Makefile.in	2005-07-20 17:20:17.000000000 -0400
-+++ kdelibs-3.4.2/kio/misc/ksendbugmail/Makefile.in	2005-08-16 10:58:47.000000000 -0400
+--- kio/misc/ksendbugmail/Makefile.in
++++ kio/misc/ksendbugmail/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -17242,9 +17113,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kio/misc/kssld/Makefile.in kdelibs-3.4.2/kio/misc/kssld/Makefile.in
---- kdelibs-3.4.2.orig/kio/misc/kssld/Makefile.in	2005-07-20 17:20:17.000000000 -0400
-+++ kdelibs-3.4.2/kio/misc/kssld/Makefile.in	2005-08-16 10:58:47.000000000 -0400
+--- kio/misc/kssld/Makefile.in
++++ kio/misc/kssld/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -17291,9 +17161,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kio/misc/kwalletd/Makefile.in kdelibs-3.4.2/kio/misc/kwalletd/Makefile.in
---- kdelibs-3.4.2.orig/kio/misc/kwalletd/Makefile.in	2005-07-20 17:20:17.000000000 -0400
-+++ kdelibs-3.4.2/kio/misc/kwalletd/Makefile.in	2005-08-16 10:58:47.000000000 -0400
+--- kio/misc/kwalletd/Makefile.in
++++ kio/misc/kwalletd/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -17340,9 +17209,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kio/misc/Makefile.in kdelibs-3.4.2/kio/misc/Makefile.in
---- kdelibs-3.4.2.orig/kio/misc/Makefile.in	2005-07-20 17:20:17.000000000 -0400
-+++ kdelibs-3.4.2/kio/misc/Makefile.in	2005-08-16 10:58:47.000000000 -0400
+--- kio/misc/Makefile.in
++++ kio/misc/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -17404,9 +17272,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kio/pics/Makefile.in kdelibs-3.4.2/kio/pics/Makefile.in
---- kdelibs-3.4.2.orig/kio/pics/Makefile.in	2005-07-20 17:20:17.000000000 -0400
-+++ kdelibs-3.4.2/kio/pics/Makefile.in	2005-08-16 10:58:47.000000000 -0400
+--- kio/pics/Makefile.in
++++ kio/pics/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -17444,9 +17311,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nru kdelibs-3.4.2.orig/kio/tests/Makefile.in kdelibs-3.4.2/kio/tests/Makefile.in
---- kdelibs-3.4.2.orig/kio/tests/Makefile.in	2005-07-20 17:20:18.000000000 -0400
-+++ kdelibs-3.4.2/kio/tests/Makefile.in	2005-08-16 10:58:47.000000000 -0400
+--- kio/tests/Makefile.in
++++ kio/tests/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -17493,9 +17359,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kioslave/bzip2/Makefile.in kdelibs-3.4.2/kioslave/bzip2/Makefile.in
---- kdelibs-3.4.2.orig/kioslave/bzip2/Makefile.in	2005-07-20 17:20:18.000000000 -0400
-+++ kdelibs-3.4.2/kioslave/bzip2/Makefile.in	2005-08-16 10:58:47.000000000 -0400
+--- kioslave/bzip2/Makefile.in
++++ kioslave/bzip2/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -17542,9 +17407,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kioslave/file/Makefile.in kdelibs-3.4.2/kioslave/file/Makefile.in
---- kdelibs-3.4.2.orig/kioslave/file/Makefile.in	2005-07-20 17:20:18.000000000 -0400
-+++ kdelibs-3.4.2/kioslave/file/Makefile.in	2005-08-16 10:58:47.000000000 -0400
+--- kioslave/file/Makefile.in
++++ kioslave/file/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -17591,9 +17455,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kioslave/ftp/Makefile.in kdelibs-3.4.2/kioslave/ftp/Makefile.in
---- kdelibs-3.4.2.orig/kioslave/ftp/Makefile.in	2005-07-20 17:20:18.000000000 -0400
-+++ kdelibs-3.4.2/kioslave/ftp/Makefile.in	2005-08-16 10:58:47.000000000 -0400
+--- kioslave/ftp/Makefile.in
++++ kioslave/ftp/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -17640,9 +17503,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kioslave/gzip/Makefile.in kdelibs-3.4.2/kioslave/gzip/Makefile.in
---- kdelibs-3.4.2.orig/kioslave/gzip/Makefile.in	2005-07-20 17:20:18.000000000 -0400
-+++ kdelibs-3.4.2/kioslave/gzip/Makefile.in	2005-08-16 10:58:47.000000000 -0400
+--- kioslave/gzip/Makefile.in
++++ kioslave/gzip/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -17689,9 +17551,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kioslave/http/kcookiejar/Makefile.in kdelibs-3.4.2/kioslave/http/kcookiejar/Makefile.in
---- kdelibs-3.4.2.orig/kioslave/http/kcookiejar/Makefile.in	2005-07-20 17:20:18.000000000 -0400
-+++ kdelibs-3.4.2/kioslave/http/kcookiejar/Makefile.in	2005-08-16 10:58:48.000000000 -0400
+--- kioslave/http/kcookiejar/Makefile.in
++++ kioslave/http/kcookiejar/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -17801,9 +17662,8 @@
 -kcookiewin.o: kcookiewin.moc 
  kcookieserver.o: kcookieserver.moc 
 +kcookiewin.o: kcookiewin.moc 
-diff -Nru kdelibs-3.4.2.orig/kioslave/http/kcookiejar/tests/Makefile.in kdelibs-3.4.2/kioslave/http/kcookiejar/tests/Makefile.in
---- kdelibs-3.4.2.orig/kioslave/http/kcookiejar/tests/Makefile.in	2005-07-20 17:20:18.000000000 -0400
-+++ kdelibs-3.4.2/kioslave/http/kcookiejar/tests/Makefile.in	2005-08-16 10:58:48.000000000 -0400
+--- kioslave/http/kcookiejar/tests/Makefile.in
++++ kioslave/http/kcookiejar/tests/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -17850,9 +17710,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-checkPROGRAMS:
-diff -Nru kdelibs-3.4.2.orig/kioslave/http/Makefile.in kdelibs-3.4.2/kioslave/http/Makefile.in
---- kdelibs-3.4.2.orig/kioslave/http/Makefile.in	2005-07-20 17:20:18.000000000 -0400
-+++ kdelibs-3.4.2/kioslave/http/Makefile.in	2005-08-16 10:58:48.000000000 -0400
+--- kioslave/http/Makefile.in
++++ kioslave/http/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -17912,9 +17771,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kioslave/Makefile.in kdelibs-3.4.2/kioslave/Makefile.in
---- kdelibs-3.4.2.orig/kioslave/Makefile.in	2005-07-20 17:20:18.000000000 -0400
-+++ kdelibs-3.4.2/kioslave/Makefile.in	2005-08-16 10:58:47.000000000 -0400
+--- kioslave/Makefile.in
++++ kioslave/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -17952,9 +17810,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nru kdelibs-3.4.2.orig/kioslave/metainfo/Makefile.in kdelibs-3.4.2/kioslave/metainfo/Makefile.in
---- kdelibs-3.4.2.orig/kioslave/metainfo/Makefile.in	2005-07-20 17:20:18.000000000 -0400
-+++ kdelibs-3.4.2/kioslave/metainfo/Makefile.in	2005-08-16 10:58:48.000000000 -0400
+--- kioslave/metainfo/Makefile.in
++++ kioslave/metainfo/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -18001,9 +17858,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kjs/Makefile.in kdelibs-3.4.2/kjs/Makefile.in
---- kdelibs-3.4.2.orig/kjs/Makefile.in	2005-07-20 17:20:18.000000000 -0400
-+++ kdelibs-3.4.2/kjs/Makefile.in	2005-08-16 10:58:48.000000000 -0400
+--- kjs/Makefile.in
++++ kjs/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -18050,9 +17906,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  global.h: $(top_builddir)/config.status $(srcdir)/global.h.in
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-diff -Nru kdelibs-3.4.2.orig/kmdi/kmdi/Makefile.in kdelibs-3.4.2/kmdi/kmdi/Makefile.in
---- kdelibs-3.4.2.orig/kmdi/kmdi/Makefile.in	2005-07-20 17:20:19.000000000 -0400
-+++ kdelibs-3.4.2/kmdi/kmdi/Makefile.in	2005-08-16 10:58:48.000000000 -0400
+--- kmdi/kmdi/Makefile.in
++++ kmdi/kmdi/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -18159,9 +18014,8 @@
 +mainwindow.o: mainwindow.moc 
  toolviewaccessor.lo: toolviewaccessor.moc 
  dockcontainer.o: dockcontainer.moc 
-diff -Nru kdelibs-3.4.2.orig/kmdi/Makefile.in kdelibs-3.4.2/kmdi/Makefile.in
---- kdelibs-3.4.2.orig/kmdi/Makefile.in	2005-07-20 17:20:19.000000000 -0400
-+++ kdelibs-3.4.2/kmdi/Makefile.in	2005-08-16 10:58:48.000000000 -0400
+--- kmdi/Makefile.in
++++ kmdi/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -18251,9 +18105,8 @@
  	@echo 'creating libkmdi_la.all_cpp.cpp ...'; \
  	rm -f libkmdi_la.all_cpp.files libkmdi_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkmdi_la.all_cpp.final; \
-diff -Nru kdelibs-3.4.2.orig/kmdi/test/Makefile.in kdelibs-3.4.2/kmdi/test/Makefile.in
---- kdelibs-3.4.2.orig/kmdi/test/Makefile.in	2005-07-20 17:20:19.000000000 -0400
-+++ kdelibs-3.4.2/kmdi/test/Makefile.in	2005-08-16 10:58:49.000000000 -0400
+--- kmdi/test/Makefile.in
++++ kmdi/test/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -18300,9 +18153,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-checkPROGRAMS:
-diff -Nru kdelibs-3.4.2.orig/knewstuff/Makefile.in kdelibs-3.4.2/knewstuff/Makefile.in
---- kdelibs-3.4.2.orig/knewstuff/Makefile.in	2005-07-20 17:20:19.000000000 -0400
-+++ kdelibs-3.4.2/knewstuff/Makefile.in	2005-08-16 10:58:49.000000000 -0400
+--- knewstuff/Makefile.in
++++ knewstuff/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -18370,9 +18222,8 @@
  
  #>+ 15
  force-reedit:
-diff -Nru kdelibs-3.4.2.orig/kparts/Makefile.in kdelibs-3.4.2/kparts/Makefile.in
---- kdelibs-3.4.2.orig/kparts/Makefile.in	2005-07-20 17:20:19.000000000 -0400
-+++ kdelibs-3.4.2/kparts/Makefile.in	2005-08-16 10:58:49.000000000 -0400
+--- kparts/Makefile.in
++++ kparts/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -18465,9 +18316,8 @@
  	@echo 'creating libkparts_la.all_cpp.cpp ...'; \
  	rm -f libkparts_la.all_cpp.files libkparts_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkparts_la.all_cpp.final; \
-diff -Nru kdelibs-3.4.2.orig/kparts/tests/Makefile.in kdelibs-3.4.2/kparts/tests/Makefile.in
---- kdelibs-3.4.2.orig/kparts/tests/Makefile.in	2005-07-20 17:20:19.000000000 -0400
-+++ kdelibs-3.4.2/kparts/tests/Makefile.in	2005-08-16 10:58:49.000000000 -0400
+--- kparts/tests/Makefile.in
++++ kparts/tests/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -18551,9 +18401,8 @@
  
  #>+ 2
  KDE_DIST=plugin_spellcheck.h plugin_foobar.rc notepadpart.rc plugin_spellcheck.rc parts.h Makefile.in ghostview.h notepad.desktop kpartstest_part1.rc kpartstest_shell.rc normalktm.h notepad.h ghostviewtest_shell.rc example.h Makefile.am 
-diff -Nru kdelibs-3.4.2.orig/kresources/Makefile.in kdelibs-3.4.2/kresources/Makefile.in
---- kdelibs-3.4.2.orig/kresources/Makefile.in	2005-07-20 17:20:19.000000000 -0400
-+++ kdelibs-3.4.2/kresources/Makefile.in	2005-08-16 10:58:49.000000000 -0400
+--- kresources/Makefile.in
++++ kresources/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -18634,9 +18483,8 @@
  
  #>+ 2
  KDE_DIST=kcmkresources.h Makefile.in kresources.desktop kresources_manager.desktop README.design kresources_plugin.desktop Makefile.am 
-diff -Nru kdelibs-3.4.2.orig/kspell2/Makefile.in kdelibs-3.4.2/kspell2/Makefile.in
---- kdelibs-3.4.2.orig/kspell2/Makefile.in	2005-07-20 17:20:19.000000000 -0400
-+++ kdelibs-3.4.2/kspell2/Makefile.in	2005-08-16 10:58:49.000000000 -0400
+--- kspell2/Makefile.in
++++ kspell2/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -18683,9 +18531,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nru kdelibs-3.4.2.orig/kspell2/plugins/aspell/Makefile.in kdelibs-3.4.2/kspell2/plugins/aspell/Makefile.in
---- kdelibs-3.4.2.orig/kspell2/plugins/aspell/Makefile.in	2005-07-20 17:20:19.000000000 -0400
-+++ kdelibs-3.4.2/kspell2/plugins/aspell/Makefile.in	2005-08-16 10:58:49.000000000 -0400
+--- kspell2/plugins/aspell/Makefile.in
++++ kspell2/plugins/aspell/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -18732,9 +18579,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kspell2/plugins/ispell/Makefile.in kdelibs-3.4.2/kspell2/plugins/ispell/Makefile.in
---- kdelibs-3.4.2.orig/kspell2/plugins/ispell/Makefile.in	2005-07-20 17:20:19.000000000 -0400
-+++ kdelibs-3.4.2/kspell2/plugins/ispell/Makefile.in	2005-08-16 10:58:49.000000000 -0400
+--- kspell2/plugins/ispell/Makefile.in
++++ kspell2/plugins/ispell/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -18781,9 +18627,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kspell2/plugins/Makefile.in kdelibs-3.4.2/kspell2/plugins/Makefile.in
---- kdelibs-3.4.2.orig/kspell2/plugins/Makefile.in	2005-07-20 17:20:19.000000000 -0400
-+++ kdelibs-3.4.2/kspell2/plugins/Makefile.in	2005-08-16 10:58:49.000000000 -0400
+--- kspell2/plugins/Makefile.in
++++ kspell2/plugins/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -18821,9 +18666,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nru kdelibs-3.4.2.orig/kspell2/tests/Makefile.in kdelibs-3.4.2/kspell2/tests/Makefile.in
---- kdelibs-3.4.2.orig/kspell2/tests/Makefile.in	2005-07-20 17:20:19.000000000 -0400
-+++ kdelibs-3.4.2/kspell2/tests/Makefile.in	2005-08-16 10:58:49.000000000 -0400
+--- kspell2/tests/Makefile.in
++++ kspell2/tests/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -18870,9 +18714,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-checkPROGRAMS:
-diff -Nru kdelibs-3.4.2.orig/kspell2/ui/Makefile.in kdelibs-3.4.2/kspell2/ui/Makefile.in
---- kdelibs-3.4.2.orig/kspell2/ui/Makefile.in	2005-07-20 17:20:19.000000000 -0400
-+++ kdelibs-3.4.2/kspell2/ui/Makefile.in	2005-08-16 10:58:49.000000000 -0400
+--- kspell2/ui/Makefile.in
++++ kspell2/ui/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -18919,9 +18762,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kstyles/highcolor/Makefile.in kdelibs-3.4.2/kstyles/highcolor/Makefile.in
---- kdelibs-3.4.2.orig/kstyles/highcolor/Makefile.in	2005-07-20 17:20:19.000000000 -0400
-+++ kdelibs-3.4.2/kstyles/highcolor/Makefile.in	2005-08-16 10:58:49.000000000 -0400
+--- kstyles/highcolor/Makefile.in
++++ kstyles/highcolor/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -18968,9 +18810,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kstyles/highcontrast/Makefile.in kdelibs-3.4.2/kstyles/highcontrast/Makefile.in
---- kdelibs-3.4.2.orig/kstyles/highcontrast/Makefile.in	2005-07-20 17:20:19.000000000 -0400
-+++ kdelibs-3.4.2/kstyles/highcontrast/Makefile.in	2005-08-16 10:58:49.000000000 -0400
+--- kstyles/highcontrast/Makefile.in
++++ kstyles/highcontrast/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -19017,9 +18858,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kstyles/keramik/Makefile.in kdelibs-3.4.2/kstyles/keramik/Makefile.in
---- kdelibs-3.4.2.orig/kstyles/keramik/Makefile.in	2005-07-20 17:20:20.000000000 -0400
-+++ kdelibs-3.4.2/kstyles/keramik/Makefile.in	2005-08-16 10:58:49.000000000 -0400
+--- kstyles/keramik/Makefile.in
++++ kstyles/keramik/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -19066,9 +18906,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kstyles/klegacy/Makefile.in kdelibs-3.4.2/kstyles/klegacy/Makefile.in
---- kdelibs-3.4.2.orig/kstyles/klegacy/Makefile.in	2005-07-20 17:20:20.000000000 -0400
-+++ kdelibs-3.4.2/kstyles/klegacy/Makefile.in	2005-08-16 10:58:50.000000000 -0400
+--- kstyles/klegacy/Makefile.in
++++ kstyles/klegacy/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -19115,9 +18954,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kstyles/kthemestyle/Makefile.in kdelibs-3.4.2/kstyles/kthemestyle/Makefile.in
---- kdelibs-3.4.2.orig/kstyles/kthemestyle/Makefile.in	2005-07-20 17:20:20.000000000 -0400
-+++ kdelibs-3.4.2/kstyles/kthemestyle/Makefile.in	2005-08-16 10:58:50.000000000 -0400
+--- kstyles/kthemestyle/Makefile.in
++++ kstyles/kthemestyle/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -19164,9 +19002,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kstyles/light/Makefile.in kdelibs-3.4.2/kstyles/light/Makefile.in
---- kdelibs-3.4.2.orig/kstyles/light/Makefile.in	2005-07-20 17:20:20.000000000 -0400
-+++ kdelibs-3.4.2/kstyles/light/Makefile.in	2005-08-16 10:58:50.000000000 -0400
+--- kstyles/light/Makefile.in
++++ kstyles/light/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -19213,9 +19050,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kstyles/Makefile.in kdelibs-3.4.2/kstyles/Makefile.in
---- kdelibs-3.4.2.orig/kstyles/Makefile.in	2005-07-20 17:20:19.000000000 -0400
-+++ kdelibs-3.4.2/kstyles/Makefile.in	2005-08-16 10:58:49.000000000 -0400
+--- kstyles/Makefile.in
++++ kstyles/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -19253,9 +19089,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nru kdelibs-3.4.2.orig/kstyles/plastik/config/Makefile.in kdelibs-3.4.2/kstyles/plastik/config/Makefile.in
---- kdelibs-3.4.2.orig/kstyles/plastik/config/Makefile.in	2005-07-20 17:20:20.000000000 -0400
-+++ kdelibs-3.4.2/kstyles/plastik/config/Makefile.in	2005-08-16 10:58:50.000000000 -0400
+--- kstyles/plastik/config/Makefile.in
++++ kstyles/plastik/config/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -19302,9 +19137,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kstyles/plastik/Makefile.in kdelibs-3.4.2/kstyles/plastik/Makefile.in
---- kdelibs-3.4.2.orig/kstyles/plastik/Makefile.in	2005-07-20 17:20:20.000000000 -0400
-+++ kdelibs-3.4.2/kstyles/plastik/Makefile.in	2005-08-16 10:58:50.000000000 -0400
+--- kstyles/plastik/Makefile.in
++++ kstyles/plastik/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -19351,9 +19185,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kstyles/riscos/Makefile.in kdelibs-3.4.2/kstyles/riscos/Makefile.in
---- kdelibs-3.4.2.orig/kstyles/riscos/Makefile.in	2005-07-20 17:20:20.000000000 -0400
-+++ kdelibs-3.4.2/kstyles/riscos/Makefile.in	2005-08-16 10:58:50.000000000 -0400
+--- kstyles/riscos/Makefile.in
++++ kstyles/riscos/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -19400,9 +19233,8 @@
  
  #>+ 2
  docs-am:
-diff -Nru kdelibs-3.4.2.orig/kstyles/themes/Makefile.in kdelibs-3.4.2/kstyles/themes/Makefile.in
---- kdelibs-3.4.2.orig/kstyles/themes/Makefile.in	2005-07-20 17:20:20.000000000 -0400
-+++ kdelibs-3.4.2/kstyles/themes/Makefile.in	2005-08-16 10:58:50.000000000 -0400
+--- kstyles/themes/Makefile.in
++++ kstyles/themes/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -19440,9 +19272,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nru kdelibs-3.4.2.orig/kstyles/utils/installtheme/Makefile.in kdelibs-3.4.2/kstyles/utils/installtheme/Makefile.in
---- kdelibs-3.4.2.orig/kstyles/utils/installtheme/Makefile.in	2005-07-20 17:20:20.000000000 -0400
-+++ kdelibs-3.4.2/kstyles/utils/installtheme/Makefile.in	2005-08-16 10:58:50.000000000 -0400
+--- kstyles/utils/installtheme/Makefile.in
++++ kstyles/utils/installtheme/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -19489,9 +19320,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kstyles/utils/Makefile.in kdelibs-3.4.2/kstyles/utils/Makefile.in
---- kdelibs-3.4.2.orig/kstyles/utils/Makefile.in	2005-07-20 17:20:20.000000000 -0400
-+++ kdelibs-3.4.2/kstyles/utils/Makefile.in	2005-08-16 10:58:50.000000000 -0400
+--- kstyles/utils/Makefile.in
++++ kstyles/utils/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -19529,9 +19359,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nru kdelibs-3.4.2.orig/kstyles/web/Makefile.in kdelibs-3.4.2/kstyles/web/Makefile.in
---- kdelibs-3.4.2.orig/kstyles/web/Makefile.in	2005-07-20 17:20:20.000000000 -0400
-+++ kdelibs-3.4.2/kstyles/web/Makefile.in	2005-08-16 10:58:50.000000000 -0400
+--- kstyles/web/Makefile.in
++++ kstyles/web/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -19578,9 +19407,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kutils/ksettings/Makefile.in kdelibs-3.4.2/kutils/ksettings/Makefile.in
---- kdelibs-3.4.2.orig/kutils/ksettings/Makefile.in	2005-07-20 17:20:20.000000000 -0400
-+++ kdelibs-3.4.2/kutils/ksettings/Makefile.in	2005-08-16 10:58:50.000000000 -0400
+--- kutils/ksettings/Makefile.in
++++ kutils/ksettings/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -19627,9 +19455,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nru kdelibs-3.4.2.orig/kutils/Makefile.in kdelibs-3.4.2/kutils/Makefile.in
---- kdelibs-3.4.2.orig/kutils/Makefile.in	2005-07-20 17:20:20.000000000 -0400
-+++ kdelibs-3.4.2/kutils/Makefile.in	2005-08-16 10:58:50.000000000 -0400
+--- kutils/Makefile.in
++++ kutils/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -19740,9 +19567,8 @@
  	@echo 'creating libkutils_la.all_cpp.cpp ...'; \
  	rm -f libkutils_la.all_cpp.files libkutils_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkutils_la.all_cpp.final; \
-diff -Nru kdelibs-3.4.2.orig/kutils/tests/Makefile.in kdelibs-3.4.2/kutils/tests/Makefile.in
---- kdelibs-3.4.2.orig/kutils/tests/Makefile.in	2005-07-20 17:20:20.000000000 -0400
-+++ kdelibs-3.4.2/kutils/tests/Makefile.in	2005-08-16 10:58:50.000000000 -0400
+--- kutils/tests/Makefile.in
++++ kutils/tests/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -19789,9 +19615,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-checkPROGRAMS:
-diff -Nru kdelibs-3.4.2.orig/kwallet/backend/Makefile.in kdelibs-3.4.2/kwallet/backend/Makefile.in
---- kdelibs-3.4.2.orig/kwallet/backend/Makefile.in	2005-07-20 17:20:20.000000000 -0400
-+++ kdelibs-3.4.2/kwallet/backend/Makefile.in	2005-08-16 10:58:50.000000000 -0400
+--- kwallet/backend/Makefile.in
++++ kwallet/backend/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -19838,9 +19663,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kwallet/backend/tests/Makefile.in kdelibs-3.4.2/kwallet/backend/tests/Makefile.in
---- kdelibs-3.4.2.orig/kwallet/backend/tests/Makefile.in	2005-07-20 17:20:20.000000000 -0400
-+++ kdelibs-3.4.2/kwallet/backend/tests/Makefile.in	2005-08-16 10:58:50.000000000 -0400
+--- kwallet/backend/tests/Makefile.in
++++ kwallet/backend/tests/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -19887,9 +19711,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-checkPROGRAMS:
-diff -Nru kdelibs-3.4.2.orig/kwallet/client/Makefile.in kdelibs-3.4.2/kwallet/client/Makefile.in
---- kdelibs-3.4.2.orig/kwallet/client/Makefile.in	2005-07-20 17:20:20.000000000 -0400
-+++ kdelibs-3.4.2/kwallet/client/Makefile.in	2005-08-16 10:58:51.000000000 -0400
+--- kwallet/client/Makefile.in
++++ kwallet/client/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -19936,9 +19759,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/kwallet/Makefile.in kdelibs-3.4.2/kwallet/Makefile.in
---- kdelibs-3.4.2.orig/kwallet/Makefile.in	2005-07-20 17:20:20.000000000 -0400
-+++ kdelibs-3.4.2/kwallet/Makefile.in	2005-08-16 10:58:50.000000000 -0400
+--- kwallet/Makefile.in
++++ kwallet/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -19976,9 +19798,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nru kdelibs-3.4.2.orig/kwallet/tests/Makefile.in kdelibs-3.4.2/kwallet/tests/Makefile.in
---- kdelibs-3.4.2.orig/kwallet/tests/Makefile.in	2005-07-20 17:20:20.000000000 -0400
-+++ kdelibs-3.4.2/kwallet/tests/Makefile.in	2005-08-16 10:58:51.000000000 -0400
+--- kwallet/tests/Makefile.in
++++ kwallet/tests/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -20025,9 +19846,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-checkPROGRAMS:
-diff -Nru kdelibs-3.4.2.orig/libkmid/Makefile.in kdelibs-3.4.2/libkmid/Makefile.in
---- kdelibs-3.4.2.orig/libkmid/Makefile.in	2005-07-20 17:20:20.000000000 -0400
-+++ kdelibs-3.4.2/libkmid/Makefile.in	2005-08-16 10:58:51.000000000 -0400
+--- libkmid/Makefile.in
++++ libkmid/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -20074,9 +19894,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/libkmid/tests/Makefile.in kdelibs-3.4.2/libkmid/tests/Makefile.in
---- kdelibs-3.4.2.orig/libkmid/tests/Makefile.in	2005-07-20 17:20:20.000000000 -0400
-+++ kdelibs-3.4.2/libkmid/tests/Makefile.in	2005-08-16 10:58:51.000000000 -0400
+--- libkmid/tests/Makefile.in
++++ libkmid/tests/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -20123,9 +19942,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstPROGRAMS:
-diff -Nru kdelibs-3.4.2.orig/libkscreensaver/Makefile.in kdelibs-3.4.2/libkscreensaver/Makefile.in
---- kdelibs-3.4.2.orig/libkscreensaver/Makefile.in	2005-07-20 17:20:20.000000000 -0400
-+++ kdelibs-3.4.2/libkscreensaver/Makefile.in	2005-08-16 10:58:51.000000000 -0400
+--- libkscreensaver/Makefile.in
++++ libkscreensaver/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -20172,9 +19990,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.2.orig/libltdl/Makefile.in kdelibs-3.4.2/libltdl/Makefile.in
---- kdelibs-3.4.2.orig/libltdl/Makefile.in	2005-07-20 17:20:20.000000000 -0400
-+++ kdelibs-3.4.2/libltdl/Makefile.in	2005-08-16 10:58:51.000000000 -0400
+--- libltdl/Makefile.in
++++ libltdl/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -20221,9 +20038,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nru kdelibs-3.4.2.orig/licenses/Makefile.in kdelibs-3.4.2/licenses/Makefile.in
---- kdelibs-3.4.2.orig/licenses/Makefile.in	2005-07-20 17:20:20.000000000 -0400
-+++ kdelibs-3.4.2/licenses/Makefile.in	2005-08-16 10:58:51.000000000 -0400
+--- licenses/Makefile.in
++++ licenses/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -20261,9 +20077,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nru kdelibs-3.4.2.orig/Makefile.in kdelibs-3.4.2/Makefile.in
---- kdelibs-3.4.2.orig/Makefile.in	2005-07-20 17:20:03.000000000 -0400
-+++ kdelibs-3.4.2/Makefile.in	2005-08-16 10:58:18.000000000 -0400
+--- Makefile.in
++++ Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -20322,9 +20137,8 @@
  
  #>+ 2
  docs-am:
-diff -Nru kdelibs-3.4.2.orig/mimetypes/application/Makefile.in kdelibs-3.4.2/mimetypes/application/Makefile.in
---- kdelibs-3.4.2.orig/mimetypes/application/Makefile.in	2005-07-20 17:20:20.000000000 -0400
-+++ kdelibs-3.4.2/mimetypes/application/Makefile.in	2005-08-16 10:58:51.000000000 -0400
+--- mimetypes/application/Makefile.in
++++ mimetypes/application/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -20371,9 +20185,8 @@
  
  #>+ 2
  docs-am:
-diff -Nru kdelibs-3.4.2.orig/mimetypes/audio/Makefile.in kdelibs-3.4.2/mimetypes/audio/Makefile.in
---- kdelibs-3.4.2.orig/mimetypes/audio/Makefile.in	2005-07-20 17:20:20.000000000 -0400
-+++ kdelibs-3.4.2/mimetypes/audio/Makefile.in	2005-08-16 10:58:51.000000000 -0400
+--- mimetypes/audio/Makefile.in
++++ mimetypes/audio/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -20420,9 +20233,8 @@
  
  #>+ 2
  docs-am:
-diff -Nru kdelibs-3.4.2.orig/mimetypes/image/Makefile.in kdelibs-3.4.2/mimetypes/image/Makefile.in
---- kdelibs-3.4.2.orig/mimetypes/image/Makefile.in	2005-07-20 17:20:20.000000000 -0400
-+++ kdelibs-3.4.2/mimetypes/image/Makefile.in	2005-08-16 10:58:51.000000000 -0400
+--- mimetypes/image/Makefile.in
++++ mimetypes/image/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -20460,9 +20272,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nru kdelibs-3.4.2.orig/mimetypes/inode/Makefile.in kdelibs-3.4.2/mimetypes/inode/Makefile.in
---- kdelibs-3.4.2.orig/mimetypes/inode/Makefile.in	2005-07-20 17:20:20.000000000 -0400
-+++ kdelibs-3.4.2/mimetypes/inode/Makefile.in	2005-08-16 10:58:51.000000000 -0400
+--- mimetypes/inode/Makefile.in
++++ mimetypes/inode/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -20500,9 +20311,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nru kdelibs-3.4.2.orig/mimetypes/Makefile.in kdelibs-3.4.2/mimetypes/Makefile.in
---- kdelibs-3.4.2.orig/mimetypes/Makefile.in	2005-07-20 17:20:20.000000000 -0400
-+++ kdelibs-3.4.2/mimetypes/Makefile.in	2005-08-16 10:58:51.000000000 -0400
+--- mimetypes/Makefile.in
++++ mimetypes/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -20540,9 +20350,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nru kdelibs-3.4.2.orig/mimetypes/message/Makefile.in kdelibs-3.4.2/mimetypes/message/Makefile.in
---- kdelibs-3.4.2.orig/mimetypes/message/Makefile.in	2005-07-20 17:20:20.000000000 -0400
-+++ kdelibs-3.4.2/mimetypes/message/Makefile.in	2005-08-16 10:58:51.000000000 -0400
+--- mimetypes/message/Makefile.in
++++ mimetypes/message/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -20580,9 +20389,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nru kdelibs-3.4.2.orig/mimetypes/model/Makefile.in kdelibs-3.4.2/mimetypes/model/Makefile.in
---- kdelibs-3.4.2.orig/mimetypes/model/Makefile.in	2005-07-20 17:20:20.000000000 -0400
-+++ kdelibs-3.4.2/mimetypes/model/Makefile.in	2005-08-16 10:58:51.000000000 -0400
+--- mimetypes/model/Makefile.in
++++ mimetypes/model/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -20620,9 +20428,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nru kdelibs-3.4.2.orig/mimetypes/multipart/Makefile.in kdelibs-3.4.2/mimetypes/multipart/Makefile.in
---- kdelibs-3.4.2.orig/mimetypes/multipart/Makefile.in	2005-07-20 17:20:20.000000000 -0400
-+++ kdelibs-3.4.2/mimetypes/multipart/Makefile.in	2005-08-16 10:58:51.000000000 -0400
+--- mimetypes/multipart/Makefile.in
++++ mimetypes/multipart/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -20660,9 +20467,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nru kdelibs-3.4.2.orig/mimetypes/text/Makefile.in kdelibs-3.4.2/mimetypes/text/Makefile.in
---- kdelibs-3.4.2.orig/mimetypes/text/Makefile.in	2005-07-20 17:20:20.000000000 -0400
-+++ kdelibs-3.4.2/mimetypes/text/Makefile.in	2005-08-16 10:58:51.000000000 -0400
+--- mimetypes/text/Makefile.in
++++ mimetypes/text/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -20709,9 +20515,8 @@
  
  #>+ 2
  docs-am:
-diff -Nru kdelibs-3.4.2.orig/mimetypes/uri/Makefile.in kdelibs-3.4.2/mimetypes/uri/Makefile.in
---- kdelibs-3.4.2.orig/mimetypes/uri/Makefile.in	2005-07-20 17:20:20.000000000 -0400
-+++ kdelibs-3.4.2/mimetypes/uri/Makefile.in	2005-08-16 10:58:51.000000000 -0400
+--- mimetypes/uri/Makefile.in
++++ mimetypes/uri/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -20749,9 +20554,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nru kdelibs-3.4.2.orig/mimetypes/video/Makefile.in kdelibs-3.4.2/mimetypes/video/Makefile.in
---- kdelibs-3.4.2.orig/mimetypes/video/Makefile.in	2005-07-20 17:20:20.000000000 -0400
-+++ kdelibs-3.4.2/mimetypes/video/Makefile.in	2005-08-16 10:58:51.000000000 -0400
+--- mimetypes/video/Makefile.in
++++ mimetypes/video/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -20789,9 +20593,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nru kdelibs-3.4.2.orig/pics/crystalsvg/kde/Makefile.in kdelibs-3.4.2/pics/crystalsvg/kde/Makefile.in
---- kdelibs-3.4.2.orig/pics/crystalsvg/kde/Makefile.in	2005-07-20 17:20:21.000000000 -0400
-+++ kdelibs-3.4.2/pics/crystalsvg/kde/Makefile.in	2005-08-16 10:58:52.000000000 -0400
+--- pics/crystalsvg/kde/Makefile.in
++++ pics/crystalsvg/kde/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -20838,9 +20641,8 @@
  
  #>+ 2
  docs-am:
-diff -Nru kdelibs-3.4.2.orig/pics/crystalsvg/Makefile.in kdelibs-3.4.2/pics/crystalsvg/Makefile.in
---- kdelibs-3.4.2.orig/pics/crystalsvg/Makefile.in	2005-07-20 17:20:21.000000000 -0400
-+++ kdelibs-3.4.2/pics/crystalsvg/Makefile.in	2005-08-16 10:58:52.000000000 -0400
+--- pics/crystalsvg/Makefile.in
++++ pics/crystalsvg/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -28100,9 +27902,8 @@
  
  #>+ 15
  force-reedit:
-diff -Nru kdelibs-3.4.2.orig/pics/emoticons/Makefile.in kdelibs-3.4.2/pics/emoticons/Makefile.in
---- kdelibs-3.4.2.orig/pics/emoticons/Makefile.in	2005-07-20 17:20:21.000000000 -0400
-+++ kdelibs-3.4.2/pics/emoticons/Makefile.in	2005-08-16 10:58:52.000000000 -0400
+--- pics/emoticons/Makefile.in
++++ pics/emoticons/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -28140,9 +27941,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nru kdelibs-3.4.2.orig/pics/hicolor/Makefile.in kdelibs-3.4.2/pics/hicolor/Makefile.in
---- kdelibs-3.4.2.orig/pics/hicolor/Makefile.in	2005-07-20 17:20:21.000000000 -0400
-+++ kdelibs-3.4.2/pics/hicolor/Makefile.in	2005-08-16 10:58:52.000000000 -0400
+--- pics/hicolor/Makefile.in
++++ pics/hicolor/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -28229,9 +28029,8 @@
  
  #>+ 15
  force-reedit:
-diff -Nru kdelibs-3.4.2.orig/pics/Makefile.in kdelibs-3.4.2/pics/Makefile.in
---- kdelibs-3.4.2.orig/pics/Makefile.in	2005-07-20 17:20:20.000000000 -0400
-+++ kdelibs-3.4.2/pics/Makefile.in	2005-08-16 10:58:51.000000000 -0400
+--- pics/Makefile.in
++++ pics/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.


