[Pkg-kde-commits] rev 2266 - trunk/packages/koffice/debian/patches
Isaac Clerencia
isaac at costa.debian.org
Mon Nov 14 09:13:21 UTC 2005
Author: isaac
Date: 2005-11-14 09:13:03 +0000 (Mon, 14 Nov 2005)
New Revision: 2266
Added:
trunk/packages/koffice/debian/patches/11_karbonbase.diff
Modified:
trunk/packages/koffice/debian/patches/98_buildprep.diff
Log:
Add dato's patch to fix karbonbase builde and update buildprep
Added: trunk/packages/koffice/debian/patches/11_karbonbase.diff
===================================================================
--- trunk/packages/koffice/debian/patches/11_karbonbase.diff 2005-11-14 07:37:52 UTC (rev 2265)
+++ trunk/packages/koffice/debian/patches/11_karbonbase.diff 2005-11-14 09:13:03 UTC (rev 2266)
@@ -0,0 +1,11 @@
+--- koffice-1.4.2/karbon/Makefile.am~
++++ koffice-1.4.2/karbon/Makefile.am
+@@ -18,7 +18,7 @@
+ # (e.g. VTranslateCmd), and commands (e.g. VCommandHistory) need KarbonPart,
+ # so even moving more stuff to libkarbonbase isn't enough.
+ # -> I think the whole 'base' stuff can be removed (DF)
+-lib_LTLIBRARIES = libkarboncommon.la libkarbonbase.la
++lib_LTLIBRARIES = libkarbonbase.la libkarboncommon.la
+ kde_module_LTLIBRARIES = libkarbonpart.la
+
+ libkarboncommon_la_SOURCES = karbon_factory.cc karbon_resourceserver.cc karbon_part.cc karbon_part_iface.cc karbon_part_iface.skel karbon_view.cc karbon_view_iface.cc karbon_view_iface.skel karbon_drag.cpp karbon_grid_data.cpp
Modified: trunk/packages/koffice/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/koffice/debian/patches/98_buildprep.diff 2005-11-14 07:37:52 UTC (rev 2265)
+++ trunk/packages/koffice/debian/patches/98_buildprep.diff 2005-11-14 09:13:03 UTC (rev 2266)
@@ -1,6 +1,6 @@
diff -Nrua koffice-1.4.2.orig/acinclude.m4 koffice-1.4.2/acinclude.m4
--- koffice-1.4.2.orig/acinclude.m4 2005-10-05 12:50:59.000000000 +0200
-+++ koffice-1.4.2/acinclude.m4 2005-11-13 10:31:09.000000000 +0100
++++ koffice-1.4.2/acinclude.m4 2005-11-14 09:11:14.000000000 +0100
@@ -1688,15 +1688,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
@@ -2964,7 +2964,7 @@
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
diff -Nrua koffice-1.4.2.orig/aclocal.m4 koffice-1.4.2/aclocal.m4
--- koffice-1.4.2.orig/aclocal.m4 2005-10-05 12:51:07.000000000 +0200
-+++ koffice-1.4.2/aclocal.m4 2005-11-13 10:31:20.000000000 +0100
++++ koffice-1.4.2/aclocal.m4 2005-11-14 09:11:25.000000000 +0100
@@ -1,12045 +1,42 @@
-# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
@@ -16111,7 +16111,7 @@
+m4_include([acinclude.m4])
diff -Nrua koffice-1.4.2.orig/autocorrect/Makefile.in koffice-1.4.2/autocorrect/Makefile.in
--- koffice-1.4.2.orig/autocorrect/Makefile.in 2005-10-05 12:52:34.000000000 +0200
-+++ koffice-1.4.2/autocorrect/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/autocorrect/Makefile.in 2005-11-14 09:13:44.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -16805,7 +16805,7 @@
diff -Nrua koffice-1.4.2.orig/configure koffice-1.4.2/configure
--- koffice-1.4.2.orig/configure 2005-10-05 12:53:12.000000000 +0200
-+++ koffice-1.4.2/configure 2005-11-13 10:33:54.000000000 +0100
++++ koffice-1.4.2/configure 2005-11-14 09:13:57.000000000 +0100
@@ -278,15 +278,15 @@
# The HP-UX ksh and POSIX shell print the target directory to stdout
@@ -23828,7 +23828,7 @@
test -f "$dirpart/$file" && continue
diff -Nrua koffice-1.4.2.orig/configure.in koffice-1.4.2/configure.in
--- koffice-1.4.2.orig/configure.in 2005-10-05 12:51:03.000000000 +0200
-+++ koffice-1.4.2/configure.in 2005-11-13 10:31:09.000000000 +0100
++++ koffice-1.4.2/configure.in 2005-11-14 09:11:15.000000000 +0100
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
AM_INIT_AUTOMAKE(koffice, "1.4.2") dnl searches for some needed programs
@@ -23849,7 +23849,7 @@
diff -Nrua koffice-1.4.2.orig/doc/kchart/Makefile.in koffice-1.4.2/doc/kchart/Makefile.in
--- koffice-1.4.2.orig/doc/kchart/Makefile.in 2005-10-05 12:52:34.000000000 +0200
-+++ koffice-1.4.2/doc/kchart/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/doc/kchart/Makefile.in 2005-11-14 09:13:44.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -24504,7 +24504,7 @@
diff -Nrua koffice-1.4.2.orig/doc/kformula/Makefile.in koffice-1.4.2/doc/kformula/Makefile.in
--- koffice-1.4.2.orig/doc/kformula/Makefile.in 2005-10-05 12:52:34.000000000 +0200
-+++ koffice-1.4.2/doc/kformula/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/doc/kformula/Makefile.in 2005-11-14 09:13:44.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -25159,7 +25159,7 @@
diff -Nrua koffice-1.4.2.orig/doc/kivio/Makefile.in koffice-1.4.2/doc/kivio/Makefile.in
--- koffice-1.4.2.orig/doc/kivio/Makefile.in 2005-10-05 12:52:34.000000000 +0200
-+++ koffice-1.4.2/doc/kivio/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/doc/kivio/Makefile.in 2005-11-14 09:13:44.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -25814,7 +25814,7 @@
diff -Nrua koffice-1.4.2.orig/doc/koffice/Makefile.in koffice-1.4.2/doc/koffice/Makefile.in
--- koffice-1.4.2.orig/doc/koffice/Makefile.in 2005-10-05 12:52:34.000000000 +0200
-+++ koffice-1.4.2/doc/koffice/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/doc/koffice/Makefile.in 2005-11-14 09:13:44.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -26469,7 +26469,7 @@
diff -Nrua koffice-1.4.2.orig/doc/koshell/Makefile.in koffice-1.4.2/doc/koshell/Makefile.in
--- koffice-1.4.2.orig/doc/koshell/Makefile.in 2005-10-05 12:52:34.000000000 +0200
-+++ koffice-1.4.2/doc/koshell/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/doc/koshell/Makefile.in 2005-11-14 09:13:44.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -27124,7 +27124,7 @@
diff -Nrua koffice-1.4.2.orig/doc/kpresenter/Makefile.in koffice-1.4.2/doc/kpresenter/Makefile.in
--- koffice-1.4.2.orig/doc/kpresenter/Makefile.in 2005-10-05 12:52:34.000000000 +0200
-+++ koffice-1.4.2/doc/kpresenter/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/doc/kpresenter/Makefile.in 2005-11-14 09:13:44.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -27779,7 +27779,7 @@
diff -Nrua koffice-1.4.2.orig/doc/kspread/Makefile.in koffice-1.4.2/doc/kspread/Makefile.in
--- koffice-1.4.2.orig/doc/kspread/Makefile.in 2005-10-05 12:52:34.000000000 +0200
-+++ koffice-1.4.2/doc/kspread/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/doc/kspread/Makefile.in 2005-11-14 09:13:44.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -28434,7 +28434,7 @@
diff -Nrua koffice-1.4.2.orig/doc/kugar/Makefile.in koffice-1.4.2/doc/kugar/Makefile.in
--- koffice-1.4.2.orig/doc/kugar/Makefile.in 2005-10-05 12:52:34.000000000 +0200
-+++ koffice-1.4.2/doc/kugar/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/doc/kugar/Makefile.in 2005-11-14 09:13:44.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -29089,7 +29089,7 @@
diff -Nrua koffice-1.4.2.orig/doc/kword/Makefile.in koffice-1.4.2/doc/kword/Makefile.in
--- koffice-1.4.2.orig/doc/kword/Makefile.in 2005-10-05 12:52:34.000000000 +0200
-+++ koffice-1.4.2/doc/kword/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/doc/kword/Makefile.in 2005-11-14 09:13:44.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -29744,7 +29744,7 @@
diff -Nrua koffice-1.4.2.orig/doc/Makefile.in koffice-1.4.2/doc/Makefile.in
--- koffice-1.4.2.orig/doc/Makefile.in 2005-10-05 12:52:34.000000000 +0200
-+++ koffice-1.4.2/doc/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/doc/Makefile.in 2005-11-14 09:13:44.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -30579,7 +30579,7 @@
diff -Nrua koffice-1.4.2.orig/doc/thesaurus/Makefile.in koffice-1.4.2/doc/thesaurus/Makefile.in
--- koffice-1.4.2.orig/doc/thesaurus/Makefile.in 2005-10-05 12:52:34.000000000 +0200
-+++ koffice-1.4.2/doc/thesaurus/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/doc/thesaurus/Makefile.in 2005-11-14 09:13:44.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -31234,7 +31234,7 @@
diff -Nrua koffice-1.4.2.orig/example/Makefile.in koffice-1.4.2/example/Makefile.in
--- koffice-1.4.2.orig/example/Makefile.in 2005-10-05 12:52:34.000000000 +0200
-+++ koffice-1.4.2/example/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/example/Makefile.in 2005-11-14 09:13:44.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -32467,7 +32467,7 @@
diff -Nrua koffice-1.4.2.orig/filters/generic_wrapper/Makefile.in koffice-1.4.2/filters/generic_wrapper/Makefile.in
--- koffice-1.4.2.orig/filters/generic_wrapper/Makefile.in 2005-10-05 12:52:34.000000000 +0200
-+++ koffice-1.4.2/filters/generic_wrapper/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/filters/generic_wrapper/Makefile.in 2005-11-14 09:13:44.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -33402,7 +33402,7 @@
diff -Nrua koffice-1.4.2.orig/filters/karbon/ai/Makefile.in koffice-1.4.2/filters/karbon/ai/Makefile.in
--- koffice-1.4.2.orig/filters/karbon/ai/Makefile.in 2005-10-05 12:52:34.000000000 +0200
-+++ koffice-1.4.2/filters/karbon/ai/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/filters/karbon/ai/Makefile.in 2005-11-14 09:13:44.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -34395,7 +34395,7 @@
diff -Nrua koffice-1.4.2.orig/filters/karbon/applixgraphics/Makefile.in koffice-1.4.2/filters/karbon/applixgraphics/Makefile.in
--- koffice-1.4.2.orig/filters/karbon/applixgraphics/Makefile.in 2005-10-05 12:52:34.000000000 +0200
-+++ koffice-1.4.2/filters/karbon/applixgraphics/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/filters/karbon/applixgraphics/Makefile.in 2005-11-14 09:13:44.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -35331,7 +35331,7 @@
diff -Nrua koffice-1.4.2.orig/filters/karbon/eps/Makefile.in koffice-1.4.2/filters/karbon/eps/Makefile.in
--- koffice-1.4.2.orig/filters/karbon/eps/Makefile.in 2005-10-05 12:52:34.000000000 +0200
-+++ koffice-1.4.2/filters/karbon/eps/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/filters/karbon/eps/Makefile.in 2005-11-14 09:13:44.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -36323,7 +36323,7 @@
diff -Nrua koffice-1.4.2.orig/filters/karbon/kontour/Makefile.in koffice-1.4.2/filters/karbon/kontour/Makefile.in
--- koffice-1.4.2.orig/filters/karbon/kontour/Makefile.in 2005-10-05 12:52:34.000000000 +0200
-+++ koffice-1.4.2/filters/karbon/kontour/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/filters/karbon/kontour/Makefile.in 2005-11-14 09:13:44.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -37256,7 +37256,7 @@
diff -Nrua koffice-1.4.2.orig/filters/karbon/Makefile.in koffice-1.4.2/filters/karbon/Makefile.in
--- koffice-1.4.2.orig/filters/karbon/Makefile.in 2005-10-05 12:52:34.000000000 +0200
-+++ koffice-1.4.2/filters/karbon/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/filters/karbon/Makefile.in 2005-11-14 09:13:44.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -38078,7 +38078,7 @@
diff -Nrua koffice-1.4.2.orig/filters/karbon/msod/Makefile.in koffice-1.4.2/filters/karbon/msod/Makefile.in
--- koffice-1.4.2.orig/filters/karbon/msod/Makefile.in 2005-10-05 12:52:34.000000000 +0200
-+++ koffice-1.4.2/filters/karbon/msod/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/filters/karbon/msod/Makefile.in 2005-11-14 09:13:44.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -39022,7 +39022,7 @@
diff -Nrua koffice-1.4.2.orig/filters/karbon/oodraw/Makefile.in koffice-1.4.2/filters/karbon/oodraw/Makefile.in
--- koffice-1.4.2.orig/filters/karbon/oodraw/Makefile.in 2005-10-05 12:52:34.000000000 +0200
-+++ koffice-1.4.2/filters/karbon/oodraw/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/filters/karbon/oodraw/Makefile.in 2005-11-14 09:13:44.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -39957,7 +39957,7 @@
diff -Nrua koffice-1.4.2.orig/filters/karbon/png/Makefile.in koffice-1.4.2/filters/karbon/png/Makefile.in
--- koffice-1.4.2.orig/filters/karbon/png/Makefile.in 2005-10-05 12:52:34.000000000 +0200
-+++ koffice-1.4.2/filters/karbon/png/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/filters/karbon/png/Makefile.in 2005-11-14 09:13:44.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -40904,7 +40904,7 @@
diff -Nrua koffice-1.4.2.orig/filters/karbon/svg/Makefile.in koffice-1.4.2/filters/karbon/svg/Makefile.in
--- koffice-1.4.2.orig/filters/karbon/svg/Makefile.in 2005-10-05 12:52:34.000000000 +0200
-+++ koffice-1.4.2/filters/karbon/svg/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/filters/karbon/svg/Makefile.in 2005-11-14 09:13:44.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -41876,7 +41876,7 @@
diff -Nrua koffice-1.4.2.orig/filters/karbon/wmf/Makefile.in koffice-1.4.2/filters/karbon/wmf/Makefile.in
--- koffice-1.4.2.orig/filters/karbon/wmf/Makefile.in 2005-10-05 12:52:34.000000000 +0200
-+++ koffice-1.4.2/filters/karbon/wmf/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/filters/karbon/wmf/Makefile.in 2005-11-14 09:13:44.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -42843,7 +42843,7 @@
diff -Nrua koffice-1.4.2.orig/filters/karbon/xcf/Makefile.in koffice-1.4.2/filters/karbon/xcf/Makefile.in
--- koffice-1.4.2.orig/filters/karbon/xcf/Makefile.in 2005-10-05 12:52:34.000000000 +0200
-+++ koffice-1.4.2/filters/karbon/xcf/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/filters/karbon/xcf/Makefile.in 2005-11-14 09:13:44.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -43790,7 +43790,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kchart/Makefile.in koffice-1.4.2/filters/kchart/Makefile.in
--- koffice-1.4.2.orig/filters/kchart/Makefile.in 2005-10-05 12:52:34.000000000 +0200
-+++ koffice-1.4.2/filters/kchart/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/filters/kchart/Makefile.in 2005-11-14 09:13:44.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -44612,7 +44612,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kchart/png/Makefile.in koffice-1.4.2/filters/kchart/png/Makefile.in
--- koffice-1.4.2.orig/filters/kchart/png/Makefile.in 2005-10-05 12:52:34.000000000 +0200
-+++ koffice-1.4.2/filters/kchart/png/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/filters/kchart/png/Makefile.in 2005-11-14 09:13:44.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -45564,7 +45564,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kchart/svg/Makefile.in koffice-1.4.2/filters/kchart/svg/Makefile.in
--- koffice-1.4.2.orig/filters/kchart/svg/Makefile.in 2005-10-05 12:52:34.000000000 +0200
-+++ koffice-1.4.2/filters/kchart/svg/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/filters/kchart/svg/Makefile.in 2005-11-14 09:13:44.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -46502,7 +46502,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kformula/latex/Makefile.in koffice-1.4.2/filters/kformula/latex/Makefile.in
--- koffice-1.4.2.orig/filters/kformula/latex/Makefile.in 2005-10-05 12:52:34.000000000 +0200
-+++ koffice-1.4.2/filters/kformula/latex/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/filters/kformula/latex/Makefile.in 2005-11-14 09:13:44.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -47444,7 +47444,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kformula/Makefile.in koffice-1.4.2/filters/kformula/Makefile.in
--- koffice-1.4.2.orig/filters/kformula/Makefile.in 2005-10-05 12:52:34.000000000 +0200
-+++ koffice-1.4.2/filters/kformula/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/filters/kformula/Makefile.in 2005-11-14 09:13:44.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -48266,7 +48266,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kformula/mathml/Makefile.in koffice-1.4.2/filters/kformula/mathml/Makefile.in
--- koffice-1.4.2.orig/filters/kformula/mathml/Makefile.in 2005-10-05 12:52:34.000000000 +0200
-+++ koffice-1.4.2/filters/kformula/mathml/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/filters/kformula/mathml/Makefile.in 2005-11-14 09:13:44.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -49222,7 +49222,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kformula/png/Makefile.in koffice-1.4.2/filters/kformula/png/Makefile.in
--- koffice-1.4.2.orig/filters/kformula/png/Makefile.in 2005-10-05 12:52:35.000000000 +0200
-+++ koffice-1.4.2/filters/kformula/png/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/filters/kformula/png/Makefile.in 2005-11-14 09:13:44.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -50175,7 +50175,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kpresenter/kword/Makefile.in koffice-1.4.2/filters/kpresenter/kword/Makefile.in
--- koffice-1.4.2.orig/filters/kpresenter/kword/Makefile.in 2005-10-05 12:52:35.000000000 +0200
-+++ koffice-1.4.2/filters/kpresenter/kword/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/filters/kpresenter/kword/Makefile.in 2005-11-14 09:13:44.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -51100,7 +51100,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kpresenter/magicpoint/Makefile.in koffice-1.4.2/filters/kpresenter/magicpoint/Makefile.in
--- koffice-1.4.2.orig/filters/kpresenter/magicpoint/Makefile.in 2005-10-05 12:52:35.000000000 +0200
-+++ koffice-1.4.2/filters/kpresenter/magicpoint/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/filters/kpresenter/magicpoint/Makefile.in 2005-11-14 09:13:44.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -51828,7 +51828,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kpresenter/Makefile.in koffice-1.4.2/filters/kpresenter/Makefile.in
--- koffice-1.4.2.orig/filters/kpresenter/Makefile.in 2005-10-05 12:52:35.000000000 +0200
-+++ koffice-1.4.2/filters/kpresenter/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/filters/kpresenter/Makefile.in 2005-11-14 09:13:44.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -52650,7 +52650,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kpresenter/ooimpress/Makefile.in koffice-1.4.2/filters/kpresenter/ooimpress/Makefile.in
--- koffice-1.4.2.orig/filters/kpresenter/ooimpress/Makefile.in 2005-10-05 12:52:35.000000000 +0200
-+++ koffice-1.4.2/filters/kpresenter/ooimpress/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/filters/kpresenter/ooimpress/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -53613,7 +53613,7 @@
diff -Nrua koffice-1.4.2.orig/filters/krita/magick/Makefile.in koffice-1.4.2/filters/krita/magick/Makefile.in
--- koffice-1.4.2.orig/filters/krita/magick/Makefile.in 2005-10-05 12:52:35.000000000 +0200
-+++ koffice-1.4.2/filters/krita/magick/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/filters/krita/magick/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -54605,7 +54605,7 @@
diff -Nrua koffice-1.4.2.orig/filters/krita/Makefile.in koffice-1.4.2/filters/krita/Makefile.in
--- koffice-1.4.2.orig/filters/krita/Makefile.in 2005-10-05 12:52:35.000000000 +0200
-+++ koffice-1.4.2/filters/krita/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/filters/krita/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -55427,7 +55427,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kspread/applixspread/Makefile.in koffice-1.4.2/filters/kspread/applixspread/Makefile.in
--- koffice-1.4.2.orig/filters/kspread/applixspread/Makefile.in 2005-10-05 12:52:35.000000000 +0200
-+++ koffice-1.4.2/filters/kspread/applixspread/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/filters/kspread/applixspread/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -56361,7 +56361,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kspread/csv/Makefile.in koffice-1.4.2/filters/kspread/csv/Makefile.in
--- koffice-1.4.2.orig/filters/kspread/csv/Makefile.in 2005-10-05 12:52:35.000000000 +0200
-+++ koffice-1.4.2/filters/kspread/csv/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/filters/kspread/csv/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -57378,7 +57378,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kspread/dbase/Makefile.in koffice-1.4.2/filters/kspread/dbase/Makefile.in
--- koffice-1.4.2.orig/filters/kspread/dbase/Makefile.in 2005-10-05 12:52:35.000000000 +0200
-+++ koffice-1.4.2/filters/kspread/dbase/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/filters/kspread/dbase/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -58360,7 +58360,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kspread/excel/import/Makefile.in koffice-1.4.2/filters/kspread/excel/import/Makefile.in
--- koffice-1.4.2.orig/filters/kspread/excel/import/Makefile.in 2005-10-05 12:52:35.000000000 +0200
-+++ koffice-1.4.2/filters/kspread/excel/import/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/filters/kspread/excel/import/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -59293,7 +59293,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kspread/excel/Makefile.in koffice-1.4.2/filters/kspread/excel/Makefile.in
--- koffice-1.4.2.orig/filters/kspread/excel/Makefile.in 2005-10-05 12:52:35.000000000 +0200
-+++ koffice-1.4.2/filters/kspread/excel/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/filters/kspread/excel/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -60176,7 +60176,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kspread/excel/sidewinder/Makefile.in koffice-1.4.2/filters/kspread/excel/sidewinder/Makefile.in
--- koffice-1.4.2.orig/filters/kspread/excel/sidewinder/Makefile.in 2005-10-05 12:52:35.000000000 +0200
-+++ koffice-1.4.2/filters/kspread/excel/sidewinder/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/filters/kspread/excel/sidewinder/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -61036,7 +61036,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kspread/gnumeric/Makefile.in koffice-1.4.2/filters/kspread/gnumeric/Makefile.in
--- koffice-1.4.2.orig/filters/kspread/gnumeric/Makefile.in 2005-10-05 12:52:35.000000000 +0200
-+++ koffice-1.4.2/filters/kspread/gnumeric/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kspread/gnumeric/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -61990,7 +61990,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kspread/html/Makefile.in koffice-1.4.2/filters/kspread/html/Makefile.in
--- koffice-1.4.2.orig/filters/kspread/html/Makefile.in 2005-10-05 12:52:35.000000000 +0200
-+++ koffice-1.4.2/filters/kspread/html/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kspread/html/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -62937,7 +62937,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kspread/latex/export/Makefile.in koffice-1.4.2/filters/kspread/latex/export/Makefile.in
--- koffice-1.4.2.orig/filters/kspread/latex/export/Makefile.in 2005-10-05 12:52:35.000000000 +0200
-+++ koffice-1.4.2/filters/kspread/latex/export/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kspread/latex/export/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -63936,7 +63936,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kspread/latex/Makefile.in koffice-1.4.2/filters/kspread/latex/Makefile.in
--- koffice-1.4.2.orig/filters/kspread/latex/Makefile.in 2005-10-05 12:52:35.000000000 +0200
-+++ koffice-1.4.2/filters/kspread/latex/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kspread/latex/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -64761,7 +64761,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kspread/libkspreadexport/Makefile.in koffice-1.4.2/filters/kspread/libkspreadexport/Makefile.in
--- koffice-1.4.2.orig/filters/kspread/libkspreadexport/Makefile.in 2005-10-05 12:52:35.000000000 +0200
-+++ koffice-1.4.2/filters/kspread/libkspreadexport/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kspread/libkspreadexport/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -65673,7 +65673,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kspread/Makefile.in koffice-1.4.2/filters/kspread/Makefile.in
--- koffice-1.4.2.orig/filters/kspread/Makefile.in 2005-10-05 12:52:35.000000000 +0200
-+++ koffice-1.4.2/filters/kspread/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/filters/kspread/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -66495,7 +66495,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kspread/opencalc/Makefile.in koffice-1.4.2/filters/kspread/opencalc/Makefile.in
--- koffice-1.4.2.orig/filters/kspread/opencalc/Makefile.in 2005-10-05 12:52:35.000000000 +0200
-+++ koffice-1.4.2/filters/kspread/opencalc/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kspread/opencalc/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -67468,7 +67468,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kspread/qpro/libqpro/Makefile.in koffice-1.4.2/filters/kspread/qpro/libqpro/Makefile.in
--- koffice-1.4.2.orig/filters/kspread/qpro/libqpro/Makefile.in 2005-10-05 12:52:35.000000000 +0200
-+++ koffice-1.4.2/filters/kspread/qpro/libqpro/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kspread/qpro/libqpro/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -68294,7 +68294,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kspread/qpro/libqpro/qpro/Makefile.in koffice-1.4.2/filters/kspread/qpro/libqpro/qpro/Makefile.in
--- koffice-1.4.2.orig/filters/kspread/qpro/libqpro/qpro/Makefile.in 2005-10-05 12:52:35.000000000 +0200
-+++ koffice-1.4.2/filters/kspread/qpro/libqpro/qpro/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kspread/qpro/libqpro/qpro/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -68997,7 +68997,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kspread/qpro/libqpro/src/Makefile.in koffice-1.4.2/filters/kspread/qpro/libqpro/src/Makefile.in
--- koffice-1.4.2.orig/filters/kspread/qpro/libqpro/src/Makefile.in 2005-10-05 12:52:35.000000000 +0200
-+++ koffice-1.4.2/filters/kspread/qpro/libqpro/src/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kspread/qpro/libqpro/src/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -69851,7 +69851,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kspread/qpro/Makefile.in koffice-1.4.2/filters/kspread/qpro/Makefile.in
--- koffice-1.4.2.orig/filters/kspread/qpro/Makefile.in 2005-10-05 12:52:35.000000000 +0200
-+++ koffice-1.4.2/filters/kspread/qpro/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kspread/qpro/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -70930,7 +70930,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kugar/kugarnop/Makefile.in koffice-1.4.2/filters/kugar/kugarnop/Makefile.in
--- koffice-1.4.2.orig/filters/kugar/kugarnop/Makefile.in 2005-10-05 12:52:35.000000000 +0200
-+++ koffice-1.4.2/filters/kugar/kugarnop/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kugar/kugarnop/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -71861,7 +71861,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kugar/Makefile.in koffice-1.4.2/filters/kugar/Makefile.in
--- koffice-1.4.2.orig/filters/kugar/Makefile.in 2005-10-05 12:52:35.000000000 +0200
-+++ koffice-1.4.2/filters/kugar/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kugar/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -72683,7 +72683,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kword/abiword/Makefile.in koffice-1.4.2/filters/kword/abiword/Makefile.in
--- koffice-1.4.2.orig/filters/kword/abiword/Makefile.in 2005-10-05 12:52:35.000000000 +0200
-+++ koffice-1.4.2/filters/kword/abiword/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kword/abiword/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -73671,7 +73671,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kword/amipro/Makefile.in koffice-1.4.2/filters/kword/amipro/Makefile.in
--- koffice-1.4.2.orig/filters/kword/amipro/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/kword/amipro/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kword/amipro/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -74677,7 +74677,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kword/applixword/Makefile.in koffice-1.4.2/filters/kword/applixword/Makefile.in
--- koffice-1.4.2.orig/filters/kword/applixword/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/kword/applixword/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kword/applixword/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -75611,7 +75611,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kword/ascii/Makefile.in koffice-1.4.2/filters/kword/ascii/Makefile.in
--- koffice-1.4.2.orig/filters/kword/ascii/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/kword/ascii/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kword/ascii/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -76596,7 +76596,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kword/docbook/Makefile.in koffice-1.4.2/filters/kword/docbook/Makefile.in
--- koffice-1.4.2.orig/filters/kword/docbook/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/kword/docbook/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kword/docbook/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -77532,7 +77532,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kword/html/export/Makefile.in koffice-1.4.2/filters/kword/html/export/Makefile.in
--- koffice-1.4.2.orig/filters/kword/html/export/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/kword/html/export/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kword/html/export/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -78504,7 +78504,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kword/html/import/Makefile.in koffice-1.4.2/filters/kword/html/import/Makefile.in
--- koffice-1.4.2.orig/filters/kword/html/import/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/kword/html/import/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kword/html/import/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -79458,7 +79458,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kword/html/Makefile.in koffice-1.4.2/filters/kword/html/Makefile.in
--- koffice-1.4.2.orig/filters/kword/html/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/kword/html/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kword/html/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -80283,7 +80283,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kword/kword1.3/import/Makefile.in koffice-1.4.2/filters/kword/kword1.3/import/Makefile.in
--- koffice-1.4.2.orig/filters/kword/kword1.3/import/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/kword/kword1.3/import/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kword/kword1.3/import/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -81240,7 +81240,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kword/kword1.3/Makefile.in koffice-1.4.2/filters/kword/kword1.3/Makefile.in
--- koffice-1.4.2.orig/filters/kword/kword1.3/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/kword/kword1.3/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kword/kword1.3/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -82063,7 +82063,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kword/latex/export/Makefile.in koffice-1.4.2/filters/kword/latex/export/Makefile.in
--- koffice-1.4.2.orig/filters/kword/latex/export/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/kword/latex/export/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kword/latex/export/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -83080,7 +83080,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kword/latex/import/generator/Makefile.in koffice-1.4.2/filters/kword/latex/import/generator/Makefile.in
--- koffice-1.4.2.orig/filters/kword/latex/import/generator/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/kword/latex/import/generator/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kword/latex/import/generator/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -83993,7 +83993,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kword/latex/import/Makefile.in koffice-1.4.2/filters/kword/latex/import/Makefile.in
--- koffice-1.4.2.orig/filters/kword/latex/import/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/kword/latex/import/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kword/latex/import/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -85092,7 +85092,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kword/latex/import/parser/Makefile.in koffice-1.4.2/filters/kword/latex/import/parser/Makefile.in
--- koffice-1.4.2.orig/filters/kword/latex/import/parser/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/kword/latex/import/parser/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kword/latex/import/parser/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -86056,7 +86056,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kword/latex/Makefile.in koffice-1.4.2/filters/kword/latex/Makefile.in
--- koffice-1.4.2.orig/filters/kword/latex/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/kword/latex/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kword/latex/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -86882,7 +86882,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kword/libexport/Makefile.in koffice-1.4.2/filters/kword/libexport/Makefile.in
--- koffice-1.4.2.orig/filters/kword/libexport/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/kword/libexport/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kword/libexport/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -87818,7 +87818,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kword/Makefile.in koffice-1.4.2/filters/kword/Makefile.in
--- koffice-1.4.2.orig/filters/kword/Makefile.in 2005-10-05 12:52:35.000000000 +0200
-+++ koffice-1.4.2/filters/kword/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kword/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -88646,7 +88646,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kword/msword/Makefile.in koffice-1.4.2/filters/kword/msword/Makefile.in
--- koffice-1.4.2.orig/filters/kword/msword/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/kword/msword/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kword/msword/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -89605,7 +89605,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kword/mswrite/Makefile.in koffice-1.4.2/filters/kword/mswrite/Makefile.in
--- koffice-1.4.2.orig/filters/kword/mswrite/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/kword/mswrite/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kword/mswrite/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -90660,7 +90660,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kword/oowriter/Makefile.in koffice-1.4.2/filters/kword/oowriter/Makefile.in
--- koffice-1.4.2.orig/filters/kword/oowriter/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/kword/oowriter/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kword/oowriter/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -91660,7 +91660,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kword/palmdoc/Makefile.in koffice-1.4.2/filters/kword/palmdoc/Makefile.in
--- koffice-1.4.2.orig/filters/kword/palmdoc/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/kword/palmdoc/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kword/palmdoc/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -92672,7 +92672,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kword/pdf/Makefile.in koffice-1.4.2/filters/kword/pdf/Makefile.in
--- koffice-1.4.2.orig/filters/kword/pdf/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/kword/pdf/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kword/pdf/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -93752,7 +93752,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kword/pdf/xpdf/goo/Makefile.in koffice-1.4.2/filters/kword/pdf/xpdf/goo/Makefile.in
--- koffice-1.4.2.orig/filters/kword/pdf/xpdf/goo/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/kword/pdf/xpdf/goo/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kword/pdf/xpdf/goo/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -94666,7 +94666,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kword/pdf/xpdf/Makefile.in koffice-1.4.2/filters/kword/pdf/xpdf/Makefile.in
--- koffice-1.4.2.orig/filters/kword/pdf/xpdf/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/kword/pdf/xpdf/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kword/pdf/xpdf/Makefile.in 2005-11-14 09:13:45.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -95492,7 +95492,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kword/pdf/xpdf/xpdf/Makefile.in koffice-1.4.2/filters/kword/pdf/xpdf/xpdf/Makefile.in
--- koffice-1.4.2.orig/filters/kword/pdf/xpdf/xpdf/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/kword/pdf/xpdf/xpdf/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kword/pdf/xpdf/xpdf/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -96409,7 +96409,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kword/rtf/export/Makefile.in koffice-1.4.2/filters/kword/rtf/export/Makefile.in
--- koffice-1.4.2.orig/filters/kword/rtf/export/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/kword/rtf/export/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kword/rtf/export/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -97358,7 +97358,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kword/rtf/import/Makefile.in koffice-1.4.2/filters/kword/rtf/import/Makefile.in
--- koffice-1.4.2.orig/filters/kword/rtf/import/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/kword/rtf/import/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kword/rtf/import/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -98311,7 +98311,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kword/rtf/Makefile.in koffice-1.4.2/filters/kword/rtf/Makefile.in
--- koffice-1.4.2.orig/filters/kword/rtf/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/kword/rtf/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kword/rtf/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -99136,7 +99136,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kword/starwriter/Makefile.in koffice-1.4.2/filters/kword/starwriter/Makefile.in
--- koffice-1.4.2.orig/filters/kword/starwriter/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/kword/starwriter/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kword/starwriter/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -100112,7 +100112,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kword/wml/Makefile.in koffice-1.4.2/filters/kword/wml/Makefile.in
--- koffice-1.4.2.orig/filters/kword/wml/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/kword/wml/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kword/wml/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -101110,7 +101110,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kword/wordperfect/export/Makefile.in koffice-1.4.2/filters/kword/wordperfect/export/Makefile.in
--- koffice-1.4.2.orig/filters/kword/wordperfect/export/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/kword/wordperfect/export/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kword/wordperfect/export/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -102054,7 +102054,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kword/wordperfect/import/Makefile.in koffice-1.4.2/filters/kword/wordperfect/import/Makefile.in
--- koffice-1.4.2.orig/filters/kword/wordperfect/import/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/kword/wordperfect/import/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kword/wordperfect/import/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -102987,7 +102987,7 @@
diff -Nrua koffice-1.4.2.orig/filters/kword/wordperfect/Makefile.in koffice-1.4.2/filters/kword/wordperfect/Makefile.in
--- koffice-1.4.2.orig/filters/kword/wordperfect/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/kword/wordperfect/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/kword/wordperfect/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -103811,7 +103811,7 @@
diff -Nrua koffice-1.4.2.orig/filters/liboofilter/Makefile.in koffice-1.4.2/filters/liboofilter/Makefile.in
--- koffice-1.4.2.orig/filters/liboofilter/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/liboofilter/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/liboofilter/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -104661,7 +104661,7 @@
diff -Nrua koffice-1.4.2.orig/filters/Makefile.in koffice-1.4.2/filters/Makefile.in
--- koffice-1.4.2.orig/filters/Makefile.in 2005-10-05 12:52:34.000000000 +0200
-+++ koffice-1.4.2/filters/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/filters/Makefile.in 2005-11-14 09:13:44.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -105505,7 +105505,7 @@
diff -Nrua koffice-1.4.2.orig/filters/olefilters/excel97/Makefile.in koffice-1.4.2/filters/olefilters/excel97/Makefile.in
--- koffice-1.4.2.orig/filters/olefilters/excel97/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/olefilters/excel97/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/olefilters/excel97/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -106371,7 +106371,7 @@
diff -Nrua koffice-1.4.2.orig/filters/olefilters/hancomword/Makefile.in koffice-1.4.2/filters/olefilters/hancomword/Makefile.in
--- koffice-1.4.2.orig/filters/olefilters/hancomword/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/olefilters/hancomword/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/olefilters/hancomword/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -107268,7 +107268,7 @@
diff -Nrua koffice-1.4.2.orig/filters/olefilters/lib/Makefile.in koffice-1.4.2/filters/olefilters/lib/Makefile.in
--- koffice-1.4.2.orig/filters/olefilters/lib/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/olefilters/lib/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/olefilters/lib/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -108135,7 +108135,7 @@
diff -Nrua koffice-1.4.2.orig/filters/olefilters/Makefile.in koffice-1.4.2/filters/olefilters/Makefile.in
--- koffice-1.4.2.orig/filters/olefilters/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/olefilters/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/olefilters/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -109170,7 +109170,7 @@
diff -Nrua koffice-1.4.2.orig/filters/olefilters/powerpoint97/Makefile.in koffice-1.4.2/filters/olefilters/powerpoint97/Makefile.in
--- koffice-1.4.2.orig/filters/olefilters/powerpoint97/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/olefilters/powerpoint97/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/olefilters/powerpoint97/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -110129,7 +110129,7 @@
diff -Nrua koffice-1.4.2.orig/filters/olefilters/winword97/Makefile.in koffice-1.4.2/filters/olefilters/winword97/Makefile.in
--- koffice-1.4.2.orig/filters/olefilters/winword97/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/olefilters/winword97/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/olefilters/winword97/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -111012,7 +111012,7 @@
diff -Nrua koffice-1.4.2.orig/filters/xsltfilter/export/Makefile.in koffice-1.4.2/filters/xsltfilter/export/Makefile.in
--- koffice-1.4.2.orig/filters/xsltfilter/export/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/xsltfilter/export/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/filters/xsltfilter/export/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -112103,7 +112103,7 @@
diff -Nrua koffice-1.4.2.orig/filters/xsltfilter/export/xsl/kword/Makefile.in koffice-1.4.2/filters/xsltfilter/export/xsl/kword/Makefile.in
--- koffice-1.4.2.orig/filters/xsltfilter/export/xsl/kword/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/xsltfilter/export/xsl/kword/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/filters/xsltfilter/export/xsl/kword/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -112925,7 +112925,7 @@
diff -Nrua koffice-1.4.2.orig/filters/xsltfilter/export/xsl/kword/xslfo/Makefile.in koffice-1.4.2/filters/xsltfilter/export/xsl/kword/xslfo/Makefile.in
--- koffice-1.4.2.orig/filters/xsltfilter/export/xsl/kword/xslfo/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/xsltfilter/export/xsl/kword/xslfo/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/filters/xsltfilter/export/xsl/kword/xslfo/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -113620,7 +113620,7 @@
diff -Nrua koffice-1.4.2.orig/filters/xsltfilter/export/xsl/Makefile.in koffice-1.4.2/filters/xsltfilter/export/xsl/Makefile.in
--- koffice-1.4.2.orig/filters/xsltfilter/export/xsl/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/xsltfilter/export/xsl/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/filters/xsltfilter/export/xsl/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -114442,7 +114442,7 @@
diff -Nrua koffice-1.4.2.orig/filters/xsltfilter/import/Makefile.in koffice-1.4.2/filters/xsltfilter/import/Makefile.in
--- koffice-1.4.2.orig/filters/xsltfilter/import/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/xsltfilter/import/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/filters/xsltfilter/import/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -115400,7 +115400,7 @@
diff -Nrua koffice-1.4.2.orig/filters/xsltfilter/Makefile.in koffice-1.4.2/filters/xsltfilter/Makefile.in
--- koffice-1.4.2.orig/filters/xsltfilter/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/filters/xsltfilter/Makefile.in 2005-11-13 10:33:42.000000000 +0100
++++ koffice-1.4.2/filters/xsltfilter/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -116225,7 +116225,7 @@
diff -Nrua koffice-1.4.2.orig/interfaces/Makefile.in koffice-1.4.2/interfaces/Makefile.in
--- koffice-1.4.2.orig/interfaces/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/interfaces/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/interfaces/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -117146,7 +117146,7 @@
diff -Nrua koffice-1.4.2.orig/karbon/commands/Makefile.in koffice-1.4.2/karbon/commands/Makefile.in
--- koffice-1.4.2.orig/karbon/commands/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/karbon/commands/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/karbon/commands/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -118079,7 +118079,7 @@
diff -Nrua koffice-1.4.2.orig/karbon/core/Makefile.in koffice-1.4.2/karbon/core/Makefile.in
--- koffice-1.4.2.orig/karbon/core/Makefile.in 2005-10-05 12:52:38.000000000 +0200
-+++ koffice-1.4.2/karbon/core/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/karbon/core/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -119024,7 +119024,7 @@
diff -Nrua koffice-1.4.2.orig/karbon/data/Makefile.in koffice-1.4.2/karbon/data/Makefile.in
--- koffice-1.4.2.orig/karbon/data/Makefile.in 2005-10-05 12:52:39.000000000 +0200
-+++ koffice-1.4.2/karbon/data/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/karbon/data/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -119815,7 +119815,7 @@
diff -Nrua koffice-1.4.2.orig/karbon/dialogs/Makefile.in koffice-1.4.2/karbon/dialogs/Makefile.in
--- koffice-1.4.2.orig/karbon/dialogs/Makefile.in 2005-10-05 12:52:40.000000000 +0200
-+++ koffice-1.4.2/karbon/dialogs/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/karbon/dialogs/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -120695,7 +120695,7 @@
diff -Nrua koffice-1.4.2.orig/karbon/dockers/Makefile.in koffice-1.4.2/karbon/dockers/Makefile.in
--- koffice-1.4.2.orig/karbon/dockers/Makefile.in 2005-10-05 12:52:40.000000000 +0200
-+++ koffice-1.4.2/karbon/dockers/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/karbon/dockers/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -121594,7 +121594,7 @@
diff -Nrua koffice-1.4.2.orig/karbon/Makefile.in koffice-1.4.2/karbon/Makefile.in
--- koffice-1.4.2.orig/karbon/Makefile.in 2005-10-05 12:52:36.000000000 +0200
-+++ koffice-1.4.2/karbon/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/karbon/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -122159,9 +122159,15 @@
SUBDIRS = commands visitors core shapes widgets dialogs dockers render tools . plugins data pics
# Filters should link to libkarbonbase or libkarboncommon, NOT to libkarbonpart
-@@ -354,22 +601,18 @@
+@@ -350,26 +597,22 @@
+ # (e.g. VTranslateCmd), and commands (e.g. VCommandHistory) need KarbonPart,
+ # so even moving more stuff to libkarbonbase isn't enough.
+ # -> I think the whole 'base' stuff can be removed (DF)
+-#>- lib_LTLIBRARIES = libkarboncommon.la libkarbonbase.la
++#>- lib_LTLIBRARIES = libkarbonbase.la libkarboncommon.la
#>+ 1
- lib_LTLIBRARIES = libkarboncommon.la libkarbonbase.la libkdeinit_karbon.la
+-lib_LTLIBRARIES = libkarboncommon.la libkarbonbase.la libkdeinit_karbon.la
++lib_LTLIBRARIES = libkarbonbase.la libkarboncommon.la libkdeinit_karbon.la
kde_module_LTLIBRARIES = libkarbonpart.la
-
#>- libkarboncommon_la_SOURCES = karbon_factory.cc karbon_resourceserver.cc karbon_part.cc karbon_part_iface.cc karbon_part_iface.skel karbon_view.cc karbon_view_iface.cc karbon_view_iface.skel karbon_drag.cpp karbon_grid_data.cpp
@@ -122961,7 +122967,7 @@
diff -Nrua koffice-1.4.2.orig/karbon/pics/Makefile.in koffice-1.4.2/karbon/pics/Makefile.in
--- koffice-1.4.2.orig/karbon/pics/Makefile.in 2005-10-05 12:52:40.000000000 +0200
-+++ koffice-1.4.2/karbon/pics/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/karbon/pics/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -123617,7 +123623,7 @@
diff -Nrua koffice-1.4.2.orig/karbon/plugins/flattenpath/Makefile.in koffice-1.4.2/karbon/plugins/flattenpath/Makefile.in
--- koffice-1.4.2.orig/karbon/plugins/flattenpath/Makefile.in 2005-10-05 12:52:40.000000000 +0200
-+++ koffice-1.4.2/karbon/plugins/flattenpath/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/karbon/plugins/flattenpath/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -124547,7 +124553,7 @@
diff -Nrua koffice-1.4.2.orig/karbon/plugins/imagetool/Makefile.in koffice-1.4.2/karbon/plugins/imagetool/Makefile.in
--- koffice-1.4.2.orig/karbon/plugins/imagetool/Makefile.in 2005-10-05 12:52:40.000000000 +0200
-+++ koffice-1.4.2/karbon/plugins/imagetool/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/karbon/plugins/imagetool/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -125477,7 +125483,7 @@
diff -Nrua koffice-1.4.2.orig/karbon/plugins/insertknots/Makefile.in koffice-1.4.2/karbon/plugins/insertknots/Makefile.in
--- koffice-1.4.2.orig/karbon/plugins/insertknots/Makefile.in 2005-10-05 12:52:40.000000000 +0200
-+++ koffice-1.4.2/karbon/plugins/insertknots/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/karbon/plugins/insertknots/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -126407,7 +126413,7 @@
diff -Nrua koffice-1.4.2.orig/karbon/plugins/Makefile.in koffice-1.4.2/karbon/plugins/Makefile.in
--- koffice-1.4.2.orig/karbon/plugins/Makefile.in 2005-10-05 12:52:40.000000000 +0200
-+++ koffice-1.4.2/karbon/plugins/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/karbon/plugins/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -127229,7 +127235,7 @@
diff -Nrua koffice-1.4.2.orig/karbon/plugins/roundcorners/Makefile.in koffice-1.4.2/karbon/plugins/roundcorners/Makefile.in
--- koffice-1.4.2.orig/karbon/plugins/roundcorners/Makefile.in 2005-10-05 12:52:40.000000000 +0200
-+++ koffice-1.4.2/karbon/plugins/roundcorners/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/karbon/plugins/roundcorners/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -128159,7 +128165,7 @@
diff -Nrua koffice-1.4.2.orig/karbon/plugins/shadoweffect/Makefile.in koffice-1.4.2/karbon/plugins/shadoweffect/Makefile.in
--- koffice-1.4.2.orig/karbon/plugins/shadoweffect/Makefile.in 2005-10-05 12:52:40.000000000 +0200
-+++ koffice-1.4.2/karbon/plugins/shadoweffect/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/karbon/plugins/shadoweffect/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -129104,7 +129110,7 @@
diff -Nrua koffice-1.4.2.orig/karbon/plugins/whirlpinch/Makefile.in koffice-1.4.2/karbon/plugins/whirlpinch/Makefile.in
--- koffice-1.4.2.orig/karbon/plugins/whirlpinch/Makefile.in 2005-10-05 12:52:40.000000000 +0200
-+++ koffice-1.4.2/karbon/plugins/whirlpinch/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/karbon/plugins/whirlpinch/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -130034,7 +130040,7 @@
diff -Nrua koffice-1.4.2.orig/karbon/plugins/zoomtool/Makefile.in koffice-1.4.2/karbon/plugins/zoomtool/Makefile.in
--- koffice-1.4.2.orig/karbon/plugins/zoomtool/Makefile.in 2005-10-05 12:52:40.000000000 +0200
-+++ koffice-1.4.2/karbon/plugins/zoomtool/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/karbon/plugins/zoomtool/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -130964,7 +130970,7 @@
diff -Nrua koffice-1.4.2.orig/karbon/render/Makefile.in koffice-1.4.2/karbon/render/Makefile.in
--- koffice-1.4.2.orig/karbon/render/Makefile.in 2005-10-05 12:52:41.000000000 +0200
-+++ koffice-1.4.2/karbon/render/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/karbon/render/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -132042,7 +132048,7 @@
diff -Nrua koffice-1.4.2.orig/karbon/render/xrgbrender/Makefile.in koffice-1.4.2/karbon/render/xrgbrender/Makefile.in
--- koffice-1.4.2.orig/karbon/render/xrgbrender/Makefile.in 2005-10-05 12:52:41.000000000 +0200
-+++ koffice-1.4.2/karbon/render/xrgbrender/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/karbon/render/xrgbrender/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -132882,7 +132888,7 @@
diff -Nrua koffice-1.4.2.orig/karbon/shapes/Makefile.in koffice-1.4.2/karbon/shapes/Makefile.in
--- koffice-1.4.2.orig/karbon/shapes/Makefile.in 2005-10-05 12:52:41.000000000 +0200
-+++ koffice-1.4.2/karbon/shapes/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/karbon/shapes/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -133764,7 +133770,7 @@
diff -Nrua koffice-1.4.2.orig/karbon/tools/Makefile.in koffice-1.4.2/karbon/tools/Makefile.in
--- koffice-1.4.2.orig/karbon/tools/Makefile.in 2005-10-05 12:52:41.000000000 +0200
-+++ koffice-1.4.2/karbon/tools/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/karbon/tools/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -134712,7 +134718,7 @@
diff -Nrua koffice-1.4.2.orig/karbon/visitors/Makefile.in koffice-1.4.2/karbon/visitors/Makefile.in
--- koffice-1.4.2.orig/karbon/visitors/Makefile.in 2005-10-05 12:52:41.000000000 +0200
-+++ koffice-1.4.2/karbon/visitors/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/karbon/visitors/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -135597,7 +135603,7 @@
diff -Nrua koffice-1.4.2.orig/karbon/widgets/Makefile.in koffice-1.4.2/karbon/widgets/Makefile.in
--- koffice-1.4.2.orig/karbon/widgets/Makefile.in 2005-10-05 12:52:41.000000000 +0200
-+++ koffice-1.4.2/karbon/widgets/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/karbon/widgets/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -136514,7 +136520,7 @@
diff -Nrua koffice-1.4.2.orig/kchart/kdchart/Makefile.in koffice-1.4.2/kchart/kdchart/Makefile.in
--- koffice-1.4.2.orig/kchart/kdchart/Makefile.in 2005-10-05 12:52:41.000000000 +0200
-+++ koffice-1.4.2/kchart/kdchart/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/kchart/kdchart/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -137566,7 +137572,7 @@
diff -Nrua koffice-1.4.2.orig/kchart/Makefile.in koffice-1.4.2/kchart/Makefile.in
--- koffice-1.4.2.orig/kchart/Makefile.in 2005-10-05 12:52:41.000000000 +0200
-+++ koffice-1.4.2/kchart/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/kchart/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -139089,7 +139095,7 @@
diff -Nrua koffice-1.4.2.orig/kchart/pics/Makefile.in koffice-1.4.2/kchart/pics/Makefile.in
--- koffice-1.4.2.orig/kchart/pics/Makefile.in 2005-10-05 12:52:41.000000000 +0200
-+++ koffice-1.4.2/kchart/pics/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/kchart/pics/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -139799,7 +139805,7 @@
diff -Nrua koffice-1.4.2.orig/kchart/templates/Makefile.in koffice-1.4.2/kchart/templates/Makefile.in
--- koffice-1.4.2.orig/kchart/templates/Makefile.in 2005-10-05 12:52:41.000000000 +0200
-+++ koffice-1.4.2/kchart/templates/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/kchart/templates/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -140534,7 +140540,7 @@
diff -Nrua koffice-1.4.2.orig/kchart/toolbar/crystalsvg/Makefile.in koffice-1.4.2/kchart/toolbar/crystalsvg/Makefile.in
--- koffice-1.4.2.orig/kchart/toolbar/crystalsvg/Makefile.in 2005-10-05 12:52:41.000000000 +0200
-+++ koffice-1.4.2/kchart/toolbar/crystalsvg/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/kchart/toolbar/crystalsvg/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -141188,7 +141194,7 @@
diff -Nrua koffice-1.4.2.orig/kchart/toolbar/locolor/Makefile.in koffice-1.4.2/kchart/toolbar/locolor/Makefile.in
--- koffice-1.4.2.orig/kchart/toolbar/locolor/Makefile.in 2005-10-05 12:52:41.000000000 +0200
-+++ koffice-1.4.2/kchart/toolbar/locolor/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/kchart/toolbar/locolor/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -141842,7 +141848,7 @@
diff -Nrua koffice-1.4.2.orig/kchart/toolbar/Makefile.in koffice-1.4.2/kchart/toolbar/Makefile.in
--- koffice-1.4.2.orig/kchart/toolbar/Makefile.in 2005-10-05 12:52:41.000000000 +0200
-+++ koffice-1.4.2/kchart/toolbar/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/kchart/toolbar/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -142665,7 +142671,7 @@
diff -Nrua koffice-1.4.2.orig/kdgantt/Makefile.in koffice-1.4.2/kdgantt/Makefile.in
--- koffice-1.4.2.orig/kdgantt/Makefile.in 2005-10-05 12:52:42.000000000 +0200
-+++ koffice-1.4.2/kdgantt/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/kdgantt/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -143596,7 +143602,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/3rdparty/kexisql/Makefile.in koffice-1.4.2/kexi/3rdparty/kexisql/Makefile.in
--- koffice-1.4.2.orig/kexi/3rdparty/kexisql/Makefile.in 2005-10-05 12:52:42.000000000 +0200
-+++ koffice-1.4.2/kexi/3rdparty/kexisql/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/kexi/3rdparty/kexisql/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -144421,7 +144427,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/3rdparty/kexisql/src/Makefile.in koffice-1.4.2/kexi/3rdparty/kexisql/src/Makefile.in
--- koffice-1.4.2.orig/kexi/3rdparty/kexisql/src/Makefile.in 2005-10-05 12:52:42.000000000 +0200
-+++ koffice-1.4.2/kexi/3rdparty/kexisql/src/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/kexi/3rdparty/kexisql/src/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -145415,7 +145421,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/3rdparty/kexisql/tool/Makefile.in koffice-1.4.2/kexi/3rdparty/kexisql/tool/Makefile.in
--- koffice-1.4.2.orig/kexi/3rdparty/kexisql/tool/Makefile.in 2005-10-05 12:52:42.000000000 +0200
-+++ koffice-1.4.2/kexi/3rdparty/kexisql/tool/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/kexi/3rdparty/kexisql/tool/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -146063,7 +146069,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/3rdparty/kexisql3/Makefile.in koffice-1.4.2/kexi/3rdparty/kexisql3/Makefile.in
--- koffice-1.4.2.orig/kexi/3rdparty/kexisql3/Makefile.in 2005-10-05 12:52:42.000000000 +0200
-+++ koffice-1.4.2/kexi/3rdparty/kexisql3/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/kexi/3rdparty/kexisql3/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -146888,7 +146894,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/3rdparty/kexisql3/src/Makefile.in koffice-1.4.2/kexi/3rdparty/kexisql3/src/Makefile.in
--- koffice-1.4.2.orig/kexi/3rdparty/kexisql3/src/Makefile.in 2005-10-05 12:52:42.000000000 +0200
-+++ koffice-1.4.2/kexi/3rdparty/kexisql3/src/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/kexi/3rdparty/kexisql3/src/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -147922,7 +147928,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/3rdparty/Makefile.in koffice-1.4.2/kexi/3rdparty/Makefile.in
--- koffice-1.4.2.orig/kexi/3rdparty/Makefile.in 2005-10-05 12:52:42.000000000 +0200
-+++ koffice-1.4.2/kexi/3rdparty/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/kexi/3rdparty/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -148749,7 +148755,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/3rdparty/uuid/Makefile.in koffice-1.4.2/kexi/3rdparty/uuid/Makefile.in
--- koffice-1.4.2.orig/kexi/3rdparty/uuid/Makefile.in 2005-10-05 12:52:42.000000000 +0200
-+++ koffice-1.4.2/kexi/3rdparty/uuid/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/kexi/3rdparty/uuid/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -149723,7 +149729,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/core/Makefile.in koffice-1.4.2/kexi/core/Makefile.in
--- koffice-1.4.2.orig/kexi/core/Makefile.in 2005-10-05 12:52:42.000000000 +0200
-+++ koffice-1.4.2/kexi/core/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/kexi/core/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -150884,7 +150890,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/data/kde32compat/Makefile.in koffice-1.4.2/kexi/data/kde32compat/Makefile.in
--- koffice-1.4.2.orig/kexi/data/kde32compat/Makefile.in 2005-10-05 12:52:42.000000000 +0200
-+++ koffice-1.4.2/kexi/data/kde32compat/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/kexi/data/kde32compat/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -151615,7 +151621,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/data/Makefile.in koffice-1.4.2/kexi/data/Makefile.in
--- koffice-1.4.2.orig/kexi/data/Makefile.in 2005-10-05 12:52:42.000000000 +0200
-+++ koffice-1.4.2/kexi/data/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/kexi/data/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -152673,7 +152679,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/filters/import/csv/Makefile.in koffice-1.4.2/kexi/filters/import/csv/Makefile.in
--- koffice-1.4.2.orig/kexi/filters/import/csv/Makefile.in 2005-10-05 12:52:42.000000000 +0200
-+++ koffice-1.4.2/kexi/filters/import/csv/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/kexi/filters/import/csv/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -153485,7 +153491,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/filters/import/kspread_chain/Makefile.in koffice-1.4.2/kexi/filters/import/kspread_chain/Makefile.in
--- koffice-1.4.2.orig/kexi/filters/import/kspread_chain/Makefile.in 2005-10-05 12:52:42.000000000 +0200
-+++ koffice-1.4.2/kexi/filters/import/kspread_chain/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/kexi/filters/import/kspread_chain/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -154440,7 +154446,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/filters/import/Makefile.in koffice-1.4.2/kexi/filters/import/Makefile.in
--- koffice-1.4.2.orig/kexi/filters/import/Makefile.in 2005-10-05 12:52:42.000000000 +0200
-+++ koffice-1.4.2/kexi/filters/import/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/kexi/filters/import/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -155268,7 +155274,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/filters/Makefile.in koffice-1.4.2/kexi/filters/Makefile.in
--- koffice-1.4.2.orig/kexi/filters/Makefile.in 2005-10-05 12:52:42.000000000 +0200
-+++ koffice-1.4.2/kexi/filters/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/kexi/filters/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -156090,7 +156096,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/formeditor/factories/Makefile.in koffice-1.4.2/kexi/formeditor/factories/Makefile.in
--- koffice-1.4.2.orig/kexi/formeditor/factories/Makefile.in 2005-10-05 12:52:44.000000000 +0200
-+++ koffice-1.4.2/kexi/formeditor/factories/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/kexi/formeditor/factories/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -157043,7 +157049,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/formeditor/kdevelop_plugin/Makefile.in koffice-1.4.2/kexi/formeditor/kdevelop_plugin/Makefile.in
--- koffice-1.4.2.orig/kexi/formeditor/kdevelop_plugin/Makefile.in 2005-10-05 12:52:44.000000000 +0200
-+++ koffice-1.4.2/kexi/formeditor/kdevelop_plugin/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/kexi/formeditor/kdevelop_plugin/Makefile.in 2005-11-14 09:13:47.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -158012,7 +158018,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/formeditor/Makefile.in koffice-1.4.2/kexi/formeditor/Makefile.in
--- koffice-1.4.2.orig/kexi/formeditor/Makefile.in 2005-10-05 12:52:44.000000000 +0200
-+++ koffice-1.4.2/kexi/formeditor/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/kexi/formeditor/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -159171,7 +159177,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/formeditor/scripting/Makefile.in koffice-1.4.2/kexi/formeditor/scripting/Makefile.in
--- koffice-1.4.2.orig/kexi/formeditor/scripting/Makefile.in 2005-10-05 12:52:44.000000000 +0200
-+++ koffice-1.4.2/kexi/formeditor/scripting/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/kexi/formeditor/scripting/Makefile.in 2005-11-14 09:13:47.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -160179,7 +160185,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/formeditor/test/Makefile.in koffice-1.4.2/kexi/formeditor/test/Makefile.in
--- koffice-1.4.2.orig/kexi/formeditor/test/Makefile.in 2005-10-05 12:52:45.000000000 +0200
-+++ koffice-1.4.2/kexi/formeditor/test/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/kexi/formeditor/test/Makefile.in 2005-11-14 09:13:47.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -161294,7 +161300,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/interfaces/kwmailmerge/Makefile.in koffice-1.4.2/kexi/interfaces/kwmailmerge/Makefile.in
--- koffice-1.4.2.orig/kexi/interfaces/kwmailmerge/Makefile.in 2005-10-05 12:52:45.000000000 +0200
-+++ koffice-1.4.2/kexi/interfaces/kwmailmerge/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/kexi/interfaces/kwmailmerge/Makefile.in 2005-11-14 09:13:47.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -162257,7 +162263,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/interfaces/Makefile.in koffice-1.4.2/kexi/interfaces/Makefile.in
--- koffice-1.4.2.orig/kexi/interfaces/Makefile.in 2005-10-05 12:52:45.000000000 +0200
-+++ koffice-1.4.2/kexi/interfaces/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/kexi/interfaces/Makefile.in 2005-11-14 09:13:47.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -163081,7 +163087,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/kexidb/drivers/Makefile.in koffice-1.4.2/kexi/kexidb/drivers/Makefile.in
--- koffice-1.4.2.orig/kexi/kexidb/drivers/Makefile.in 2005-10-05 12:52:47.000000000 +0200
-+++ koffice-1.4.2/kexi/kexidb/drivers/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/kexi/kexidb/drivers/Makefile.in 2005-11-14 09:13:47.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -163907,7 +163913,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/kexidb/drivers/mySQL/Makefile.in koffice-1.4.2/kexi/kexidb/drivers/mySQL/Makefile.in
--- koffice-1.4.2.orig/kexi/kexidb/drivers/mySQL/Makefile.in 2005-10-05 12:52:48.000000000 +0200
-+++ koffice-1.4.2/kexi/kexidb/drivers/mySQL/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/kexi/kexidb/drivers/mySQL/Makefile.in 2005-11-14 09:13:47.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -164899,7 +164905,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/kexidb/drivers/odbc/Makefile.in koffice-1.4.2/kexi/kexidb/drivers/odbc/Makefile.in
--- koffice-1.4.2.orig/kexi/kexidb/drivers/odbc/Makefile.in 2005-10-05 12:52:48.000000000 +0200
-+++ koffice-1.4.2/kexi/kexidb/drivers/odbc/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/kexi/kexidb/drivers/odbc/Makefile.in 2005-11-14 09:13:47.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -165864,7 +165870,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/kexidb/drivers/pqxx/Makefile.in koffice-1.4.2/kexi/kexidb/drivers/pqxx/Makefile.in
--- koffice-1.4.2.orig/kexi/kexidb/drivers/pqxx/Makefile.in 2005-10-05 12:52:48.000000000 +0200
-+++ koffice-1.4.2/kexi/kexidb/drivers/pqxx/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/kexi/kexidb/drivers/pqxx/Makefile.in 2005-11-14 09:13:47.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -166845,7 +166851,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/kexidb/drivers/sqlite/Makefile.in koffice-1.4.2/kexi/kexidb/drivers/sqlite/Makefile.in
--- koffice-1.4.2.orig/kexi/kexidb/drivers/sqlite/Makefile.in 2005-10-05 12:52:49.000000000 +0200
-+++ koffice-1.4.2/kexi/kexidb/drivers/sqlite/Makefile.in 2005-11-13 10:33:44.000000000 +0100
++++ koffice-1.4.2/kexi/kexidb/drivers/sqlite/Makefile.in 2005-11-14 09:13:47.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -167831,7 +167837,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/kexidb/drivers/sqlite2/Makefile.in koffice-1.4.2/kexi/kexidb/drivers/sqlite2/Makefile.in
--- koffice-1.4.2.orig/kexi/kexidb/drivers/sqlite2/Makefile.in 2005-10-05 12:52:49.000000000 +0200
-+++ koffice-1.4.2/kexi/kexidb/drivers/sqlite2/Makefile.in 2005-11-13 10:33:44.000000000 +0100
++++ koffice-1.4.2/kexi/kexidb/drivers/sqlite2/Makefile.in 2005-11-14 09:13:47.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -168818,7 +168824,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/kexidb/Makefile.in koffice-1.4.2/kexi/kexidb/Makefile.in
--- koffice-1.4.2.orig/kexi/kexidb/Makefile.in 2005-10-05 12:52:47.000000000 +0200
-+++ koffice-1.4.2/kexi/kexidb/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/kexi/kexidb/Makefile.in 2005-11-14 09:13:47.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -170007,7 +170013,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/kexidb/parser/Makefile.in koffice-1.4.2/kexi/kexidb/parser/Makefile.in
--- koffice-1.4.2.orig/kexi/kexidb/parser/Makefile.in 2005-10-05 12:52:49.000000000 +0200
-+++ koffice-1.4.2/kexi/kexidb/parser/Makefile.in 2005-11-13 10:33:44.000000000 +0100
++++ koffice-1.4.2/kexi/kexidb/parser/Makefile.in 2005-11-14 09:13:47.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -170917,7 +170923,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/main/filters/Makefile.in koffice-1.4.2/kexi/main/filters/Makefile.in
--- koffice-1.4.2.orig/kexi/main/filters/Makefile.in 2005-10-05 12:52:50.000000000 +0200
-+++ koffice-1.4.2/kexi/main/filters/Makefile.in 2005-11-13 10:33:44.000000000 +0100
++++ koffice-1.4.2/kexi/main/filters/Makefile.in 2005-11-14 09:13:47.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -171923,7 +171929,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/main/Makefile.in koffice-1.4.2/kexi/main/Makefile.in
--- koffice-1.4.2.orig/kexi/main/Makefile.in 2005-10-05 12:52:50.000000000 +0200
-+++ koffice-1.4.2/kexi/main/Makefile.in 2005-11-13 10:33:44.000000000 +0100
++++ koffice-1.4.2/kexi/main/Makefile.in 2005-11-14 09:13:47.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -173016,7 +173022,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/main/projectWizard/Makefile.in koffice-1.4.2/kexi/main/projectWizard/Makefile.in
--- koffice-1.4.2.orig/kexi/main/projectWizard/Makefile.in 2005-10-05 12:52:51.000000000 +0200
-+++ koffice-1.4.2/kexi/main/projectWizard/Makefile.in 2005-11-13 10:33:44.000000000 +0100
++++ koffice-1.4.2/kexi/main/projectWizard/Makefile.in 2005-11-14 09:13:47.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -174083,7 +174089,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/main/startup/Makefile.in koffice-1.4.2/kexi/main/startup/Makefile.in
--- koffice-1.4.2.orig/kexi/main/startup/Makefile.in 2005-10-05 12:52:51.000000000 +0200
-+++ koffice-1.4.2/kexi/main/startup/Makefile.in 2005-11-13 10:33:44.000000000 +0100
++++ koffice-1.4.2/kexi/main/startup/Makefile.in 2005-11-14 09:13:47.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -175134,7 +175140,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/Makefile.in koffice-1.4.2/kexi/Makefile.in
--- koffice-1.4.2.orig/kexi/Makefile.in 2005-10-05 12:52:42.000000000 +0200
-+++ koffice-1.4.2/kexi/Makefile.in 2005-11-13 10:33:43.000000000 +0100
++++ koffice-1.4.2/kexi/Makefile.in 2005-11-14 09:13:46.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -176317,7 +176323,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/migration/Makefile.in koffice-1.4.2/kexi/migration/Makefile.in
--- koffice-1.4.2.orig/kexi/migration/Makefile.in 2005-10-05 12:52:51.000000000 +0200
-+++ koffice-1.4.2/kexi/migration/Makefile.in 2005-11-13 10:33:44.000000000 +0100
++++ koffice-1.4.2/kexi/migration/Makefile.in 2005-11-14 09:13:47.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -177516,7 +177522,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/migration/mysql/Makefile.in koffice-1.4.2/kexi/migration/mysql/Makefile.in
--- koffice-1.4.2.orig/kexi/migration/mysql/Makefile.in 2005-10-05 12:52:51.000000000 +0200
-+++ koffice-1.4.2/kexi/migration/mysql/Makefile.in 2005-11-13 10:33:44.000000000 +0100
++++ koffice-1.4.2/kexi/migration/mysql/Makefile.in 2005-11-14 09:13:47.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -178473,7 +178479,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/migration/pqxx/Makefile.in koffice-1.4.2/kexi/migration/pqxx/Makefile.in
--- koffice-1.4.2.orig/kexi/migration/pqxx/Makefile.in 2005-10-05 12:52:51.000000000 +0200
-+++ koffice-1.4.2/kexi/migration/pqxx/Makefile.in 2005-11-13 10:33:44.000000000 +0100
++++ koffice-1.4.2/kexi/migration/pqxx/Makefile.in 2005-11-14 09:13:47.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -179429,7 +179435,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/migration/txt/Makefile.in koffice-1.4.2/kexi/migration/txt/Makefile.in
--- koffice-1.4.2.orig/kexi/migration/txt/Makefile.in 2005-10-05 12:52:51.000000000 +0200
-+++ koffice-1.4.2/kexi/migration/txt/Makefile.in 2005-11-13 10:33:44.000000000 +0100
++++ koffice-1.4.2/kexi/migration/txt/Makefile.in 2005-11-14 09:13:47.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -180386,7 +180392,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/pics/Makefile.in koffice-1.4.2/kexi/pics/Makefile.in
--- koffice-1.4.2.orig/kexi/pics/Makefile.in 2005-10-05 12:52:52.000000000 +0200
-+++ koffice-1.4.2/kexi/pics/Makefile.in 2005-11-13 10:33:44.000000000 +0100
++++ koffice-1.4.2/kexi/pics/Makefile.in 2005-11-14 09:13:47.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -181112,7 +181118,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/plugins/forms/Makefile.in koffice-1.4.2/kexi/plugins/forms/Makefile.in
--- koffice-1.4.2.orig/kexi/plugins/forms/Makefile.in 2005-10-05 12:52:52.000000000 +0200
-+++ koffice-1.4.2/kexi/plugins/forms/Makefile.in 2005-11-13 10:33:44.000000000 +0100
++++ koffice-1.4.2/kexi/plugins/forms/Makefile.in 2005-11-14 09:13:47.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -182384,7 +182390,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/plugins/importwizard/common/Makefile.in koffice-1.4.2/kexi/plugins/importwizard/common/Makefile.in
--- koffice-1.4.2.orig/kexi/plugins/importwizard/common/Makefile.in 2005-10-05 12:52:52.000000000 +0200
-+++ koffice-1.4.2/kexi/plugins/importwizard/common/Makefile.in 2005-11-13 10:33:44.000000000 +0100
++++ koffice-1.4.2/kexi/plugins/importwizard/common/Makefile.in 2005-11-14 09:13:47.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -183302,7 +183308,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/plugins/importwizard/file/Makefile.in koffice-1.4.2/kexi/plugins/importwizard/file/Makefile.in
--- koffice-1.4.2.orig/kexi/plugins/importwizard/file/Makefile.in 2005-10-05 12:52:52.000000000 +0200
-+++ koffice-1.4.2/kexi/plugins/importwizard/file/Makefile.in 2005-11-13 10:33:44.000000000 +0100
++++ koffice-1.4.2/kexi/plugins/importwizard/file/Makefile.in 2005-11-14 09:13:47.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -184221,7 +184227,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/plugins/importwizard/Makefile.in koffice-1.4.2/kexi/plugins/importwizard/Makefile.in
--- koffice-1.4.2.orig/kexi/plugins/importwizard/Makefile.in 2005-10-05 12:52:52.000000000 +0200
-+++ koffice-1.4.2/kexi/plugins/importwizard/Makefile.in 2005-11-13 10:33:44.000000000 +0100
++++ koffice-1.4.2/kexi/plugins/importwizard/Makefile.in 2005-11-14 09:13:47.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -185043,7 +185049,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/plugins/kugar/kudesigner/Makefile.in koffice-1.4.2/kexi/plugins/kugar/kudesigner/Makefile.in
--- koffice-1.4.2.orig/kexi/plugins/kugar/kudesigner/Makefile.in 2005-10-05 12:52:52.000000000 +0200
-+++ koffice-1.4.2/kexi/plugins/kugar/kudesigner/Makefile.in 2005-11-13 10:33:44.000000000 +0100
++++ koffice-1.4.2/kexi/plugins/kugar/kudesigner/Makefile.in 2005-11-14 09:13:47.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -186075,7 +186081,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/plugins/kugar/Makefile.in koffice-1.4.2/kexi/plugins/kugar/Makefile.in
--- koffice-1.4.2.orig/kexi/plugins/kugar/Makefile.in 2005-10-05 12:52:52.000000000 +0200
-+++ koffice-1.4.2/kexi/plugins/kugar/Makefile.in 2005-11-13 10:33:44.000000000 +0100
++++ koffice-1.4.2/kexi/plugins/kugar/Makefile.in 2005-11-14 09:13:47.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -187188,7 +187194,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/plugins/Makefile.in koffice-1.4.2/kexi/plugins/Makefile.in
--- koffice-1.4.2.orig/kexi/plugins/Makefile.in 2005-10-05 12:52:52.000000000 +0200
-+++ koffice-1.4.2/kexi/plugins/Makefile.in 2005-11-13 10:33:44.000000000 +0100
++++ koffice-1.4.2/kexi/plugins/Makefile.in 2005-11-14 09:13:47.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -188014,7 +188020,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/plugins/migration/Makefile.in koffice-1.4.2/kexi/plugins/migration/Makefile.in
--- koffice-1.4.2.orig/kexi/plugins/migration/Makefile.in 2005-10-05 12:52:52.000000000 +0200
-+++ koffice-1.4.2/kexi/plugins/migration/Makefile.in 2005-11-13 10:33:44.000000000 +0100
++++ koffice-1.4.2/kexi/plugins/migration/Makefile.in 2005-11-14 09:13:47.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -188961,7 +188967,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/plugins/queries/Makefile.in koffice-1.4.2/kexi/plugins/queries/Makefile.in
--- koffice-1.4.2.orig/kexi/plugins/queries/Makefile.in 2005-10-05 12:52:52.000000000 +0200
-+++ koffice-1.4.2/kexi/plugins/queries/Makefile.in 2005-11-13 10:33:44.000000000 +0100
++++ koffice-1.4.2/kexi/plugins/queries/Makefile.in 2005-11-14 09:13:47.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -189905,7 +189911,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/plugins/relations/Makefile.in koffice-1.4.2/kexi/plugins/relations/Makefile.in
--- koffice-1.4.2.orig/kexi/plugins/relations/Makefile.in 2005-10-05 12:52:53.000000000 +0200
-+++ koffice-1.4.2/kexi/plugins/relations/Makefile.in 2005-11-13 10:33:44.000000000 +0100
++++ koffice-1.4.2/kexi/plugins/relations/Makefile.in 2005-11-14 09:13:47.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -190835,7 +190841,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/plugins/reports/Makefile.in koffice-1.4.2/kexi/plugins/reports/Makefile.in
--- koffice-1.4.2.orig/kexi/plugins/reports/Makefile.in 2005-10-05 12:52:53.000000000 +0200
-+++ koffice-1.4.2/kexi/plugins/reports/Makefile.in 2005-11-13 10:33:44.000000000 +0100
++++ koffice-1.4.2/kexi/plugins/reports/Makefile.in 2005-11-14 09:13:47.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -191973,7 +191979,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/plugins/scripting/Makefile.in koffice-1.4.2/kexi/plugins/scripting/Makefile.in
--- koffice-1.4.2.orig/kexi/plugins/scripting/Makefile.in 2005-10-05 12:52:53.000000000 +0200
-+++ koffice-1.4.2/kexi/plugins/scripting/Makefile.in 2005-11-13 10:33:44.000000000 +0100
++++ koffice-1.4.2/kexi/plugins/scripting/Makefile.in 2005-11-14 09:13:47.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -193058,7 +193064,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/plugins/tables/Makefile.in koffice-1.4.2/kexi/plugins/tables/Makefile.in
--- koffice-1.4.2.orig/kexi/plugins/tables/Makefile.in 2005-10-05 12:52:53.000000000 +0200
-+++ koffice-1.4.2/kexi/plugins/tables/Makefile.in 2005-11-13 10:33:44.000000000 +0100
++++ koffice-1.4.2/kexi/plugins/tables/Makefile.in 2005-11-14 09:13:47.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -193995,7 +194001,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/scripting/api/Makefile.in koffice-1.4.2/kexi/scripting/api/Makefile.in
--- koffice-1.4.2.orig/kexi/scripting/api/Makefile.in 2005-10-05 12:52:53.000000000 +0200
-+++ koffice-1.4.2/kexi/scripting/api/Makefile.in 2005-11-13 10:33:44.000000000 +0100
++++ koffice-1.4.2/kexi/scripting/api/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -195065,7 +195071,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/scripting/kexidb/Makefile.in koffice-1.4.2/kexi/scripting/kexidb/Makefile.in
--- koffice-1.4.2.orig/kexi/scripting/kexidb/Makefile.in 2005-10-05 12:52:53.000000000 +0200
-+++ koffice-1.4.2/kexi/scripting/kexidb/Makefile.in 2005-11-13 10:33:44.000000000 +0100
++++ koffice-1.4.2/kexi/scripting/kexidb/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -196115,7 +196121,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/scripting/kjs/Makefile.in koffice-1.4.2/kexi/scripting/kjs/Makefile.in
--- koffice-1.4.2.orig/kexi/scripting/kjs/Makefile.in 2005-10-05 12:52:53.000000000 +0200
-+++ koffice-1.4.2/kexi/scripting/kjs/Makefile.in 2005-11-13 10:33:44.000000000 +0100
++++ koffice-1.4.2/kexi/scripting/kjs/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -197108,7 +197114,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/scripting/main/Makefile.in koffice-1.4.2/kexi/scripting/main/Makefile.in
--- koffice-1.4.2.orig/kexi/scripting/main/Makefile.in 2005-10-05 12:52:53.000000000 +0200
-+++ koffice-1.4.2/kexi/scripting/main/Makefile.in 2005-11-13 10:33:44.000000000 +0100
++++ koffice-1.4.2/kexi/scripting/main/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -198152,7 +198158,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/scripting/Makefile.in koffice-1.4.2/kexi/scripting/Makefile.in
--- koffice-1.4.2.orig/kexi/scripting/Makefile.in 2005-10-05 12:52:53.000000000 +0200
-+++ koffice-1.4.2/kexi/scripting/Makefile.in 2005-11-13 10:33:44.000000000 +0100
++++ koffice-1.4.2/kexi/scripting/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -198977,7 +198983,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/scripting/python/CXX/Makefile.in koffice-1.4.2/kexi/scripting/python/CXX/Makefile.in
--- koffice-1.4.2.orig/kexi/scripting/python/CXX/Makefile.in 2005-10-05 12:52:53.000000000 +0200
-+++ koffice-1.4.2/kexi/scripting/python/CXX/Makefile.in 2005-11-13 10:33:44.000000000 +0100
++++ koffice-1.4.2/kexi/scripting/python/CXX/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -200050,7 +200056,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/scripting/python/Makefile.in koffice-1.4.2/kexi/scripting/python/Makefile.in
--- koffice-1.4.2.orig/kexi/scripting/python/Makefile.in 2005-10-05 12:52:53.000000000 +0200
-+++ koffice-1.4.2/kexi/scripting/python/Makefile.in 2005-11-13 10:33:44.000000000 +0100
++++ koffice-1.4.2/kexi/scripting/python/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -201070,7 +201076,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/scripting/test/Makefile.in koffice-1.4.2/kexi/scripting/test/Makefile.in
--- koffice-1.4.2.orig/kexi/scripting/test/Makefile.in 2005-10-05 12:52:53.000000000 +0200
-+++ koffice-1.4.2/kexi/scripting/test/Makefile.in 2005-11-13 10:33:44.000000000 +0100
++++ koffice-1.4.2/kexi/scripting/test/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -202065,7 +202071,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/tests/Makefile.in koffice-1.4.2/kexi/tests/Makefile.in
--- koffice-1.4.2.orig/kexi/tests/Makefile.in 2005-10-05 12:52:53.000000000 +0200
-+++ koffice-1.4.2/kexi/tests/Makefile.in 2005-11-13 10:33:44.000000000 +0100
++++ koffice-1.4.2/kexi/tests/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -202892,7 +202898,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/tests/newapi/Makefile.in koffice-1.4.2/kexi/tests/newapi/Makefile.in
--- koffice-1.4.2.orig/kexi/tests/newapi/Makefile.in 2005-10-05 12:52:53.000000000 +0200
-+++ koffice-1.4.2/kexi/tests/newapi/Makefile.in 2005-11-13 10:33:44.000000000 +0100
++++ koffice-1.4.2/kexi/tests/newapi/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -203885,7 +203891,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/tests/parser/Makefile.in koffice-1.4.2/kexi/tests/parser/Makefile.in
--- koffice-1.4.2.orig/kexi/tests/parser/Makefile.in 2005-10-05 12:52:53.000000000 +0200
-+++ koffice-1.4.2/kexi/tests/parser/Makefile.in 2005-11-13 10:33:44.000000000 +0100
++++ koffice-1.4.2/kexi/tests/parser/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -204775,7 +204781,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/tests/startup/Makefile.in koffice-1.4.2/kexi/tests/startup/Makefile.in
--- koffice-1.4.2.orig/kexi/tests/startup/Makefile.in 2005-10-05 12:52:53.000000000 +0200
-+++ koffice-1.4.2/kexi/tests/startup/Makefile.in 2005-11-13 10:33:44.000000000 +0100
++++ koffice-1.4.2/kexi/tests/startup/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -205794,7 +205800,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/tests/tableview/Makefile.in koffice-1.4.2/kexi/tests/tableview/Makefile.in
--- koffice-1.4.2.orig/kexi/tests/tableview/Makefile.in 2005-10-05 12:52:53.000000000 +0200
-+++ koffice-1.4.2/kexi/tests/tableview/Makefile.in 2005-11-13 10:33:44.000000000 +0100
++++ koffice-1.4.2/kexi/tests/tableview/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -206811,7 +206817,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/widget/Makefile.in koffice-1.4.2/kexi/widget/Makefile.in
--- koffice-1.4.2.orig/kexi/widget/Makefile.in 2005-10-05 12:52:54.000000000 +0200
-+++ koffice-1.4.2/kexi/widget/Makefile.in 2005-11-13 10:33:44.000000000 +0100
++++ koffice-1.4.2/kexi/widget/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -207925,7 +207931,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/widget/propertyeditor/Makefile.in koffice-1.4.2/kexi/widget/propertyeditor/Makefile.in
--- koffice-1.4.2.orig/kexi/widget/propertyeditor/Makefile.in 2005-10-05 12:52:54.000000000 +0200
-+++ koffice-1.4.2/kexi/widget/propertyeditor/Makefile.in 2005-11-13 10:33:44.000000000 +0100
++++ koffice-1.4.2/kexi/widget/propertyeditor/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -209011,7 +209017,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/widget/propertyeditor/test/Makefile.in koffice-1.4.2/kexi/widget/propertyeditor/test/Makefile.in
--- koffice-1.4.2.orig/kexi/widget/propertyeditor/test/Makefile.in 2005-10-05 12:52:54.000000000 +0200
-+++ koffice-1.4.2/kexi/widget/propertyeditor/test/Makefile.in 2005-11-13 10:33:44.000000000 +0100
++++ koffice-1.4.2/kexi/widget/propertyeditor/test/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -209951,7 +209957,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/widget/relations/Makefile.in koffice-1.4.2/kexi/widget/relations/Makefile.in
--- koffice-1.4.2.orig/kexi/widget/relations/Makefile.in 2005-10-05 12:52:54.000000000 +0200
-+++ koffice-1.4.2/kexi/widget/relations/Makefile.in 2005-11-13 10:33:44.000000000 +0100
++++ koffice-1.4.2/kexi/widget/relations/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -211004,7 +211010,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/widget/tableview/Makefile.in koffice-1.4.2/kexi/widget/tableview/Makefile.in
--- koffice-1.4.2.orig/kexi/widget/tableview/Makefile.in 2005-10-05 12:52:55.000000000 +0200
-+++ koffice-1.4.2/kexi/widget/tableview/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kexi/widget/tableview/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -212129,7 +212135,7 @@
diff -Nrua koffice-1.4.2.orig/kexi/widget/utils/Makefile.in koffice-1.4.2/kexi/widget/utils/Makefile.in
--- koffice-1.4.2.orig/kexi/widget/utils/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kexi/widget/utils/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kexi/widget/utils/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -213184,7 +213190,7 @@
diff -Nrua koffice-1.4.2.orig/kformula/Makefile.in koffice-1.4.2/kformula/Makefile.in
--- koffice-1.4.2.orig/kformula/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kformula/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kformula/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -214573,7 +214579,7 @@
diff -Nrua koffice-1.4.2.orig/kformula/pics/Makefile.in koffice-1.4.2/kformula/pics/Makefile.in
--- koffice-1.4.2.orig/kformula/pics/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kformula/pics/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kformula/pics/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -215226,7 +215232,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/kiviopart/config/Makefile.in koffice-1.4.2/kivio/kiviopart/config/Makefile.in
--- koffice-1.4.2.orig/kivio/kiviopart/config/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kivio/kiviopart/config/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/kiviopart/config/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -216128,7 +216134,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/kiviopart/kiviosdk/Makefile.in koffice-1.4.2/kivio/kiviopart/kiviosdk/Makefile.in
--- koffice-1.4.2.orig/kivio/kiviopart/kiviosdk/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kivio/kiviopart/kiviosdk/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/kiviopart/kiviosdk/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -217105,7 +217111,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/kiviopart/Makefile.in koffice-1.4.2/kivio/kiviopart/Makefile.in
--- koffice-1.4.2.orig/kivio/kiviopart/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kivio/kiviopart/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/kiviopart/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -218662,7 +218668,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/kiviopart/pics/Makefile.in koffice-1.4.2/kivio/kiviopart/pics/Makefile.in
--- koffice-1.4.2.orig/kivio/kiviopart/pics/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kivio/kiviopart/pics/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/kiviopart/pics/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -219316,7 +219322,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/kiviopart/stencils/Dia/Assorted/Makefile.in koffice-1.4.2/kivio/kiviopart/stencils/Dia/Assorted/Makefile.in
--- koffice-1.4.2.orig/kivio/kiviopart/stencils/Dia/Assorted/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kivio/kiviopart/stencils/Dia/Assorted/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/kiviopart/stencils/Dia/Assorted/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -220026,7 +220032,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/kiviopart/stencils/Dia/Circuit/Makefile.in koffice-1.4.2/kivio/kiviopart/stencils/Dia/Circuit/Makefile.in
--- koffice-1.4.2.orig/kivio/kiviopart/stencils/Dia/Circuit/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kivio/kiviopart/stencils/Dia/Circuit/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/kiviopart/stencils/Dia/Circuit/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -220735,7 +220741,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/kiviopart/stencils/Dia/Cisco/Makefile.in koffice-1.4.2/kivio/kiviopart/stencils/Dia/Cisco/Makefile.in
--- koffice-1.4.2.orig/kivio/kiviopart/stencils/Dia/Cisco/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kivio/kiviopart/stencils/Dia/Cisco/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/kiviopart/stencils/Dia/Cisco/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -221444,7 +221450,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/kiviopart/stencils/Dia/Civil/Makefile.in koffice-1.4.2/kivio/kiviopart/stencils/Dia/Civil/Makefile.in
--- koffice-1.4.2.orig/kivio/kiviopart/stencils/Dia/Civil/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kivio/kiviopart/stencils/Dia/Civil/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/kiviopart/stencils/Dia/Civil/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -222153,7 +222159,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/kiviopart/stencils/Dia/Contact/Makefile.in koffice-1.4.2/kivio/kiviopart/stencils/Dia/Contact/Makefile.in
--- koffice-1.4.2.orig/kivio/kiviopart/stencils/Dia/Contact/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kivio/kiviopart/stencils/Dia/Contact/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/kiviopart/stencils/Dia/Contact/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -222862,7 +222868,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/kiviopart/stencils/Dia/Electric/Makefile.in koffice-1.4.2/kivio/kiviopart/stencils/Dia/Electric/Makefile.in
--- koffice-1.4.2.orig/kivio/kiviopart/stencils/Dia/Electric/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kivio/kiviopart/stencils/Dia/Electric/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/kiviopart/stencils/Dia/Electric/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -223569,7 +223575,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/kiviopart/stencils/Dia/Jigsaw/Makefile.in koffice-1.4.2/kivio/kiviopart/stencils/Dia/Jigsaw/Makefile.in
--- koffice-1.4.2.orig/kivio/kiviopart/stencils/Dia/Jigsaw/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kivio/kiviopart/stencils/Dia/Jigsaw/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/kiviopart/stencils/Dia/Jigsaw/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -224278,7 +224284,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/kiviopart/stencils/Dia/Makefile.in koffice-1.4.2/kivio/kiviopart/stencils/Dia/Makefile.in
--- koffice-1.4.2.orig/kivio/kiviopart/stencils/Dia/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kivio/kiviopart/stencils/Dia/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/kiviopart/stencils/Dia/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -225153,7 +225159,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/kiviopart/stencils/Dia/MSE/Makefile.in koffice-1.4.2/kivio/kiviopart/stencils/Dia/MSE/Makefile.in
--- koffice-1.4.2.orig/kivio/kiviopart/stencils/Dia/MSE/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kivio/kiviopart/stencils/Dia/MSE/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/kiviopart/stencils/Dia/MSE/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -225862,7 +225868,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/kiviopart/stencils/Dia/Network/Makefile.in koffice-1.4.2/kivio/kiviopart/stencils/Dia/Network/Makefile.in
--- koffice-1.4.2.orig/kivio/kiviopart/stencils/Dia/Network/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kivio/kiviopart/stencils/Dia/Network/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/kiviopart/stencils/Dia/Network/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -226571,7 +226577,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/kiviopart/stencils/Dia/Pneumatic/Makefile.in koffice-1.4.2/kivio/kiviopart/stencils/Dia/Pneumatic/Makefile.in
--- koffice-1.4.2.orig/kivio/kiviopart/stencils/Dia/Pneumatic/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kivio/kiviopart/stencils/Dia/Pneumatic/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/kiviopart/stencils/Dia/Pneumatic/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -227280,7 +227286,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/kiviopart/stencils/Dia/SDL/Makefile.in koffice-1.4.2/kivio/kiviopart/stencils/Dia/SDL/Makefile.in
--- koffice-1.4.2.orig/kivio/kiviopart/stencils/Dia/SDL/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kivio/kiviopart/stencils/Dia/SDL/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/kiviopart/stencils/Dia/SDL/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -227989,7 +227995,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/kiviopart/stencils/Dia/Sybase/Makefile.in koffice-1.4.2/kivio/kiviopart/stencils/Dia/Sybase/Makefile.in
--- koffice-1.4.2.orig/kivio/kiviopart/stencils/Dia/Sybase/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kivio/kiviopart/stencils/Dia/Sybase/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/kiviopart/stencils/Dia/Sybase/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -228698,7 +228704,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Makefile.in koffice-1.4.2/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Makefile.in
--- koffice-1.4.2.orig/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -229399,7 +229405,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/kiviopart/stencils/Flowcharting/Extended/Makefile.in koffice-1.4.2/kivio/kiviopart/stencils/Flowcharting/Extended/Makefile.in
--- koffice-1.4.2.orig/kivio/kiviopart/stencils/Flowcharting/Extended/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kivio/kiviopart/stencils/Flowcharting/Extended/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/kiviopart/stencils/Flowcharting/Extended/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -230098,7 +230104,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/kiviopart/stencils/Flowcharting/Logic/Makefile.in koffice-1.4.2/kivio/kiviopart/stencils/Flowcharting/Logic/Makefile.in
--- koffice-1.4.2.orig/kivio/kiviopart/stencils/Flowcharting/Logic/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kivio/kiviopart/stencils/Flowcharting/Logic/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/kiviopart/stencils/Flowcharting/Logic/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -230804,7 +230810,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/kiviopart/stencils/Flowcharting/Makefile.in koffice-1.4.2/kivio/kiviopart/stencils/Flowcharting/Makefile.in
--- koffice-1.4.2.orig/kivio/kiviopart/stencils/Flowcharting/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kivio/kiviopart/stencils/Flowcharting/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/kiviopart/stencils/Flowcharting/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -231681,7 +231687,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/kiviopart/stencils/Geographic/Flags/Makefile.in koffice-1.4.2/kivio/kiviopart/stencils/Geographic/Flags/Makefile.in
--- koffice-1.4.2.orig/kivio/kiviopart/stencils/Geographic/Flags/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kivio/kiviopart/stencils/Geographic/Flags/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/kiviopart/stencils/Geographic/Flags/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -232382,7 +232388,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/kiviopart/stencils/Geographic/Makefile.in koffice-1.4.2/kivio/kiviopart/stencils/Geographic/Makefile.in
--- koffice-1.4.2.orig/kivio/kiviopart/stencils/Geographic/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kivio/kiviopart/stencils/Geographic/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/kiviopart/stencils/Geographic/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -233259,7 +233265,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/kiviopart/stencils/Geographic/Maps/Makefile.in koffice-1.4.2/kivio/kiviopart/stencils/Geographic/Maps/Makefile.in
--- koffice-1.4.2.orig/kivio/kiviopart/stencils/Geographic/Maps/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kivio/kiviopart/stencils/Geographic/Maps/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/kiviopart/stencils/Geographic/Maps/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -233960,7 +233966,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/kiviopart/stencils/Hardware/Computer/Makefile.in koffice-1.4.2/kivio/kiviopart/stencils/Hardware/Computer/Makefile.in
--- koffice-1.4.2.orig/kivio/kiviopart/stencils/Hardware/Computer/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kivio/kiviopart/stencils/Hardware/Computer/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/kiviopart/stencils/Hardware/Computer/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -234662,7 +234668,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/kiviopart/stencils/Hardware/Makefile.in koffice-1.4.2/kivio/kiviopart/stencils/Hardware/Makefile.in
--- koffice-1.4.2.orig/kivio/kiviopart/stencils/Hardware/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kivio/kiviopart/stencils/Hardware/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/kiviopart/stencils/Hardware/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -235538,7 +235544,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/kiviopart/stencils/Hardware/Miscellaneous/Makefile.in koffice-1.4.2/kivio/kiviopart/stencils/Hardware/Miscellaneous/Makefile.in
--- koffice-1.4.2.orig/kivio/kiviopart/stencils/Hardware/Miscellaneous/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kivio/kiviopart/stencils/Hardware/Miscellaneous/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/kiviopart/stencils/Hardware/Miscellaneous/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -236239,7 +236245,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/kiviopart/stencils/Makefile.in koffice-1.4.2/kivio/kiviopart/stencils/Makefile.in
--- koffice-1.4.2.orig/kivio/kiviopart/stencils/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kivio/kiviopart/stencils/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/kiviopart/stencils/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -237061,7 +237067,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/kiviopart/stencils/Miscellaneous/Arrows/Makefile.in koffice-1.4.2/kivio/kiviopart/stencils/Miscellaneous/Arrows/Makefile.in
--- koffice-1.4.2.orig/kivio/kiviopart/stencils/Miscellaneous/Arrows/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kivio/kiviopart/stencils/Miscellaneous/Arrows/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/kiviopart/stencils/Miscellaneous/Arrows/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -237762,7 +237768,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/kiviopart/stencils/Miscellaneous/Buildings/Makefile.in koffice-1.4.2/kivio/kiviopart/stencils/Miscellaneous/Buildings/Makefile.in
--- koffice-1.4.2.orig/kivio/kiviopart/stencils/Miscellaneous/Buildings/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kivio/kiviopart/stencils/Miscellaneous/Buildings/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/kiviopart/stencils/Miscellaneous/Buildings/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -238464,7 +238470,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/kiviopart/stencils/Miscellaneous/Makefile.in koffice-1.4.2/kivio/kiviopart/stencils/Miscellaneous/Makefile.in
--- koffice-1.4.2.orig/kivio/kiviopart/stencils/Miscellaneous/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kivio/kiviopart/stencils/Miscellaneous/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/kiviopart/stencils/Miscellaneous/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -239339,7 +239345,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/kiviopart/stencils/Miscellaneous/NassiShneiderman/Makefile.in koffice-1.4.2/kivio/kiviopart/stencils/Miscellaneous/NassiShneiderman/Makefile.in
--- koffice-1.4.2.orig/kivio/kiviopart/stencils/Miscellaneous/NassiShneiderman/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kivio/kiviopart/stencils/Miscellaneous/NassiShneiderman/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/kiviopart/stencils/Miscellaneous/NassiShneiderman/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -240040,7 +240046,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/kiviopart/stencils/Miscellaneous/People/Makefile.in koffice-1.4.2/kivio/kiviopart/stencils/Miscellaneous/People/Makefile.in
--- koffice-1.4.2.orig/kivio/kiviopart/stencils/Miscellaneous/People/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kivio/kiviopart/stencils/Miscellaneous/People/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/kiviopart/stencils/Miscellaneous/People/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -240741,7 +240747,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/kiviopart/stencils/Miscellaneous/Transport/Makefile.in koffice-1.4.2/kivio/kiviopart/stencils/Miscellaneous/Transport/Makefile.in
--- koffice-1.4.2.orig/kivio/kiviopart/stencils/Miscellaneous/Transport/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kivio/kiviopart/stencils/Miscellaneous/Transport/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/kiviopart/stencils/Miscellaneous/Transport/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -241441,7 +241447,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/kiviopart/stencils/UML/ActivityDiagrams/Makefile.in koffice-1.4.2/kivio/kiviopart/stencils/UML/ActivityDiagrams/Makefile.in
--- koffice-1.4.2.orig/kivio/kiviopart/stencils/UML/ActivityDiagrams/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kivio/kiviopart/stencils/UML/ActivityDiagrams/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/kiviopart/stencils/UML/ActivityDiagrams/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -242148,7 +242154,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/kiviopart/stencils/UML/ClassDiagrams/Makefile.in koffice-1.4.2/kivio/kiviopart/stencils/UML/ClassDiagrams/Makefile.in
--- koffice-1.4.2.orig/kivio/kiviopart/stencils/UML/ClassDiagrams/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kivio/kiviopart/stencils/UML/ClassDiagrams/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/kiviopart/stencils/UML/ClassDiagrams/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -242854,7 +242860,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/kiviopart/stencils/UML/Makefile.in koffice-1.4.2/kivio/kiviopart/stencils/UML/Makefile.in
--- koffice-1.4.2.orig/kivio/kiviopart/stencils/UML/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kivio/kiviopart/stencils/UML/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/kiviopart/stencils/UML/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -243729,7 +243735,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/kiviopart/tiles/Makefile.in koffice-1.4.2/kivio/kiviopart/tiles/Makefile.in
--- koffice-1.4.2.orig/kivio/kiviopart/tiles/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kivio/kiviopart/tiles/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/kiviopart/tiles/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -244427,7 +244433,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/kiviopart/tools/Makefile.in koffice-1.4.2/kivio/kiviopart/tools/Makefile.in
--- koffice-1.4.2.orig/kivio/kiviopart/tools/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kivio/kiviopart/tools/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/kiviopart/tools/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -245342,7 +245348,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/kiviopart/ui/Makefile.in koffice-1.4.2/kivio/kiviopart/ui/Makefile.in
--- koffice-1.4.2.orig/kivio/kiviopart/ui/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kivio/kiviopart/ui/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/kiviopart/ui/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -246252,7 +246258,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/Makefile.in koffice-1.4.2/kivio/Makefile.in
--- koffice-1.4.2.orig/kivio/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kivio/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -247079,7 +247085,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/plugins/kivioconnectortool/Makefile.in koffice-1.4.2/kivio/plugins/kivioconnectortool/Makefile.in
--- koffice-1.4.2.orig/kivio/plugins/kivioconnectortool/Makefile.in 2005-10-05 12:52:57.000000000 +0200
-+++ koffice-1.4.2/kivio/plugins/kivioconnectortool/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/plugins/kivioconnectortool/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -248262,7 +248268,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/plugins/kivioconnectortool/straight_connector/Makefile.in koffice-1.4.2/kivio/plugins/kivioconnectortool/straight_connector/Makefile.in
--- koffice-1.4.2.orig/kivio/plugins/kivioconnectortool/straight_connector/Makefile.in 2005-10-05 12:52:57.000000000 +0200
-+++ koffice-1.4.2/kivio/plugins/kivioconnectortool/straight_connector/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/plugins/kivioconnectortool/straight_connector/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -249197,7 +249203,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/plugins/kivioselecttool/Makefile.in koffice-1.4.2/kivio/plugins/kivioselecttool/Makefile.in
--- koffice-1.4.2.orig/kivio/plugins/kivioselecttool/Makefile.in 2005-10-05 12:52:57.000000000 +0200
-+++ koffice-1.4.2/kivio/plugins/kivioselecttool/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/plugins/kivioselecttool/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -250329,7 +250335,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/plugins/kivioselecttool/select_pics/Makefile.in koffice-1.4.2/kivio/plugins/kivioselecttool/select_pics/Makefile.in
--- koffice-1.4.2.orig/kivio/plugins/kivioselecttool/select_pics/Makefile.in 2005-10-05 12:52:57.000000000 +0200
-+++ koffice-1.4.2/kivio/plugins/kivioselecttool/select_pics/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/plugins/kivioselecttool/select_pics/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -251025,7 +251031,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/plugins/kiviosmlconnector/Makefile.in koffice-1.4.2/kivio/plugins/kiviosmlconnector/Makefile.in
--- koffice-1.4.2.orig/kivio/plugins/kiviosmlconnector/Makefile.in 2005-10-05 12:52:57.000000000 +0200
-+++ koffice-1.4.2/kivio/plugins/kiviosmlconnector/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/plugins/kiviosmlconnector/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -252163,7 +252169,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/plugins/kiviosmlconnector/sml_connector/Makefile.in koffice-1.4.2/kivio/plugins/kiviosmlconnector/sml_connector/Makefile.in
--- koffice-1.4.2.orig/kivio/plugins/kiviosmlconnector/sml_connector/Makefile.in 2005-10-05 12:52:57.000000000 +0200
-+++ koffice-1.4.2/kivio/plugins/kiviosmlconnector/sml_connector/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/plugins/kiviosmlconnector/sml_connector/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -253090,7 +253096,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/plugins/kiviotargettool/Makefile.in koffice-1.4.2/kivio/plugins/kiviotargettool/Makefile.in
--- koffice-1.4.2.orig/kivio/plugins/kiviotargettool/Makefile.in 2005-10-05 12:52:57.000000000 +0200
-+++ koffice-1.4.2/kivio/plugins/kiviotargettool/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/plugins/kiviotargettool/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -254106,7 +254112,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/plugins/kiviotexttool/Makefile.in koffice-1.4.2/kivio/plugins/kiviotexttool/Makefile.in
--- koffice-1.4.2.orig/kivio/plugins/kiviotexttool/Makefile.in 2005-10-05 12:52:57.000000000 +0200
-+++ koffice-1.4.2/kivio/plugins/kiviotexttool/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/plugins/kiviotexttool/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -255170,7 +255176,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/plugins/kiviozoomtool/Makefile.in koffice-1.4.2/kivio/plugins/kiviozoomtool/Makefile.in
--- koffice-1.4.2.orig/kivio/plugins/kiviozoomtool/Makefile.in 2005-10-05 12:52:57.000000000 +0200
-+++ koffice-1.4.2/kivio/plugins/kiviozoomtool/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/plugins/kiviozoomtool/Makefile.in 2005-11-14 09:13:49.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -256299,7 +256305,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/plugins/kiviozoomtool/zoom_pics/Makefile.in koffice-1.4.2/kivio/plugins/kiviozoomtool/zoom_pics/Makefile.in
--- koffice-1.4.2.orig/kivio/plugins/kiviozoomtool/zoom_pics/Makefile.in 2005-10-05 12:52:57.000000000 +0200
-+++ koffice-1.4.2/kivio/plugins/kiviozoomtool/zoom_pics/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/plugins/kiviozoomtool/zoom_pics/Makefile.in 2005-11-14 09:13:49.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -256998,7 +257004,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/plugins/Makefile.in koffice-1.4.2/kivio/plugins/Makefile.in
--- koffice-1.4.2.orig/kivio/plugins/Makefile.in 2005-10-05 12:52:56.000000000 +0200
-+++ koffice-1.4.2/kivio/plugins/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/plugins/Makefile.in 2005-11-14 09:13:48.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -257820,7 +257826,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/templates/basic/Makefile.in koffice-1.4.2/kivio/templates/basic/Makefile.in
--- koffice-1.4.2.orig/kivio/templates/basic/Makefile.in 2005-10-05 12:52:57.000000000 +0200
-+++ koffice-1.4.2/kivio/templates/basic/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/templates/basic/Makefile.in 2005-11-14 09:13:49.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -258555,7 +258561,7 @@
diff -Nrua koffice-1.4.2.orig/kivio/templates/Makefile.in koffice-1.4.2/kivio/templates/Makefile.in
--- koffice-1.4.2.orig/kivio/templates/Makefile.in 2005-10-05 12:52:57.000000000 +0200
-+++ koffice-1.4.2/kivio/templates/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kivio/templates/Makefile.in 2005-11-14 09:13:49.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -259377,7 +259383,7 @@
diff -Nrua koffice-1.4.2.orig/koshell/Makefile.in koffice-1.4.2/koshell/Makefile.in
--- koffice-1.4.2.orig/koshell/Makefile.in 2005-10-05 12:52:57.000000000 +0200
-+++ koffice-1.4.2/koshell/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/koshell/Makefile.in 2005-11-14 09:13:49.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -260550,7 +260556,7 @@
diff -Nrua koffice-1.4.2.orig/kounavail/Makefile.in koffice-1.4.2/kounavail/Makefile.in
--- koffice-1.4.2.orig/kounavail/Makefile.in 2005-10-05 12:52:57.000000000 +0200
-+++ koffice-1.4.2/kounavail/Makefile.in 2005-11-13 10:33:45.000000000 +0100
++++ koffice-1.4.2/kounavail/Makefile.in 2005-11-14 09:13:49.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -261478,7 +261484,7 @@
diff -Nrua koffice-1.4.2.orig/kpresenter/autoformEdit/Makefile.in koffice-1.4.2/kpresenter/autoformEdit/Makefile.in
--- koffice-1.4.2.orig/kpresenter/autoformEdit/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/kpresenter/autoformEdit/Makefile.in 2005-11-13 10:33:46.000000000 +0100
++++ koffice-1.4.2/kpresenter/autoformEdit/Makefile.in 2005-11-14 09:13:49.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -262334,7 +262340,7 @@
diff -Nrua koffice-1.4.2.orig/kpresenter/autoforms/Arrows/Makefile.in koffice-1.4.2/kpresenter/autoforms/Arrows/Makefile.in
--- koffice-1.4.2.orig/kpresenter/autoforms/Arrows/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/kpresenter/autoforms/Arrows/Makefile.in 2005-11-13 10:33:46.000000000 +0100
++++ koffice-1.4.2/kpresenter/autoforms/Arrows/Makefile.in 2005-11-14 09:13:49.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -263106,7 +263112,7 @@
diff -Nrua koffice-1.4.2.orig/kpresenter/autoforms/Connections/Makefile.in koffice-1.4.2/kpresenter/autoforms/Connections/Makefile.in
--- koffice-1.4.2.orig/kpresenter/autoforms/Connections/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/kpresenter/autoforms/Connections/Makefile.in 2005-11-13 10:33:46.000000000 +0100
++++ koffice-1.4.2/kpresenter/autoforms/Connections/Makefile.in 2005-11-14 09:13:49.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -263881,7 +263887,7 @@
diff -Nrua koffice-1.4.2.orig/kpresenter/autoforms/Makefile.in koffice-1.4.2/kpresenter/autoforms/Makefile.in
--- koffice-1.4.2.orig/kpresenter/autoforms/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/kpresenter/autoforms/Makefile.in 2005-11-13 10:33:46.000000000 +0100
++++ koffice-1.4.2/kpresenter/autoforms/Makefile.in 2005-11-14 09:13:49.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -264753,7 +264759,7 @@
diff -Nrua koffice-1.4.2.orig/kpresenter/dtd/Makefile.in koffice-1.4.2/kpresenter/dtd/Makefile.in
--- koffice-1.4.2.orig/kpresenter/dtd/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/kpresenter/dtd/Makefile.in 2005-11-13 10:33:46.000000000 +0100
++++ koffice-1.4.2/kpresenter/dtd/Makefile.in 2005-11-14 09:13:49.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -265448,7 +265454,7 @@
diff -Nrua koffice-1.4.2.orig/kpresenter/Makefile.in koffice-1.4.2/kpresenter/Makefile.in
--- koffice-1.4.2.orig/kpresenter/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/kpresenter/Makefile.in 2005-11-13 10:33:46.000000000 +0100
++++ koffice-1.4.2/kpresenter/Makefile.in 2005-11-14 09:13:49.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -267202,7 +267208,7 @@
diff -Nrua koffice-1.4.2.orig/kpresenter/pics/Makefile.in koffice-1.4.2/kpresenter/pics/Makefile.in
--- koffice-1.4.2.orig/kpresenter/pics/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/kpresenter/pics/Makefile.in 2005-11-13 10:33:46.000000000 +0100
++++ koffice-1.4.2/kpresenter/pics/Makefile.in 2005-11-14 09:13:49.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -267903,7 +267909,7 @@
diff -Nrua koffice-1.4.2.orig/kpresenter/slideshow/Makefile.in koffice-1.4.2/kpresenter/slideshow/Makefile.in
--- koffice-1.4.2.orig/kpresenter/slideshow/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/kpresenter/slideshow/Makefile.in 2005-11-13 10:33:46.000000000 +0100
++++ koffice-1.4.2/kpresenter/slideshow/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -268599,7 +268605,7 @@
diff -Nrua koffice-1.4.2.orig/kpresenter/templates/A4/Makefile.in koffice-1.4.2/kpresenter/templates/A4/Makefile.in
--- koffice-1.4.2.orig/kpresenter/templates/A4/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/kpresenter/templates/A4/Makefile.in 2005-11-13 10:33:46.000000000 +0100
++++ koffice-1.4.2/kpresenter/templates/A4/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -269301,7 +269307,7 @@
diff -Nrua koffice-1.4.2.orig/kpresenter/templates/common_icon/Makefile.in koffice-1.4.2/kpresenter/templates/common_icon/Makefile.in
--- koffice-1.4.2.orig/kpresenter/templates/common_icon/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/kpresenter/templates/common_icon/Makefile.in 2005-11-13 10:33:46.000000000 +0100
++++ koffice-1.4.2/kpresenter/templates/common_icon/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -269955,7 +269961,7 @@
diff -Nrua koffice-1.4.2.orig/kpresenter/templates/legal/Makefile.in koffice-1.4.2/kpresenter/templates/legal/Makefile.in
--- koffice-1.4.2.orig/kpresenter/templates/legal/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/kpresenter/templates/legal/Makefile.in 2005-11-13 10:33:46.000000000 +0100
++++ koffice-1.4.2/kpresenter/templates/legal/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -270657,7 +270663,7 @@
diff -Nrua koffice-1.4.2.orig/kpresenter/templates/letter/Makefile.in koffice-1.4.2/kpresenter/templates/letter/Makefile.in
--- koffice-1.4.2.orig/kpresenter/templates/letter/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/kpresenter/templates/letter/Makefile.in 2005-11-13 10:33:46.000000000 +0100
++++ koffice-1.4.2/kpresenter/templates/letter/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -271359,7 +271365,7 @@
diff -Nrua koffice-1.4.2.orig/kpresenter/templates/Makefile.in koffice-1.4.2/kpresenter/templates/Makefile.in
--- koffice-1.4.2.orig/kpresenter/templates/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/kpresenter/templates/Makefile.in 2005-11-13 10:33:46.000000000 +0100
++++ koffice-1.4.2/kpresenter/templates/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -272181,7 +272187,7 @@
diff -Nrua koffice-1.4.2.orig/kpresenter/templates/Screen/Makefile.in koffice-1.4.2/kpresenter/templates/Screen/Makefile.in
--- koffice-1.4.2.orig/kpresenter/templates/Screen/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/kpresenter/templates/Screen/Makefile.in 2005-11-13 10:33:46.000000000 +0100
++++ koffice-1.4.2/kpresenter/templates/Screen/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -272883,7 +272889,7 @@
diff -Nrua koffice-1.4.2.orig/kpresenter/templates/Screenpresentations/Makefile.in koffice-1.4.2/kpresenter/templates/Screenpresentations/Makefile.in
--- koffice-1.4.2.orig/kpresenter/templates/Screenpresentations/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/kpresenter/templates/Screenpresentations/Makefile.in 2005-11-13 10:33:46.000000000 +0100
++++ koffice-1.4.2/kpresenter/templates/Screenpresentations/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -273630,7 +273636,7 @@
diff -Nrua koffice-1.4.2.orig/kpresenter/toolbar/Makefile.in koffice-1.4.2/kpresenter/toolbar/Makefile.in
--- koffice-1.4.2.orig/kpresenter/toolbar/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/kpresenter/toolbar/Makefile.in 2005-11-13 10:33:46.000000000 +0100
++++ koffice-1.4.2/kpresenter/toolbar/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -274284,7 +274290,7 @@
diff -Nrua koffice-1.4.2.orig/krita/core/builder/Makefile.in koffice-1.4.2/krita/core/builder/Makefile.in
--- koffice-1.4.2.orig/krita/core/builder/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/krita/core/builder/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/core/builder/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -275129,7 +275135,7 @@
diff -Nrua koffice-1.4.2.orig/krita/core/color_strategy/Makefile.in koffice-1.4.2/krita/core/color_strategy/Makefile.in
--- koffice-1.4.2.orig/krita/core/color_strategy/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/krita/core/color_strategy/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/core/color_strategy/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -276003,7 +276009,7 @@
diff -Nrua koffice-1.4.2.orig/krita/core/Makefile.in koffice-1.4.2/krita/core/Makefile.in
--- koffice-1.4.2.orig/krita/core/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/krita/core/Makefile.in 2005-11-13 10:33:46.000000000 +0100
++++ koffice-1.4.2/krita/core/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -277129,7 +277135,7 @@
diff -Nrua koffice-1.4.2.orig/krita/core/paintop/Makefile.in koffice-1.4.2/krita/core/paintop/Makefile.in
--- koffice-1.4.2.orig/krita/core/paintop/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/krita/core/paintop/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/core/paintop/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -277986,7 +277992,7 @@
diff -Nrua koffice-1.4.2.orig/krita/core/resources/Makefile.in koffice-1.4.2/krita/core/resources/Makefile.in
--- koffice-1.4.2.orig/krita/core/resources/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/krita/core/resources/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/core/resources/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -278894,7 +278900,7 @@
diff -Nrua koffice-1.4.2.orig/krita/core/strategy/Makefile.in koffice-1.4.2/krita/core/strategy/Makefile.in
--- koffice-1.4.2.orig/krita/core/strategy/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/krita/core/strategy/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/core/strategy/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -279736,7 +279742,7 @@
diff -Nrua koffice-1.4.2.orig/krita/core/tiles/Makefile.in koffice-1.4.2/krita/core/tiles/Makefile.in
--- koffice-1.4.2.orig/krita/core/tiles/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/krita/core/tiles/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/core/tiles/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -280612,7 +280618,7 @@
diff -Nrua koffice-1.4.2.orig/krita/core/tool/Makefile.in koffice-1.4.2/krita/core/tool/Makefile.in
--- koffice-1.4.2.orig/krita/core/tool/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/krita/core/tool/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/core/tool/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -281492,7 +281498,7 @@
diff -Nrua koffice-1.4.2.orig/krita/data/brushes/Makefile.in koffice-1.4.2/krita/data/brushes/Makefile.in
--- koffice-1.4.2.orig/krita/data/brushes/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/krita/data/brushes/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/data/brushes/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -282195,7 +282201,7 @@
diff -Nrua koffice-1.4.2.orig/krita/data/gradients/Makefile.in koffice-1.4.2/krita/data/gradients/Makefile.in
--- koffice-1.4.2.orig/krita/data/gradients/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/krita/data/gradients/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/data/gradients/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -282920,7 +282926,7 @@
diff -Nrua koffice-1.4.2.orig/krita/data/images/Makefile.in koffice-1.4.2/krita/data/images/Makefile.in
--- koffice-1.4.2.orig/krita/data/images/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/krita/data/images/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/data/images/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -283617,7 +283623,7 @@
diff -Nrua koffice-1.4.2.orig/krita/data/Makefile.in koffice-1.4.2/krita/data/Makefile.in
--- koffice-1.4.2.orig/krita/data/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/krita/data/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/data/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -284491,7 +284497,7 @@
diff -Nrua koffice-1.4.2.orig/krita/data/palettes/Makefile.in koffice-1.4.2/krita/data/palettes/Makefile.in
--- koffice-1.4.2.orig/krita/data/palettes/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/krita/data/palettes/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/data/palettes/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -285193,7 +285199,7 @@
diff -Nrua koffice-1.4.2.orig/krita/data/patterns/Makefile.in koffice-1.4.2/krita/data/patterns/Makefile.in
--- koffice-1.4.2.orig/krita/data/patterns/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/krita/data/patterns/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/data/patterns/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -285890,7 +285896,7 @@
diff -Nrua koffice-1.4.2.orig/krita/data/profiles/Makefile.in koffice-1.4.2/krita/data/profiles/Makefile.in
--- koffice-1.4.2.orig/krita/data/profiles/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/krita/data/profiles/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/data/profiles/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -286587,7 +286593,7 @@
diff -Nrua koffice-1.4.2.orig/krita/data/templates/Makefile.in koffice-1.4.2/krita/data/templates/Makefile.in
--- koffice-1.4.2.orig/krita/data/templates/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/krita/data/templates/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/data/templates/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -287322,7 +287328,7 @@
diff -Nrua koffice-1.4.2.orig/krita/dtd/Makefile.in koffice-1.4.2/krita/dtd/Makefile.in
--- koffice-1.4.2.orig/krita/dtd/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/krita/dtd/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/dtd/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -288017,7 +288023,7 @@
diff -Nrua koffice-1.4.2.orig/krita/Makefile.in koffice-1.4.2/krita/Makefile.in
--- koffice-1.4.2.orig/krita/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/krita/Makefile.in 2005-11-13 10:33:46.000000000 +0100
++++ koffice-1.4.2/krita/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -289357,7 +289363,7 @@
diff -Nrua koffice-1.4.2.orig/krita/modules/colorspace_cmyk/Makefile.in koffice-1.4.2/krita/modules/colorspace_cmyk/Makefile.in
--- koffice-1.4.2.orig/krita/modules/colorspace_cmyk/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/krita/modules/colorspace_cmyk/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/modules/colorspace_cmyk/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -290463,7 +290469,7 @@
diff -Nrua koffice-1.4.2.orig/krita/modules/colorspace_cmyk/templates/Makefile.in koffice-1.4.2/krita/modules/colorspace_cmyk/templates/Makefile.in
--- koffice-1.4.2.orig/krita/modules/colorspace_cmyk/templates/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/krita/modules/colorspace_cmyk/templates/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/modules/colorspace_cmyk/templates/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -291198,7 +291204,7 @@
diff -Nrua koffice-1.4.2.orig/krita/modules/colorspace_gray/Makefile.in koffice-1.4.2/krita/modules/colorspace_gray/Makefile.in
--- koffice-1.4.2.orig/krita/modules/colorspace_gray/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/krita/modules/colorspace_gray/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/modules/colorspace_gray/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -292297,7 +292303,7 @@
diff -Nrua koffice-1.4.2.orig/krita/modules/colorspace_gray/templates/Makefile.in koffice-1.4.2/krita/modules/colorspace_gray/templates/Makefile.in
--- koffice-1.4.2.orig/krita/modules/colorspace_gray/templates/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/krita/modules/colorspace_gray/templates/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/modules/colorspace_gray/templates/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -293032,7 +293038,7 @@
diff -Nrua koffice-1.4.2.orig/krita/modules/colorspace_rgb/Makefile.in koffice-1.4.2/krita/modules/colorspace_rgb/Makefile.in
--- koffice-1.4.2.orig/krita/modules/colorspace_rgb/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/krita/modules/colorspace_rgb/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/modules/colorspace_rgb/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -294127,7 +294133,7 @@
diff -Nrua koffice-1.4.2.orig/krita/modules/colorspace_rgb/templates/Makefile.in koffice-1.4.2/krita/modules/colorspace_rgb/templates/Makefile.in
--- koffice-1.4.2.orig/krita/modules/colorspace_rgb/templates/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/krita/modules/colorspace_rgb/templates/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/modules/colorspace_rgb/templates/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -294862,7 +294868,7 @@
diff -Nrua koffice-1.4.2.orig/krita/modules/colorspace_wet/Makefile.in koffice-1.4.2/krita/modules/colorspace_wet/Makefile.in
--- koffice-1.4.2.orig/krita/modules/colorspace_wet/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/krita/modules/colorspace_wet/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/modules/colorspace_wet/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -295873,7 +295879,7 @@
diff -Nrua koffice-1.4.2.orig/krita/modules/colorspace_ws/filter/Makefile.in koffice-1.4.2/krita/modules/colorspace_ws/filter/Makefile.in
--- koffice-1.4.2.orig/krita/modules/colorspace_ws/filter/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/krita/modules/colorspace_ws/filter/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/modules/colorspace_ws/filter/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -296834,7 +296840,7 @@
diff -Nrua koffice-1.4.2.orig/krita/modules/colorspace_ws/Makefile.in koffice-1.4.2/krita/modules/colorspace_ws/Makefile.in
--- koffice-1.4.2.orig/krita/modules/colorspace_ws/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/krita/modules/colorspace_ws/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/modules/colorspace_ws/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -297925,7 +297931,7 @@
diff -Nrua koffice-1.4.2.orig/krita/modules/Makefile.in koffice-1.4.2/krita/modules/Makefile.in
--- koffice-1.4.2.orig/krita/modules/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/krita/modules/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/modules/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -298751,7 +298757,7 @@
diff -Nrua koffice-1.4.2.orig/krita/paintops/Makefile.in koffice-1.4.2/krita/paintops/Makefile.in
--- koffice-1.4.2.orig/krita/paintops/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/krita/paintops/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/paintops/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -299739,7 +299745,7 @@
diff -Nrua koffice-1.4.2.orig/krita/pics/Makefile.in koffice-1.4.2/krita/pics/Makefile.in
--- koffice-1.4.2.orig/krita/pics/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/krita/pics/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/pics/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -300446,7 +300452,7 @@
diff -Nrua koffice-1.4.2.orig/krita/plugins/cimg/Makefile.in koffice-1.4.2/krita/plugins/cimg/Makefile.in
--- koffice-1.4.2.orig/krita/plugins/cimg/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/krita/plugins/cimg/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/plugins/cimg/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -301448,7 +301454,7 @@
diff -Nrua koffice-1.4.2.orig/krita/plugins/colorrange/Makefile.in koffice-1.4.2/krita/plugins/colorrange/Makefile.in
--- koffice-1.4.2.orig/krita/plugins/colorrange/Makefile.in 2005-10-05 12:52:59.000000000 +0200
-+++ koffice-1.4.2/krita/plugins/colorrange/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/plugins/colorrange/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -302477,7 +302483,7 @@
diff -Nrua koffice-1.4.2.orig/krita/plugins/colorsfilters/Makefile.in koffice-1.4.2/krita/plugins/colorsfilters/Makefile.in
--- koffice-1.4.2.orig/krita/plugins/colorsfilters/Makefile.in 2005-10-05 12:52:59.000000000 +0200
-+++ koffice-1.4.2/krita/plugins/colorsfilters/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/plugins/colorsfilters/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -303441,7 +303447,7 @@
diff -Nrua koffice-1.4.2.orig/krita/plugins/colorspaceconversion/Makefile.in koffice-1.4.2/krita/plugins/colorspaceconversion/Makefile.in
--- koffice-1.4.2.orig/krita/plugins/colorspaceconversion/Makefile.in 2005-10-05 12:52:59.000000000 +0200
-+++ koffice-1.4.2/krita/plugins/colorspaceconversion/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/plugins/colorspaceconversion/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -304399,7 +304405,7 @@
diff -Nrua koffice-1.4.2.orig/krita/plugins/convolutionfilters/Makefile.in koffice-1.4.2/krita/plugins/convolutionfilters/Makefile.in
--- koffice-1.4.2.orig/krita/plugins/convolutionfilters/Makefile.in 2005-10-05 12:52:59.000000000 +0200
-+++ koffice-1.4.2/krita/plugins/convolutionfilters/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/plugins/convolutionfilters/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -305377,7 +305383,7 @@
diff -Nrua koffice-1.4.2.orig/krita/plugins/designerplugin/Makefile.in koffice-1.4.2/krita/plugins/designerplugin/Makefile.in
--- koffice-1.4.2.orig/krita/plugins/designerplugin/Makefile.in 2005-10-05 12:52:59.000000000 +0200
-+++ koffice-1.4.2/krita/plugins/designerplugin/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/plugins/designerplugin/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -306275,7 +306281,7 @@
diff -Nrua koffice-1.4.2.orig/krita/plugins/embossfilter/Makefile.in koffice-1.4.2/krita/plugins/embossfilter/Makefile.in
--- koffice-1.4.2.orig/krita/plugins/embossfilter/Makefile.in 2005-10-05 12:52:59.000000000 +0200
-+++ koffice-1.4.2/krita/plugins/embossfilter/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/plugins/embossfilter/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -307234,7 +307240,7 @@
diff -Nrua koffice-1.4.2.orig/krita/plugins/example/Makefile.in koffice-1.4.2/krita/plugins/example/Makefile.in
--- koffice-1.4.2.orig/krita/plugins/example/Makefile.in 2005-10-05 12:52:59.000000000 +0200
-+++ koffice-1.4.2/krita/plugins/example/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/plugins/example/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -308173,7 +308179,7 @@
diff -Nrua koffice-1.4.2.orig/krita/plugins/histogram/Makefile.in koffice-1.4.2/krita/plugins/histogram/Makefile.in
--- koffice-1.4.2.orig/krita/plugins/histogram/Makefile.in 2005-10-05 12:52:59.000000000 +0200
-+++ koffice-1.4.2/krita/plugins/histogram/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/plugins/histogram/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -309135,7 +309141,7 @@
diff -Nrua koffice-1.4.2.orig/krita/plugins/imagemagick/Makefile.in koffice-1.4.2/krita/plugins/imagemagick/Makefile.in
--- koffice-1.4.2.orig/krita/plugins/imagemagick/Makefile.in 2005-10-05 12:52:59.000000000 +0200
-+++ koffice-1.4.2/krita/plugins/imagemagick/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/plugins/imagemagick/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -310082,7 +310088,7 @@
diff -Nrua koffice-1.4.2.orig/krita/plugins/imagesize/Makefile.in koffice-1.4.2/krita/plugins/imagesize/Makefile.in
--- koffice-1.4.2.orig/krita/plugins/imagesize/Makefile.in 2005-10-05 12:52:59.000000000 +0200
-+++ koffice-1.4.2/krita/plugins/imagesize/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/plugins/imagesize/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -311041,7 +311047,7 @@
diff -Nrua koffice-1.4.2.orig/krita/plugins/kiskjsembed/functions/Makefile.in koffice-1.4.2/krita/plugins/kiskjsembed/functions/Makefile.in
--- koffice-1.4.2.orig/krita/plugins/kiskjsembed/functions/Makefile.in 2005-10-05 12:52:59.000000000 +0200
-+++ koffice-1.4.2/krita/plugins/kiskjsembed/functions/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/plugins/kiskjsembed/functions/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -311910,7 +311916,7 @@
diff -Nrua koffice-1.4.2.orig/krita/plugins/kiskjsembed/Makefile.in koffice-1.4.2/krita/plugins/kiskjsembed/Makefile.in
--- koffice-1.4.2.orig/krita/plugins/kiskjsembed/Makefile.in 2005-10-05 12:52:59.000000000 +0200
-+++ koffice-1.4.2/krita/plugins/kiskjsembed/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/plugins/kiskjsembed/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -313013,7 +313019,7 @@
diff -Nrua koffice-1.4.2.orig/krita/plugins/kiskjsembed/objects/Makefile.in koffice-1.4.2/krita/plugins/kiskjsembed/objects/Makefile.in
--- koffice-1.4.2.orig/krita/plugins/kiskjsembed/objects/Makefile.in 2005-10-05 12:52:59.000000000 +0200
-+++ koffice-1.4.2/krita/plugins/kiskjsembed/objects/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/plugins/kiskjsembed/objects/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -313882,7 +313888,7 @@
diff -Nrua koffice-1.4.2.orig/krita/plugins/Makefile.in koffice-1.4.2/krita/plugins/Makefile.in
--- koffice-1.4.2.orig/krita/plugins/Makefile.in 2005-10-05 12:52:58.000000000 +0200
-+++ koffice-1.4.2/krita/plugins/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/plugins/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -314716,7 +314722,7 @@
diff -Nrua koffice-1.4.2.orig/krita/plugins/oilpaintfilter/Makefile.in koffice-1.4.2/krita/plugins/oilpaintfilter/Makefile.in
--- koffice-1.4.2.orig/krita/plugins/oilpaintfilter/Makefile.in 2005-10-05 12:52:59.000000000 +0200
-+++ koffice-1.4.2/krita/plugins/oilpaintfilter/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/plugins/oilpaintfilter/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -315675,7 +315681,7 @@
diff -Nrua koffice-1.4.2.orig/krita/plugins/performancetest/Makefile.in koffice-1.4.2/krita/plugins/performancetest/Makefile.in
--- koffice-1.4.2.orig/krita/plugins/performancetest/Makefile.in 2005-10-05 12:52:59.000000000 +0200
-+++ koffice-1.4.2/krita/plugins/performancetest/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/plugins/performancetest/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -316627,7 +316633,7 @@
diff -Nrua koffice-1.4.2.orig/krita/plugins/raindropsfilter/Makefile.in koffice-1.4.2/krita/plugins/raindropsfilter/Makefile.in
--- koffice-1.4.2.orig/krita/plugins/raindropsfilter/Makefile.in 2005-10-05 12:52:59.000000000 +0200
-+++ koffice-1.4.2/krita/plugins/raindropsfilter/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/plugins/raindropsfilter/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -317587,7 +317593,7 @@
diff -Nrua koffice-1.4.2.orig/krita/plugins/rotateimage/Makefile.in koffice-1.4.2/krita/plugins/rotateimage/Makefile.in
--- koffice-1.4.2.orig/krita/plugins/rotateimage/Makefile.in 2005-10-05 12:52:59.000000000 +0200
-+++ koffice-1.4.2/krita/plugins/rotateimage/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/plugins/rotateimage/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -318539,7 +318545,7 @@
diff -Nrua koffice-1.4.2.orig/krita/plugins/screenshot/Makefile.in koffice-1.4.2/krita/plugins/screenshot/Makefile.in
--- koffice-1.4.2.orig/krita/plugins/screenshot/Makefile.in 2005-10-05 12:52:59.000000000 +0200
-+++ koffice-1.4.2/krita/plugins/screenshot/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/plugins/screenshot/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -319494,7 +319500,7 @@
diff -Nrua koffice-1.4.2.orig/krita/plugins/selectiontools/Makefile.in koffice-1.4.2/krita/plugins/selectiontools/Makefile.in
--- koffice-1.4.2.orig/krita/plugins/selectiontools/Makefile.in 2005-10-05 12:52:59.000000000 +0200
-+++ koffice-1.4.2/krita/plugins/selectiontools/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/plugins/selectiontools/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -320560,7 +320566,7 @@
diff -Nrua koffice-1.4.2.orig/krita/plugins/shearimage/Makefile.in koffice-1.4.2/krita/plugins/shearimage/Makefile.in
--- koffice-1.4.2.orig/krita/plugins/shearimage/Makefile.in 2005-10-05 12:52:59.000000000 +0200
-+++ koffice-1.4.2/krita/plugins/shearimage/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/plugins/shearimage/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -321512,7 +321518,7 @@
diff -Nrua koffice-1.4.2.orig/krita/plugins/tool_crop/Makefile.in koffice-1.4.2/krita/plugins/tool_crop/Makefile.in
--- koffice-1.4.2.orig/krita/plugins/tool_crop/Makefile.in 2005-10-05 12:52:59.000000000 +0200
-+++ koffice-1.4.2/krita/plugins/tool_crop/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/plugins/tool_crop/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -322503,7 +322509,7 @@
diff -Nrua koffice-1.4.2.orig/krita/plugins/tool_filter/Makefile.in koffice-1.4.2/krita/plugins/tool_filter/Makefile.in
--- koffice-1.4.2.orig/krita/plugins/tool_filter/Makefile.in 2005-10-05 12:52:59.000000000 +0200
-+++ koffice-1.4.2/krita/plugins/tool_filter/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/plugins/tool_filter/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -323501,7 +323507,7 @@
diff -Nrua koffice-1.4.2.orig/krita/plugins/tool_polygon/Makefile.in koffice-1.4.2/krita/plugins/tool_polygon/Makefile.in
--- koffice-1.4.2.orig/krita/plugins/tool_polygon/Makefile.in 2005-10-05 12:52:59.000000000 +0200
-+++ koffice-1.4.2/krita/plugins/tool_polygon/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/plugins/tool_polygon/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -324494,7 +324500,7 @@
diff -Nrua koffice-1.4.2.orig/krita/plugins/tool_polyline/Makefile.in koffice-1.4.2/krita/plugins/tool_polyline/Makefile.in
--- koffice-1.4.2.orig/krita/plugins/tool_polyline/Makefile.in 2005-10-05 12:52:59.000000000 +0200
-+++ koffice-1.4.2/krita/plugins/tool_polyline/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/plugins/tool_polyline/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -325489,7 +325495,7 @@
diff -Nrua koffice-1.4.2.orig/krita/plugins/tool_star/Makefile.in koffice-1.4.2/krita/plugins/tool_star/Makefile.in
--- koffice-1.4.2.orig/krita/plugins/tool_star/Makefile.in 2005-10-05 12:52:59.000000000 +0200
-+++ koffice-1.4.2/krita/plugins/tool_star/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/plugins/tool_star/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -326482,7 +326488,7 @@
diff -Nrua koffice-1.4.2.orig/krita/plugins/tool_transform/Makefile.in koffice-1.4.2/krita/plugins/tool_transform/Makefile.in
--- koffice-1.4.2.orig/krita/plugins/tool_transform/Makefile.in 2005-10-05 12:52:59.000000000 +0200
-+++ koffice-1.4.2/krita/plugins/tool_transform/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/plugins/tool_transform/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -327477,7 +327483,7 @@
diff -Nrua koffice-1.4.2.orig/krita/plugins/variations/Makefile.in koffice-1.4.2/krita/plugins/variations/Makefile.in
--- koffice-1.4.2.orig/krita/plugins/variations/Makefile.in 2005-10-05 12:52:59.000000000 +0200
-+++ koffice-1.4.2/krita/plugins/variations/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/plugins/variations/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -328429,7 +328435,7 @@
diff -Nrua koffice-1.4.2.orig/krita/tools/Makefile.in koffice-1.4.2/krita/tools/Makefile.in
--- koffice-1.4.2.orig/krita/tools/Makefile.in 2005-10-05 12:52:59.000000000 +0200
-+++ koffice-1.4.2/krita/tools/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/tools/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -329479,7 +329485,7 @@
diff -Nrua koffice-1.4.2.orig/krita/ui/labels/Makefile.in koffice-1.4.2/krita/ui/labels/Makefile.in
--- koffice-1.4.2.orig/krita/ui/labels/Makefile.in 2005-10-05 12:53:00.000000000 +0200
-+++ koffice-1.4.2/krita/ui/labels/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/ui/labels/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -330338,7 +330344,7 @@
diff -Nrua koffice-1.4.2.orig/krita/ui/Makefile.in koffice-1.4.2/krita/ui/Makefile.in
--- koffice-1.4.2.orig/krita/ui/Makefile.in 2005-10-05 12:53:00.000000000 +0200
-+++ koffice-1.4.2/krita/ui/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/ui/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -331464,7 +331470,7 @@
diff -Nrua koffice-1.4.2.orig/krita/ui/widgets/Makefile.in koffice-1.4.2/krita/ui/widgets/Makefile.in
--- koffice-1.4.2.orig/krita/ui/widgets/Makefile.in 2005-10-05 12:53:00.000000000 +0200
-+++ koffice-1.4.2/krita/ui/widgets/Makefile.in 2005-11-13 10:33:47.000000000 +0100
++++ koffice-1.4.2/krita/ui/widgets/Makefile.in 2005-11-14 09:13:50.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -332365,7 +332371,7 @@
diff -Nrua koffice-1.4.2.orig/kspread/dialogs/Makefile.in koffice-1.4.2/kspread/dialogs/Makefile.in
--- koffice-1.4.2.orig/kspread/dialogs/Makefile.in 2005-10-05 12:53:00.000000000 +0200
-+++ koffice-1.4.2/kspread/dialogs/Makefile.in 2005-11-13 10:33:48.000000000 +0100
++++ koffice-1.4.2/kspread/dialogs/Makefile.in 2005-11-14 09:13:52.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -333381,7 +333387,7 @@
diff -Nrua koffice-1.4.2.orig/kspread/dtd/Makefile.in koffice-1.4.2/kspread/dtd/Makefile.in
--- koffice-1.4.2.orig/kspread/dtd/Makefile.in 2005-10-05 12:53:00.000000000 +0200
-+++ koffice-1.4.2/kspread/dtd/Makefile.in 2005-11-13 10:33:48.000000000 +0100
++++ koffice-1.4.2/kspread/dtd/Makefile.in 2005-11-14 09:13:52.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -334076,7 +334082,7 @@
diff -Nrua koffice-1.4.2.orig/kspread/extensions/Makefile.in koffice-1.4.2/kspread/extensions/Makefile.in
--- koffice-1.4.2.orig/kspread/extensions/Makefile.in 2005-10-05 12:53:00.000000000 +0200
-+++ koffice-1.4.2/kspread/extensions/Makefile.in 2005-11-13 10:33:48.000000000 +0100
++++ koffice-1.4.2/kspread/extensions/Makefile.in 2005-11-14 09:13:52.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -334774,7 +334780,7 @@
diff -Nrua koffice-1.4.2.orig/kspread/Makefile.in koffice-1.4.2/kspread/Makefile.in
--- koffice-1.4.2.orig/kspread/Makefile.in 2005-10-05 12:53:00.000000000 +0200
-+++ koffice-1.4.2/kspread/Makefile.in 2005-11-13 10:33:48.000000000 +0100
++++ koffice-1.4.2/kspread/Makefile.in 2005-11-14 09:13:51.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -336416,7 +336422,7 @@
diff -Nrua koffice-1.4.2.orig/kspread/pics/Makefile.in koffice-1.4.2/kspread/pics/Makefile.in
--- koffice-1.4.2.orig/kspread/pics/Makefile.in 2005-10-05 12:53:00.000000000 +0200
-+++ koffice-1.4.2/kspread/pics/Makefile.in 2005-11-13 10:33:48.000000000 +0100
++++ koffice-1.4.2/kspread/pics/Makefile.in 2005-11-14 09:13:52.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -337070,7 +337076,7 @@
diff -Nrua koffice-1.4.2.orig/kspread/plugins/calculator/Makefile.in koffice-1.4.2/kspread/plugins/calculator/Makefile.in
--- koffice-1.4.2.orig/kspread/plugins/calculator/Makefile.in 2005-10-05 12:53:00.000000000 +0200
-+++ koffice-1.4.2/kspread/plugins/calculator/Makefile.in 2005-11-13 10:33:48.000000000 +0100
++++ koffice-1.4.2/kspread/plugins/calculator/Makefile.in 2005-11-14 09:13:52.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -338145,7 +338151,7 @@
diff -Nrua koffice-1.4.2.orig/kspread/plugins/calculator/pics/Makefile.in koffice-1.4.2/kspread/plugins/calculator/pics/Makefile.in
--- koffice-1.4.2.orig/kspread/plugins/calculator/pics/Makefile.in 2005-10-05 12:53:00.000000000 +0200
-+++ koffice-1.4.2/kspread/plugins/calculator/pics/Makefile.in 2005-11-13 10:33:48.000000000 +0100
++++ koffice-1.4.2/kspread/plugins/calculator/pics/Makefile.in 2005-11-14 09:13:52.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -338799,7 +338805,7 @@
diff -Nrua koffice-1.4.2.orig/kspread/plugins/insertcalendar/Makefile.in koffice-1.4.2/kspread/plugins/insertcalendar/Makefile.in
--- koffice-1.4.2.orig/kspread/plugins/insertcalendar/Makefile.in 2005-10-05 12:53:01.000000000 +0200
-+++ koffice-1.4.2/kspread/plugins/insertcalendar/Makefile.in 2005-11-13 10:33:48.000000000 +0100
++++ koffice-1.4.2/kspread/plugins/insertcalendar/Makefile.in 2005-11-14 09:13:52.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -339879,7 +339885,7 @@
diff -Nrua koffice-1.4.2.orig/kspread/plugins/Makefile.in koffice-1.4.2/kspread/plugins/Makefile.in
--- koffice-1.4.2.orig/kspread/plugins/Makefile.in 2005-10-05 12:53:00.000000000 +0200
-+++ koffice-1.4.2/kspread/plugins/Makefile.in 2005-11-13 10:33:48.000000000 +0100
++++ koffice-1.4.2/kspread/plugins/Makefile.in 2005-11-14 09:13:52.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -340702,7 +340708,7 @@
diff -Nrua koffice-1.4.2.orig/kspread/tablestyles/Makefile.in koffice-1.4.2/kspread/tablestyles/Makefile.in
--- koffice-1.4.2.orig/kspread/tablestyles/Makefile.in 2005-10-05 12:53:01.000000000 +0200
-+++ koffice-1.4.2/kspread/tablestyles/Makefile.in 2005-11-13 10:33:48.000000000 +0100
++++ koffice-1.4.2/kspread/tablestyles/Makefile.in 2005-11-14 09:13:52.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -341397,7 +341403,7 @@
diff -Nrua koffice-1.4.2.orig/kspread/templates/Business/Makefile.in koffice-1.4.2/kspread/templates/Business/Makefile.in
--- koffice-1.4.2.orig/kspread/templates/Business/Makefile.in 2005-10-05 12:53:01.000000000 +0200
-+++ koffice-1.4.2/kspread/templates/Business/Makefile.in 2005-11-13 10:33:49.000000000 +0100
++++ koffice-1.4.2/kspread/templates/Business/Makefile.in 2005-11-14 09:13:52.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -342132,7 +342138,7 @@
diff -Nrua koffice-1.4.2.orig/kspread/templates/General/Makefile.in koffice-1.4.2/kspread/templates/General/Makefile.in
--- koffice-1.4.2.orig/kspread/templates/General/Makefile.in 2005-10-05 12:53:01.000000000 +0200
-+++ koffice-1.4.2/kspread/templates/General/Makefile.in 2005-11-13 10:33:49.000000000 +0100
++++ koffice-1.4.2/kspread/templates/General/Makefile.in 2005-11-14 09:13:52.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -342867,7 +342873,7 @@
diff -Nrua koffice-1.4.2.orig/kspread/templates/HomeFamily/Makefile.in koffice-1.4.2/kspread/templates/HomeFamily/Makefile.in
--- koffice-1.4.2.orig/kspread/templates/HomeFamily/Makefile.in 2005-10-05 12:53:01.000000000 +0200
-+++ koffice-1.4.2/kspread/templates/HomeFamily/Makefile.in 2005-11-13 10:33:49.000000000 +0100
++++ koffice-1.4.2/kspread/templates/HomeFamily/Makefile.in 2005-11-14 09:13:52.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -343602,7 +343608,7 @@
diff -Nrua koffice-1.4.2.orig/kspread/templates/Makefile.in koffice-1.4.2/kspread/templates/Makefile.in
--- koffice-1.4.2.orig/kspread/templates/Makefile.in 2005-10-05 12:53:01.000000000 +0200
-+++ koffice-1.4.2/kspread/templates/Makefile.in 2005-11-13 10:33:49.000000000 +0100
++++ koffice-1.4.2/kspread/templates/Makefile.in 2005-11-14 09:13:52.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -344424,7 +344430,7 @@
diff -Nrua koffice-1.4.2.orig/kspread/tests/Makefile.in koffice-1.4.2/kspread/tests/Makefile.in
--- koffice-1.4.2.orig/kspread/tests/Makefile.in 2005-10-05 12:53:01.000000000 +0200
-+++ koffice-1.4.2/kspread/tests/Makefile.in 2005-11-13 10:33:49.000000000 +0100
++++ koffice-1.4.2/kspread/tests/Makefile.in 2005-11-14 09:13:52.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -345319,7 +345325,7 @@
diff -Nrua koffice-1.4.2.orig/kspread/toolbar/crystalsvg/Makefile.in koffice-1.4.2/kspread/toolbar/crystalsvg/Makefile.in
--- koffice-1.4.2.orig/kspread/toolbar/crystalsvg/Makefile.in 2005-10-05 12:53:01.000000000 +0200
-+++ koffice-1.4.2/kspread/toolbar/crystalsvg/Makefile.in 2005-11-13 10:33:49.000000000 +0100
++++ koffice-1.4.2/kspread/toolbar/crystalsvg/Makefile.in 2005-11-14 09:13:52.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -345973,7 +345979,7 @@
diff -Nrua koffice-1.4.2.orig/kspread/toolbar/Makefile.in koffice-1.4.2/kspread/toolbar/Makefile.in
--- koffice-1.4.2.orig/kspread/toolbar/Makefile.in 2005-10-05 12:53:01.000000000 +0200
-+++ koffice-1.4.2/kspread/toolbar/Makefile.in 2005-11-13 10:33:49.000000000 +0100
++++ koffice-1.4.2/kspread/toolbar/Makefile.in 2005-11-14 09:13:52.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -346796,7 +346802,7 @@
diff -Nrua koffice-1.4.2.orig/kugar/kde31/Makefile.in koffice-1.4.2/kugar/kde31/Makefile.in
--- koffice-1.4.2.orig/kugar/kde31/Makefile.in 2005-10-05 12:53:01.000000000 +0200
-+++ koffice-1.4.2/kugar/kde31/Makefile.in 2005-11-13 10:33:49.000000000 +0100
++++ koffice-1.4.2/kugar/kde31/Makefile.in 2005-11-14 09:13:52.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -347449,7 +347455,7 @@
diff -Nrua koffice-1.4.2.orig/kugar/kudesigner/Makefile.in koffice-1.4.2/kugar/kudesigner/Makefile.in
--- koffice-1.4.2.orig/kugar/kudesigner/Makefile.in 2005-10-05 12:53:01.000000000 +0200
-+++ koffice-1.4.2/kugar/kudesigner/Makefile.in 2005-11-13 10:33:49.000000000 +0100
++++ koffice-1.4.2/kugar/kudesigner/Makefile.in 2005-11-14 09:13:52.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -348779,7 +348785,7 @@
diff -Nrua koffice-1.4.2.orig/kugar/kudesigner/pics/Makefile.in koffice-1.4.2/kugar/kudesigner/pics/Makefile.in
--- koffice-1.4.2.orig/kugar/kudesigner/pics/Makefile.in 2005-10-05 12:53:01.000000000 +0200
-+++ koffice-1.4.2/kugar/kudesigner/pics/Makefile.in 2005-11-13 10:33:49.000000000 +0100
++++ koffice-1.4.2/kugar/kudesigner/pics/Makefile.in 2005-11-14 09:13:52.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -349432,7 +349438,7 @@
diff -Nrua koffice-1.4.2.orig/kugar/kudesigner/templates/General/Makefile.in koffice-1.4.2/kugar/kudesigner/templates/General/Makefile.in
--- koffice-1.4.2.orig/kugar/kudesigner/templates/General/Makefile.in 2005-10-05 12:53:01.000000000 +0200
-+++ koffice-1.4.2/kugar/kudesigner/templates/General/Makefile.in 2005-11-13 10:33:49.000000000 +0100
++++ koffice-1.4.2/kugar/kudesigner/templates/General/Makefile.in 2005-11-14 09:13:52.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -350171,7 +350177,7 @@
diff -Nrua koffice-1.4.2.orig/kugar/kudesigner/templates/Makefile.in koffice-1.4.2/kugar/kudesigner/templates/Makefile.in
--- koffice-1.4.2.orig/kugar/kudesigner/templates/Makefile.in 2005-10-05 12:53:01.000000000 +0200
-+++ koffice-1.4.2/kugar/kudesigner/templates/Makefile.in 2005-11-13 10:33:49.000000000 +0100
++++ koffice-1.4.2/kugar/kudesigner/templates/Makefile.in 2005-11-14 09:13:52.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -350993,7 +350999,7 @@
diff -Nrua koffice-1.4.2.orig/kugar/kudesigner/toolbar/Makefile.in koffice-1.4.2/kugar/kudesigner/toolbar/Makefile.in
--- koffice-1.4.2.orig/kugar/kudesigner/toolbar/Makefile.in 2005-10-05 12:53:01.000000000 +0200
-+++ koffice-1.4.2/kugar/kudesigner/toolbar/Makefile.in 2005-11-13 10:33:49.000000000 +0100
++++ koffice-1.4.2/kugar/kudesigner/toolbar/Makefile.in 2005-11-14 09:13:52.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -351647,7 +351653,7 @@
diff -Nrua koffice-1.4.2.orig/kugar/kudesigner_lib/Makefile.in koffice-1.4.2/kugar/kudesigner_lib/Makefile.in
--- koffice-1.4.2.orig/kugar/kudesigner_lib/Makefile.in 2005-10-05 12:53:01.000000000 +0200
-+++ koffice-1.4.2/kugar/kudesigner_lib/Makefile.in 2005-11-13 10:33:49.000000000 +0100
++++ koffice-1.4.2/kugar/kudesigner_lib/Makefile.in 2005-11-14 09:13:52.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -352579,7 +352585,7 @@
diff -Nrua koffice-1.4.2.orig/kugar/lib/Makefile.in koffice-1.4.2/kugar/lib/Makefile.in
--- koffice-1.4.2.orig/kugar/lib/Makefile.in 2005-10-05 12:53:01.000000000 +0200
-+++ koffice-1.4.2/kugar/lib/Makefile.in 2005-11-13 10:33:49.000000000 +0100
++++ koffice-1.4.2/kugar/lib/Makefile.in 2005-11-14 09:13:52.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -353589,7 +353595,7 @@
diff -Nrua koffice-1.4.2.orig/kugar/Makefile.in koffice-1.4.2/kugar/Makefile.in
--- koffice-1.4.2.orig/kugar/Makefile.in 2005-10-05 12:53:01.000000000 +0200
-+++ koffice-1.4.2/kugar/Makefile.in 2005-11-13 10:33:49.000000000 +0100
++++ koffice-1.4.2/kugar/Makefile.in 2005-11-14 09:13:52.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -354423,7 +354429,7 @@
diff -Nrua koffice-1.4.2.orig/kugar/part/Makefile.in koffice-1.4.2/kugar/part/Makefile.in
--- koffice-1.4.2.orig/kugar/part/Makefile.in 2005-10-05 12:53:01.000000000 +0200
-+++ koffice-1.4.2/kugar/part/Makefile.in 2005-11-13 10:33:49.000000000 +0100
++++ koffice-1.4.2/kugar/part/Makefile.in 2005-11-14 09:13:52.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -355646,7 +355652,7 @@
diff -Nrua koffice-1.4.2.orig/kugar/samples/Makefile.in koffice-1.4.2/kugar/samples/Makefile.in
--- koffice-1.4.2.orig/kugar/samples/Makefile.in 2005-10-05 12:53:01.000000000 +0200
-+++ koffice-1.4.2/kugar/samples/Makefile.in 2005-11-13 10:33:49.000000000 +0100
++++ koffice-1.4.2/kugar/samples/Makefile.in 2005-11-14 09:13:52.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -356342,7 +356348,7 @@
diff -Nrua koffice-1.4.2.orig/kugar/samplesdb/Makefile.in koffice-1.4.2/kugar/samplesdb/Makefile.in
--- koffice-1.4.2.orig/kugar/samplesdb/Makefile.in 2005-10-05 12:53:01.000000000 +0200
-+++ koffice-1.4.2/kugar/samplesdb/Makefile.in 2005-11-13 10:33:49.000000000 +0100
++++ koffice-1.4.2/kugar/samplesdb/Makefile.in 2005-11-14 09:13:52.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -357195,7 +357201,7 @@
diff -Nrua koffice-1.4.2.orig/kugar/shell/Makefile.in koffice-1.4.2/kugar/shell/Makefile.in
--- koffice-1.4.2.orig/kugar/shell/Makefile.in 2005-10-05 12:53:01.000000000 +0200
-+++ koffice-1.4.2/kugar/shell/Makefile.in 2005-11-13 10:33:49.000000000 +0100
++++ koffice-1.4.2/kugar/shell/Makefile.in 2005-11-14 09:13:52.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -358242,7 +358248,7 @@
diff -Nrua koffice-1.4.2.orig/kword/data/Makefile.in koffice-1.4.2/kword/data/Makefile.in
--- koffice-1.4.2.orig/kword/data/Makefile.in 2005-10-05 12:53:03.000000000 +0200
-+++ koffice-1.4.2/kword/data/Makefile.in 2005-11-13 10:33:51.000000000 +0100
++++ koffice-1.4.2/kword/data/Makefile.in 2005-11-14 09:13:54.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -358936,7 +358942,7 @@
diff -Nrua koffice-1.4.2.orig/kword/dtd/Makefile.in koffice-1.4.2/kword/dtd/Makefile.in
--- koffice-1.4.2.orig/kword/dtd/Makefile.in 2005-10-05 12:53:03.000000000 +0200
-+++ koffice-1.4.2/kword/dtd/Makefile.in 2005-11-13 10:33:51.000000000 +0100
++++ koffice-1.4.2/kword/dtd/Makefile.in 2005-11-14 09:13:54.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -359726,7 +359732,7 @@
diff -Nrua koffice-1.4.2.orig/kword/expression/Makefile.in koffice-1.4.2/kword/expression/Makefile.in
--- koffice-1.4.2.orig/kword/expression/Makefile.in 2005-10-05 12:53:03.000000000 +0200
-+++ koffice-1.4.2/kword/expression/Makefile.in 2005-11-13 10:33:51.000000000 +0100
++++ koffice-1.4.2/kword/expression/Makefile.in 2005-11-14 09:13:54.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -360421,7 +360427,7 @@
diff -Nrua koffice-1.4.2.orig/kword/horizontalline/Makefile.in koffice-1.4.2/kword/horizontalline/Makefile.in
--- koffice-1.4.2.orig/kword/horizontalline/Makefile.in 2005-10-05 12:53:03.000000000 +0200
-+++ koffice-1.4.2/kword/horizontalline/Makefile.in 2005-11-13 10:33:51.000000000 +0100
++++ koffice-1.4.2/kword/horizontalline/Makefile.in 2005-11-14 09:13:54.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -361116,7 +361122,7 @@
diff -Nrua koffice-1.4.2.orig/kword/mailmerge/kabc/Makefile.in koffice-1.4.2/kword/mailmerge/kabc/Makefile.in
--- koffice-1.4.2.orig/kword/mailmerge/kabc/Makefile.in 2005-10-05 12:53:03.000000000 +0200
-+++ koffice-1.4.2/kword/mailmerge/kabc/Makefile.in 2005-11-13 10:33:51.000000000 +0100
++++ koffice-1.4.2/kword/mailmerge/kabc/Makefile.in 2005-11-14 09:13:54.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -362061,7 +362067,7 @@
diff -Nrua koffice-1.4.2.orig/kword/mailmerge/kspread/Makefile.in koffice-1.4.2/kword/mailmerge/kspread/Makefile.in
--- koffice-1.4.2.orig/kword/mailmerge/kspread/Makefile.in 2005-10-05 12:53:03.000000000 +0200
-+++ koffice-1.4.2/kword/mailmerge/kspread/Makefile.in 2005-11-13 10:33:51.000000000 +0100
++++ koffice-1.4.2/kword/mailmerge/kspread/Makefile.in 2005-11-14 09:13:54.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -363009,7 +363015,7 @@
diff -Nrua koffice-1.4.2.orig/kword/mailmerge/Makefile.in koffice-1.4.2/kword/mailmerge/Makefile.in
--- koffice-1.4.2.orig/kword/mailmerge/Makefile.in 2005-10-05 12:53:03.000000000 +0200
-+++ koffice-1.4.2/kword/mailmerge/Makefile.in 2005-11-13 10:33:51.000000000 +0100
++++ koffice-1.4.2/kword/mailmerge/Makefile.in 2005-11-14 09:13:54.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -364068,7 +364074,7 @@
diff -Nrua koffice-1.4.2.orig/kword/mailmerge/sql/Makefile.in koffice-1.4.2/kword/mailmerge/sql/Makefile.in
--- koffice-1.4.2.orig/kword/mailmerge/sql/Makefile.in 2005-10-05 12:53:03.000000000 +0200
-+++ koffice-1.4.2/kword/mailmerge/sql/Makefile.in 2005-11-13 10:33:51.000000000 +0100
++++ koffice-1.4.2/kword/mailmerge/sql/Makefile.in 2005-11-14 09:13:54.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -365091,7 +365097,7 @@
diff -Nrua koffice-1.4.2.orig/kword/Makefile.in koffice-1.4.2/kword/Makefile.in
--- koffice-1.4.2.orig/kword/Makefile.in 2005-10-05 12:53:03.000000000 +0200
-+++ koffice-1.4.2/kword/Makefile.in 2005-11-13 10:33:51.000000000 +0100
++++ koffice-1.4.2/kword/Makefile.in 2005-11-14 09:13:54.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -366794,7 +366800,7 @@
diff -Nrua koffice-1.4.2.orig/kword/pics/Makefile.in koffice-1.4.2/kword/pics/Makefile.in
--- koffice-1.4.2.orig/kword/pics/Makefile.in 2005-10-05 12:53:03.000000000 +0200
-+++ koffice-1.4.2/kword/pics/Makefile.in 2005-11-13 10:33:51.000000000 +0100
++++ koffice-1.4.2/kword/pics/Makefile.in 2005-11-14 09:13:54.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -367448,7 +367454,7 @@
diff -Nrua koffice-1.4.2.orig/kword/templates/CardsAndLabels/Makefile.in koffice-1.4.2/kword/templates/CardsAndLabels/Makefile.in
--- koffice-1.4.2.orig/kword/templates/CardsAndLabels/Makefile.in 2005-10-05 12:53:03.000000000 +0200
-+++ koffice-1.4.2/kword/templates/CardsAndLabels/Makefile.in 2005-11-13 10:33:51.000000000 +0100
++++ koffice-1.4.2/kword/templates/CardsAndLabels/Makefile.in 2005-11-14 09:13:54.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -368185,7 +368191,7 @@
diff -Nrua koffice-1.4.2.orig/kword/templates/DTP/Makefile.in koffice-1.4.2/kword/templates/DTP/Makefile.in
--- koffice-1.4.2.orig/kword/templates/DTP/Makefile.in 2005-10-05 12:53:03.000000000 +0200
-+++ koffice-1.4.2/kword/templates/DTP/Makefile.in 2005-11-13 10:33:51.000000000 +0100
++++ koffice-1.4.2/kword/templates/DTP/Makefile.in 2005-11-14 09:13:54.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -368920,7 +368926,7 @@
diff -Nrua koffice-1.4.2.orig/kword/templates/Envelopes/Makefile.in koffice-1.4.2/kword/templates/Envelopes/Makefile.in
--- koffice-1.4.2.orig/kword/templates/Envelopes/Makefile.in 2005-10-05 12:53:03.000000000 +0200
-+++ koffice-1.4.2/kword/templates/Envelopes/Makefile.in 2005-11-13 10:33:51.000000000 +0100
++++ koffice-1.4.2/kword/templates/Envelopes/Makefile.in 2005-11-14 09:13:54.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -369657,7 +369663,7 @@
diff -Nrua koffice-1.4.2.orig/kword/templates/Makefile.in koffice-1.4.2/kword/templates/Makefile.in
--- koffice-1.4.2.orig/kword/templates/Makefile.in 2005-10-05 12:53:03.000000000 +0200
-+++ koffice-1.4.2/kword/templates/Makefile.in 2005-11-13 10:33:51.000000000 +0100
++++ koffice-1.4.2/kword/templates/Makefile.in 2005-11-14 09:13:54.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -370482,7 +370488,7 @@
diff -Nrua koffice-1.4.2.orig/kword/templates/Wordprocessing/Makefile.in koffice-1.4.2/kword/templates/Wordprocessing/Makefile.in
--- koffice-1.4.2.orig/kword/templates/Wordprocessing/Makefile.in 2005-10-05 12:53:03.000000000 +0200
-+++ koffice-1.4.2/kword/templates/Wordprocessing/Makefile.in 2005-11-13 10:33:51.000000000 +0100
++++ koffice-1.4.2/kword/templates/Wordprocessing/Makefile.in 2005-11-14 09:13:54.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -371217,7 +371223,7 @@
diff -Nrua koffice-1.4.2.orig/kword/toolbar/Makefile.in koffice-1.4.2/kword/toolbar/Makefile.in
--- koffice-1.4.2.orig/kword/toolbar/Makefile.in 2005-10-05 12:53:03.000000000 +0200
-+++ koffice-1.4.2/kword/toolbar/Makefile.in 2005-11-13 10:33:51.000000000 +0100
++++ koffice-1.4.2/kword/toolbar/Makefile.in 2005-11-14 09:13:54.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -371871,7 +371877,7 @@
diff -Nrua koffice-1.4.2.orig/lib/kformula/config/Makefile.in koffice-1.4.2/lib/kformula/config/Makefile.in
--- koffice-1.4.2.orig/lib/kformula/config/Makefile.in 2005-10-05 12:53:04.000000000 +0200
-+++ koffice-1.4.2/lib/kformula/config/Makefile.in 2005-11-13 10:33:51.000000000 +0100
++++ koffice-1.4.2/lib/kformula/config/Makefile.in 2005-11-14 09:13:54.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -372573,7 +372579,7 @@
diff -Nrua koffice-1.4.2.orig/lib/kformula/dtd/Makefile.in koffice-1.4.2/lib/kformula/dtd/Makefile.in
--- koffice-1.4.2.orig/lib/kformula/dtd/Makefile.in 2005-10-05 12:53:04.000000000 +0200
-+++ koffice-1.4.2/lib/kformula/dtd/Makefile.in 2005-11-13 10:33:51.000000000 +0100
++++ koffice-1.4.2/lib/kformula/dtd/Makefile.in 2005-11-14 09:13:54.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -373268,7 +373274,7 @@
diff -Nrua koffice-1.4.2.orig/lib/kformula/Makefile.in koffice-1.4.2/lib/kformula/Makefile.in
--- koffice-1.4.2.orig/lib/kformula/Makefile.in 2005-10-05 12:53:03.000000000 +0200
-+++ koffice-1.4.2/lib/kformula/Makefile.in 2005-11-13 10:33:51.000000000 +0100
++++ koffice-1.4.2/lib/kformula/Makefile.in 2005-11-14 09:13:54.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -374462,7 +374468,7 @@
diff -Nrua koffice-1.4.2.orig/lib/kformula/pics/crystalsvg/Makefile.in koffice-1.4.2/lib/kformula/pics/crystalsvg/Makefile.in
--- koffice-1.4.2.orig/lib/kformula/pics/crystalsvg/Makefile.in 2005-10-05 12:53:04.000000000 +0200
-+++ koffice-1.4.2/lib/kformula/pics/crystalsvg/Makefile.in 2005-11-13 10:33:51.000000000 +0100
++++ koffice-1.4.2/lib/kformula/pics/crystalsvg/Makefile.in 2005-11-14 09:13:54.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -375117,7 +375123,7 @@
diff -Nrua koffice-1.4.2.orig/lib/kformula/pics/Makefile.in koffice-1.4.2/lib/kformula/pics/Makefile.in
--- koffice-1.4.2.orig/lib/kformula/pics/Makefile.in 2005-10-05 12:53:04.000000000 +0200
-+++ koffice-1.4.2/lib/kformula/pics/Makefile.in 2005-11-13 10:33:51.000000000 +0100
++++ koffice-1.4.2/lib/kformula/pics/Makefile.in 2005-11-14 09:13:54.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -375939,7 +375945,7 @@
diff -Nrua koffice-1.4.2.orig/lib/kofficecore/Makefile.in koffice-1.4.2/lib/kofficecore/Makefile.in
--- koffice-1.4.2.orig/lib/kofficecore/Makefile.in 2005-10-05 12:53:04.000000000 +0200
-+++ koffice-1.4.2/lib/kofficecore/Makefile.in 2005-11-13 10:33:51.000000000 +0100
++++ koffice-1.4.2/lib/kofficecore/Makefile.in 2005-11-14 09:13:54.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -377362,7 +377368,7 @@
diff -Nrua koffice-1.4.2.orig/lib/kofficecore/tests/Makefile.in koffice-1.4.2/lib/kofficecore/tests/Makefile.in
--- koffice-1.4.2.orig/lib/kofficecore/tests/Makefile.in 2005-10-05 12:53:04.000000000 +0200
-+++ koffice-1.4.2/lib/kofficecore/tests/Makefile.in 2005-11-13 10:33:51.000000000 +0100
++++ koffice-1.4.2/lib/kofficecore/tests/Makefile.in 2005-11-14 09:13:54.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -378395,7 +378401,7 @@
diff -Nrua koffice-1.4.2.orig/lib/kofficeui/Makefile.in koffice-1.4.2/lib/kofficeui/Makefile.in
--- koffice-1.4.2.orig/lib/kofficeui/Makefile.in 2005-10-05 12:53:04.000000000 +0200
-+++ koffice-1.4.2/lib/kofficeui/Makefile.in 2005-11-13 10:33:51.000000000 +0100
++++ koffice-1.4.2/lib/kofficeui/Makefile.in 2005-11-14 09:13:54.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -379644,7 +379650,7 @@
diff -Nrua koffice-1.4.2.orig/lib/kofficeui/pics/Makefile.in koffice-1.4.2/lib/kofficeui/pics/Makefile.in
--- koffice-1.4.2.orig/lib/kofficeui/pics/Makefile.in 2005-10-05 12:53:04.000000000 +0200
-+++ koffice-1.4.2/lib/kofficeui/pics/Makefile.in 2005-11-13 10:33:51.000000000 +0100
++++ koffice-1.4.2/lib/kofficeui/pics/Makefile.in 2005-11-14 09:13:54.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -380342,7 +380348,7 @@
diff -Nrua koffice-1.4.2.orig/lib/kofficeui/tests/Makefile.in koffice-1.4.2/lib/kofficeui/tests/Makefile.in
--- koffice-1.4.2.orig/lib/kofficeui/tests/Makefile.in 2005-10-05 12:53:04.000000000 +0200
-+++ koffice-1.4.2/lib/kofficeui/tests/Makefile.in 2005-11-13 10:33:51.000000000 +0100
++++ koffice-1.4.2/lib/kofficeui/tests/Makefile.in 2005-11-14 09:13:54.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -381286,7 +381292,7 @@
diff -Nrua koffice-1.4.2.orig/lib/kopainter/Makefile.in koffice-1.4.2/lib/kopainter/Makefile.in
--- koffice-1.4.2.orig/lib/kopainter/Makefile.in 2005-10-05 12:53:04.000000000 +0200
-+++ koffice-1.4.2/lib/kopainter/Makefile.in 2005-11-13 10:33:51.000000000 +0100
++++ koffice-1.4.2/lib/kopainter/Makefile.in 2005-11-14 09:13:54.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -382210,7 +382216,7 @@
diff -Nrua koffice-1.4.2.orig/lib/koscript/Makefile.in koffice-1.4.2/lib/koscript/Makefile.in
--- koffice-1.4.2.orig/lib/koscript/Makefile.in 2005-10-05 12:53:04.000000000 +0200
-+++ koffice-1.4.2/lib/koscript/Makefile.in 2005-11-13 10:33:51.000000000 +0100
++++ koffice-1.4.2/lib/koscript/Makefile.in 2005-11-14 09:13:54.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -383231,7 +383237,7 @@
diff -Nrua koffice-1.4.2.orig/lib/kotext/kohyphen/hyphdicts/Makefile.in koffice-1.4.2/lib/kotext/kohyphen/hyphdicts/Makefile.in
--- koffice-1.4.2.orig/lib/kotext/kohyphen/hyphdicts/Makefile.in 2005-10-05 12:53:05.000000000 +0200
-+++ koffice-1.4.2/lib/kotext/kohyphen/hyphdicts/Makefile.in 2005-11-13 10:33:52.000000000 +0100
++++ koffice-1.4.2/lib/kotext/kohyphen/hyphdicts/Makefile.in 2005-11-14 09:13:55.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -383927,7 +383933,7 @@
diff -Nrua koffice-1.4.2.orig/lib/kotext/kohyphen/Makefile.in koffice-1.4.2/lib/kotext/kohyphen/Makefile.in
--- koffice-1.4.2.orig/lib/kotext/kohyphen/Makefile.in 2005-10-05 12:53:05.000000000 +0200
-+++ koffice-1.4.2/lib/kotext/kohyphen/Makefile.in 2005-11-13 10:33:52.000000000 +0100
++++ koffice-1.4.2/lib/kotext/kohyphen/Makefile.in 2005-11-14 09:13:55.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -384987,7 +384993,7 @@
diff -Nrua koffice-1.4.2.orig/lib/kotext/Makefile.in koffice-1.4.2/lib/kotext/Makefile.in
--- koffice-1.4.2.orig/lib/kotext/Makefile.in 2005-10-05 12:53:05.000000000 +0200
-+++ koffice-1.4.2/lib/kotext/Makefile.in 2005-11-13 10:33:52.000000000 +0100
++++ koffice-1.4.2/lib/kotext/Makefile.in 2005-11-14 09:13:55.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -386192,7 +386198,7 @@
diff -Nrua koffice-1.4.2.orig/lib/kotext/tests/Makefile.in koffice-1.4.2/lib/kotext/tests/Makefile.in
--- koffice-1.4.2.orig/lib/kotext/tests/Makefile.in 2005-10-05 12:53:05.000000000 +0200
-+++ koffice-1.4.2/lib/kotext/tests/Makefile.in 2005-11-13 10:33:52.000000000 +0100
++++ koffice-1.4.2/lib/kotext/tests/Makefile.in 2005-11-14 09:13:55.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -387076,7 +387082,7 @@
diff -Nrua koffice-1.4.2.orig/lib/kwmf/Makefile.in koffice-1.4.2/lib/kwmf/Makefile.in
--- koffice-1.4.2.orig/lib/kwmf/Makefile.in 2005-10-05 12:53:05.000000000 +0200
-+++ koffice-1.4.2/lib/kwmf/Makefile.in 2005-11-13 10:33:52.000000000 +0100
++++ koffice-1.4.2/lib/kwmf/Makefile.in 2005-11-14 09:13:55.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -388021,7 +388027,7 @@
diff -Nrua koffice-1.4.2.orig/lib/Makefile.in koffice-1.4.2/lib/Makefile.in
--- koffice-1.4.2.orig/lib/Makefile.in 2005-10-05 12:53:03.000000000 +0200
-+++ koffice-1.4.2/lib/Makefile.in 2005-11-13 10:33:51.000000000 +0100
++++ koffice-1.4.2/lib/Makefile.in 2005-11-14 09:13:54.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -388851,7 +388857,7 @@
diff -Nrua koffice-1.4.2.orig/lib/store/Makefile.in koffice-1.4.2/lib/store/Makefile.in
--- koffice-1.4.2.orig/lib/store/Makefile.in 2005-10-05 12:53:05.000000000 +0200
-+++ koffice-1.4.2/lib/store/Makefile.in 2005-11-13 10:33:52.000000000 +0100
++++ koffice-1.4.2/lib/store/Makefile.in 2005-11-14 09:13:55.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -389935,7 +389941,7 @@
diff -Nrua koffice-1.4.2.orig/lib/store/tests/Makefile.in koffice-1.4.2/lib/store/tests/Makefile.in
--- koffice-1.4.2.orig/lib/store/tests/Makefile.in 2005-10-05 12:53:05.000000000 +0200
-+++ koffice-1.4.2/lib/store/tests/Makefile.in 2005-11-13 10:33:52.000000000 +0100
++++ koffice-1.4.2/lib/store/tests/Makefile.in 2005-11-14 09:13:55.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -390893,7 +390899,7 @@
diff -Nrua koffice-1.4.2.orig/Makefile.in koffice-1.4.2/Makefile.in
--- koffice-1.4.2.orig/Makefile.in 2005-10-05 12:52:34.000000000 +0200
-+++ koffice-1.4.2/Makefile.in 2005-11-13 10:33:41.000000000 +0100
++++ koffice-1.4.2/Makefile.in 2005-11-14 09:13:44.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -391913,7 +391919,7 @@
diff -Nrua koffice-1.4.2.orig/mimetypes/kde32/Makefile.in koffice-1.4.2/mimetypes/kde32/Makefile.in
--- koffice-1.4.2.orig/mimetypes/kde32/Makefile.in 2005-10-05 12:53:05.000000000 +0200
-+++ koffice-1.4.2/mimetypes/kde32/Makefile.in 2005-11-13 10:33:52.000000000 +0100
++++ koffice-1.4.2/mimetypes/kde32/Makefile.in 2005-11-14 09:13:55.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -392612,7 +392618,7 @@
diff -Nrua koffice-1.4.2.orig/mimetypes/kde33/Makefile.in koffice-1.4.2/mimetypes/kde33/Makefile.in
--- koffice-1.4.2.orig/mimetypes/kde33/Makefile.in 2005-10-05 12:53:05.000000000 +0200
-+++ koffice-1.4.2/mimetypes/kde33/Makefile.in 2005-11-13 10:33:52.000000000 +0100
++++ koffice-1.4.2/mimetypes/kde33/Makefile.in 2005-11-14 09:13:55.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -393308,7 +393314,7 @@
diff -Nrua koffice-1.4.2.orig/mimetypes/Makefile.in koffice-1.4.2/mimetypes/Makefile.in
--- koffice-1.4.2.orig/mimetypes/Makefile.in 2005-10-05 12:53:05.000000000 +0200
-+++ koffice-1.4.2/mimetypes/Makefile.in 2005-11-13 10:33:52.000000000 +0100
++++ koffice-1.4.2/mimetypes/Makefile.in 2005-11-14 09:13:55.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -394130,7 +394136,7 @@
diff -Nrua koffice-1.4.2.orig/pics/crystalsvg/Makefile.in koffice-1.4.2/pics/crystalsvg/Makefile.in
--- koffice-1.4.2.orig/pics/crystalsvg/Makefile.in 2005-10-05 12:53:05.000000000 +0200
-+++ koffice-1.4.2/pics/crystalsvg/Makefile.in 2005-11-13 10:33:52.000000000 +0100
++++ koffice-1.4.2/pics/crystalsvg/Makefile.in 2005-11-14 09:13:55.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -394785,7 +394791,7 @@
diff -Nrua koffice-1.4.2.orig/pics/Makefile.in koffice-1.4.2/pics/Makefile.in
--- koffice-1.4.2.orig/pics/Makefile.in 2005-10-05 12:53:05.000000000 +0200
-+++ koffice-1.4.2/pics/Makefile.in 2005-11-13 10:33:52.000000000 +0100
++++ koffice-1.4.2/pics/Makefile.in 2005-11-14 09:13:55.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -395608,7 +395614,7 @@
diff -Nrua koffice-1.4.2.orig/plugins/Makefile.in koffice-1.4.2/plugins/Makefile.in
--- koffice-1.4.2.orig/plugins/Makefile.in 2005-10-05 12:53:05.000000000 +0200
-+++ koffice-1.4.2/plugins/Makefile.in 2005-11-13 10:33:52.000000000 +0100
++++ koffice-1.4.2/plugins/Makefile.in 2005-11-14 09:13:55.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -396430,7 +396436,7 @@
diff -Nrua koffice-1.4.2.orig/plugins/scan/Makefile.in koffice-1.4.2/plugins/scan/Makefile.in
--- koffice-1.4.2.orig/plugins/scan/Makefile.in 2005-10-05 12:53:05.000000000 +0200
-+++ koffice-1.4.2/plugins/scan/Makefile.in 2005-11-13 10:33:52.000000000 +0100
++++ koffice-1.4.2/plugins/scan/Makefile.in 2005-11-14 09:13:55.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -397441,7 +397447,7 @@
diff -Nrua koffice-1.4.2.orig/servicetypes/Makefile.in koffice-1.4.2/servicetypes/Makefile.in
--- koffice-1.4.2.orig/servicetypes/Makefile.in 2005-10-05 12:53:05.000000000 +0200
-+++ koffice-1.4.2/servicetypes/Makefile.in 2005-11-13 10:33:52.000000000 +0100
++++ koffice-1.4.2/servicetypes/Makefile.in 2005-11-14 09:13:55.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -398138,7 +398144,7 @@
diff -Nrua koffice-1.4.2.orig/templates/Makefile.in koffice-1.4.2/templates/Makefile.in
--- koffice-1.4.2.orig/templates/Makefile.in 2005-10-05 12:53:05.000000000 +0200
-+++ koffice-1.4.2/templates/Makefile.in 2005-11-13 10:33:52.000000000 +0100
++++ koffice-1.4.2/templates/Makefile.in 2005-11-14 09:13:55.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -398865,7 +398871,7 @@
diff -Nrua koffice-1.4.2.orig/tools/converter/Makefile.in koffice-1.4.2/tools/converter/Makefile.in
--- koffice-1.4.2.orig/tools/converter/Makefile.in 2005-10-05 12:53:05.000000000 +0200
-+++ koffice-1.4.2/tools/converter/Makefile.in 2005-11-13 10:33:52.000000000 +0100
++++ koffice-1.4.2/tools/converter/Makefile.in 2005-11-14 09:13:55.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -399736,7 +399742,7 @@
diff -Nrua koffice-1.4.2.orig/tools/kfile-plugins/koffice/Makefile.in koffice-1.4.2/tools/kfile-plugins/koffice/Makefile.in
--- koffice-1.4.2.orig/tools/kfile-plugins/koffice/Makefile.in 2005-10-05 12:53:05.000000000 +0200
-+++ koffice-1.4.2/tools/kfile-plugins/koffice/Makefile.in 2005-11-13 10:33:52.000000000 +0100
++++ koffice-1.4.2/tools/kfile-plugins/koffice/Makefile.in 2005-11-14 09:13:55.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -400666,7 +400672,7 @@
diff -Nrua koffice-1.4.2.orig/tools/kfile-plugins/Makefile.in koffice-1.4.2/tools/kfile-plugins/Makefile.in
--- koffice-1.4.2.orig/tools/kfile-plugins/Makefile.in 2005-10-05 12:53:05.000000000 +0200
-+++ koffice-1.4.2/tools/kfile-plugins/Makefile.in 2005-11-13 10:33:52.000000000 +0100
++++ koffice-1.4.2/tools/kfile-plugins/Makefile.in 2005-11-14 09:13:55.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -401491,7 +401497,7 @@
diff -Nrua koffice-1.4.2.orig/tools/kfile-plugins/ooo/Makefile.in koffice-1.4.2/tools/kfile-plugins/ooo/Makefile.in
--- koffice-1.4.2.orig/tools/kfile-plugins/ooo/Makefile.in 2005-10-05 12:53:05.000000000 +0200
-+++ koffice-1.4.2/tools/kfile-plugins/ooo/Makefile.in 2005-11-13 10:33:52.000000000 +0100
++++ koffice-1.4.2/tools/kfile-plugins/ooo/Makefile.in 2005-11-14 09:13:55.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -402421,7 +402427,7 @@
diff -Nrua koffice-1.4.2.orig/tools/kthesaurus/Makefile.in koffice-1.4.2/tools/kthesaurus/Makefile.in
--- koffice-1.4.2.orig/tools/kthesaurus/Makefile.in 2005-10-05 12:53:05.000000000 +0200
-+++ koffice-1.4.2/tools/kthesaurus/Makefile.in 2005-11-13 10:33:52.000000000 +0100
++++ koffice-1.4.2/tools/kthesaurus/Makefile.in 2005-11-14 09:13:55.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -403456,7 +403462,7 @@
diff -Nrua koffice-1.4.2.orig/tools/Makefile.in koffice-1.4.2/tools/Makefile.in
--- koffice-1.4.2.orig/tools/Makefile.in 2005-10-05 12:53:05.000000000 +0200
-+++ koffice-1.4.2/tools/Makefile.in 2005-11-13 10:33:52.000000000 +0100
++++ koffice-1.4.2/tools/Makefile.in 2005-11-14 09:13:55.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -404279,7 +404285,7 @@
diff -Nrua koffice-1.4.2.orig/tools/quickprint/Makefile.in koffice-1.4.2/tools/quickprint/Makefile.in
--- koffice-1.4.2.orig/tools/quickprint/Makefile.in 2005-10-05 12:53:05.000000000 +0200
-+++ koffice-1.4.2/tools/quickprint/Makefile.in 2005-11-13 10:33:52.000000000 +0100
++++ koffice-1.4.2/tools/quickprint/Makefile.in 2005-11-14 09:13:55.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -404974,7 +404980,7 @@
diff -Nrua koffice-1.4.2.orig/tools/spell/Makefile.in koffice-1.4.2/tools/spell/Makefile.in
--- koffice-1.4.2.orig/tools/spell/Makefile.in 2005-10-05 12:53:05.000000000 +0200
-+++ koffice-1.4.2/tools/spell/Makefile.in 2005-11-13 10:33:52.000000000 +0100
++++ koffice-1.4.2/tools/spell/Makefile.in 2005-11-14 09:13:55.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -405623,7 +405629,7 @@
diff -Nrua koffice-1.4.2.orig/tools/thesaurus/Makefile.in koffice-1.4.2/tools/thesaurus/Makefile.in
--- koffice-1.4.2.orig/tools/thesaurus/Makefile.in 2005-10-05 12:53:05.000000000 +0200
-+++ koffice-1.4.2/tools/thesaurus/Makefile.in 2005-11-13 10:33:52.000000000 +0100
++++ koffice-1.4.2/tools/thesaurus/Makefile.in 2005-11-14 09:13:55.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -406590,7 +406596,7 @@
diff -Nrua koffice-1.4.2.orig/tools/thumbnail/Makefile.in koffice-1.4.2/tools/thumbnail/Makefile.in
--- koffice-1.4.2.orig/tools/thumbnail/Makefile.in 2005-10-05 12:53:05.000000000 +0200
-+++ koffice-1.4.2/tools/thumbnail/Makefile.in 2005-11-13 10:33:52.000000000 +0100
++++ koffice-1.4.2/tools/thumbnail/Makefile.in 2005-11-14 09:13:55.000000000 +0100
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
More information about the pkg-kde-commits
mailing list