[Pkg-kde-commits] rev 1599 -
branches/kde-3.4.0/packages/kdegraphics/debian/patches
Isaac Clerencia
isaac at costa.debian.org
Mon Aug 29 10:09:26 UTC 2005
Author: isaac
Date: 2005-08-29 10:09:24 +0000 (Mon, 29 Aug 2005)
New Revision: 1599
Modified:
branches/kde-3.4.0/packages/kdegraphics/debian/patches/98_buildprep.diff
Log:
Update kdegraphics buildprep
Modified: branches/kde-3.4.0/packages/kdegraphics/debian/patches/98_buildprep.diff
===================================================================
--- branches/kde-3.4.0/packages/kdegraphics/debian/patches/98_buildprep.diff 2005-08-29 09:57:45 UTC (rev 1598)
+++ branches/kde-3.4.0/packages/kdegraphics/debian/patches/98_buildprep.diff 2005-08-29 10:09:24 UTC (rev 1599)
@@ -1,6 +1,67 @@
-diff -Nru kdegraphics-3.4.2.orig/acinclude.m4 kdegraphics-3.4.2/acinclude.m4
---- kdegraphics-3.4.2.orig/acinclude.m4 2005-07-20 20:07:23.000000000 +0000
-+++ kdegraphics-3.4.2/acinclude.m4 2005-07-31 18:50:10.079952504 +0000
+#DPATCHLEVEL=0
+# vi: ft=diff
+--- Makefile.in
++++ Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -230,6 +230,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -430,7 +433,7 @@
+ .SUFFIXES:
+ am--refresh:
+ @:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -472,12 +475,12 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ $(SHELL) ./config.status --recheck
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ #>- cd $(srcdir) && $(AUTOCONF)
+ #>+ 2
+ cd $(srcdir) && rm -f configure
+ cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+ config.h: stamp-h1
+@@ -489,7 +492,7 @@
+ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+ @rm -f stamp-h1
+ cd $(top_builddir) && $(SHELL) ./config.status config.h
+-$(srcdir)/config.h.in: $(am__configure_deps)
++$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_srcdir) && $(AUTOHEADER)
+ rm -f stamp-h1
+ touch $@
+@@ -912,7 +915,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=subdirs Makefile.in configure.files config.h.in configure.in aclocal.m4 kdegraphics.lsm configure.in.in acinclude.m4 Makefile.am Makefile.am.in
++KDE_DIST=stamp-h.in subdirs Makefile.in configure.files config.h.in configure.in Makefile.cvs aclocal.m4 kdegraphics.lsm configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in
+
+ #>+ 2
+ docs-am:
+--- acinclude.m4
++++ acinclude.m4
@@ -1688,15 +1688,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
@@ -1516,9 +1577,23 @@
AC_MSG_RESULT([$SED])
])
-diff -Nru kdegraphics-3.4.2.orig/aclocal.m4 kdegraphics-3.4.2/aclocal.m4
---- kdegraphics-3.4.2.orig/aclocal.m4 2005-07-20 20:07:37.000000000 +0000
-+++ kdegraphics-3.4.2/aclocal.m4 2005-07-31 18:50:34.374259208 +0000
+--- aclocal.m4
++++ aclocal.m4
+@@ -1,4 +1,4 @@
+-# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
++# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ # 2005 Free Software Foundation, Inc.
+@@ -28,7 +28,7 @@
+ # Call AM_AUTOMAKE_VERSION so it can be traced.
+ # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+- [AM_AUTOMAKE_VERSION([1.9.5])])
++ [AM_AUTOMAKE_VERSION([1.9.6])])
+
+ # AM_AUX_DIR_EXPAND -*- Autoconf -*-
+
@@ -501,6 +501,35 @@
rmdir .tst 2>/dev/null
AC_SUBST([am__leading_dot])])
@@ -1555,9 +1630,8 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-diff -Nru kdegraphics-3.4.2.orig/configure kdegraphics-3.4.2/configure
---- kdegraphics-3.4.2.orig/configure 2005-07-20 20:08:49.000000000 +0000
-+++ kdegraphics-3.4.2/configure 2005-07-31 18:53:44.961285576 +0000
+--- configure
++++ configure
@@ -464,7 +464,7 @@
# include <unistd.h>
#endif"
@@ -7183,9 +7257,8 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
-diff -Nru kdegraphics-3.4.2.orig/configure.in kdegraphics-3.4.2/configure.in
---- kdegraphics-3.4.2.orig/configure.in 2005-07-20 20:07:25.000000000 +0000
-+++ kdegraphics-3.4.2/configure.in 2005-07-31 18:50:11.672710368 +0000
+--- configure.in
++++ configure.in
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
AM_INIT_AUTOMAKE(kdegraphics, "3.4.2") dnl searches for some needed programs
@@ -7195,9 +7268,60 @@
KDE_SET_PREFIX
dnl generate the config header
-diff -Nru kdegraphics-3.4.2.orig/doc/kamera/Makefile.in kdegraphics-3.4.2/doc/kamera/Makefile.in
---- kdegraphics-3.4.2.orig/doc/kamera/Makefile.in 2005-07-20 20:08:42.000000000 +0000
-+++ kdegraphics-3.4.2/doc/kamera/Makefile.in 2005-07-31 18:53:31.567321768 +0000
+--- doc/Makefile.in
++++ doc/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -213,6 +213,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -399,13 +402,13 @@
+ KDE_DOCS = AUTO
+ #>- SUBDIRS = $(AUTODIRS)
+ #>+ 1
+-SUBDIRS =. kcoloredit kamera kooka kpdf kruler kview kolourpaint kpovmodeler kuickshow kiconedit kghostview ksnapshot kdvi kgamma
++SUBDIRS =. kdvi kpdf kooka kview kcoloredit ksnapshot kamera kgamma kruler kuickshow kolourpaint kiconedit kghostview kpovmodeler
+ #>- all: all-recursive
+ #>+ 1
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -443,9 +446,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
+--- doc/kamera/Makefile.in
++++ doc/kamera/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -197,6 +197,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7229,9 +7353,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdegraphics-3.4.2.orig/doc/kcoloredit/Makefile.in kdegraphics-3.4.2/doc/kcoloredit/Makefile.in
---- kdegraphics-3.4.2.orig/doc/kcoloredit/Makefile.in 2005-07-20 20:08:42.000000000 +0000
-+++ kdegraphics-3.4.2/doc/kcoloredit/Makefile.in 2005-07-31 18:53:31.602316448 +0000
+--- doc/kcoloredit/Makefile.in
++++ doc/kcoloredit/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -197,6 +197,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7263,9 +7392,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdegraphics-3.4.2.orig/doc/kdvi/Makefile.in kdegraphics-3.4.2/doc/kdvi/Makefile.in
---- kdegraphics-3.4.2.orig/doc/kdvi/Makefile.in 2005-07-20 20:08:42.000000000 +0000
-+++ kdegraphics-3.4.2/doc/kdvi/Makefile.in 2005-07-31 18:53:31.620313712 +0000
+--- doc/kdvi/Makefile.in
++++ doc/kdvi/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -197,6 +197,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7334,9 +7468,14 @@
cp $(srcdir)/$$file $(distdir); \
done
-diff -Nru kdegraphics-3.4.2.orig/doc/kgamma/Makefile.in kdegraphics-3.4.2/doc/kgamma/Makefile.in
---- kdegraphics-3.4.2.orig/doc/kgamma/Makefile.in 2005-07-20 20:08:42.000000000 +0000
-+++ kdegraphics-3.4.2/doc/kgamma/Makefile.in 2005-07-31 18:53:31.637311128 +0000
+--- doc/kgamma/Makefile.in
++++ doc/kgamma/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -197,6 +197,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7368,9 +7507,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdegraphics-3.4.2.orig/doc/kghostview/Makefile.in kdegraphics-3.4.2/doc/kghostview/Makefile.in
---- kdegraphics-3.4.2.orig/doc/kghostview/Makefile.in 2005-07-20 20:08:42.000000000 +0000
-+++ kdegraphics-3.4.2/doc/kghostview/Makefile.in 2005-07-31 18:53:31.652308848 +0000
+--- doc/kghostview/Makefile.in
++++ doc/kghostview/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -197,6 +197,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7402,9 +7546,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdegraphics-3.4.2.orig/doc/kiconedit/Makefile.in kdegraphics-3.4.2/doc/kiconedit/Makefile.in
---- kdegraphics-3.4.2.orig/doc/kiconedit/Makefile.in 2005-07-20 20:08:42.000000000 +0000
-+++ kdegraphics-3.4.2/doc/kiconedit/Makefile.in 2005-07-31 18:53:31.669306264 +0000
+--- doc/kiconedit/Makefile.in
++++ doc/kiconedit/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -197,6 +197,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7436,9 +7585,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdegraphics-3.4.2.orig/doc/kolourpaint/Makefile.in kdegraphics-3.4.2/doc/kolourpaint/Makefile.in
---- kdegraphics-3.4.2.orig/doc/kolourpaint/Makefile.in 2005-07-20 20:08:42.000000000 +0000
-+++ kdegraphics-3.4.2/doc/kolourpaint/Makefile.in 2005-07-31 18:53:31.692302768 +0000
+--- doc/kolourpaint/Makefile.in
++++ doc/kolourpaint/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -197,6 +197,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7507,9 +7661,14 @@
cp $(srcdir)/$$file $(distdir); \
done
-diff -Nru kdegraphics-3.4.2.orig/doc/kooka/Makefile.in kdegraphics-3.4.2/doc/kooka/Makefile.in
---- kdegraphics-3.4.2.orig/doc/kooka/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/doc/kooka/Makefile.in 2005-07-31 18:53:31.709300184 +0000
+--- doc/kooka/Makefile.in
++++ doc/kooka/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -197,6 +197,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7578,9 +7737,14 @@
cp $(srcdir)/$$file $(distdir); \
done
-diff -Nru kdegraphics-3.4.2.orig/doc/kpdf/Makefile.in kdegraphics-3.4.2/doc/kpdf/Makefile.in
---- kdegraphics-3.4.2.orig/doc/kpdf/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/doc/kpdf/Makefile.in 2005-07-31 18:53:31.735296232 +0000
+--- doc/kpdf/Makefile.in
++++ doc/kpdf/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -197,6 +197,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7612,9 +7776,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdegraphics-3.4.2.orig/doc/kpovmodeler/Makefile.in kdegraphics-3.4.2/doc/kpovmodeler/Makefile.in
---- kdegraphics-3.4.2.orig/doc/kpovmodeler/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/doc/kpovmodeler/Makefile.in 2005-07-31 18:53:31.757292888 +0000
+--- doc/kpovmodeler/Makefile.in
++++ doc/kpovmodeler/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -197,6 +197,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7683,9 +7852,14 @@
cp $(srcdir)/$$file $(distdir); \
done
-diff -Nru kdegraphics-3.4.2.orig/doc/kruler/Makefile.in kdegraphics-3.4.2/doc/kruler/Makefile.in
---- kdegraphics-3.4.2.orig/doc/kruler/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/doc/kruler/Makefile.in 2005-07-31 18:53:31.773290456 +0000
+--- doc/kruler/Makefile.in
++++ doc/kruler/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -197,6 +197,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7717,9 +7891,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdegraphics-3.4.2.orig/doc/ksnapshot/Makefile.in kdegraphics-3.4.2/doc/ksnapshot/Makefile.in
---- kdegraphics-3.4.2.orig/doc/ksnapshot/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/doc/ksnapshot/Makefile.in 2005-07-31 18:53:31.791287720 +0000
+--- doc/ksnapshot/Makefile.in
++++ doc/ksnapshot/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -197,6 +197,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7784,9 +7963,14 @@
cp $(srcdir)/$$file $(distdir); \
done
-diff -Nru kdegraphics-3.4.2.orig/doc/kuickshow/Makefile.in kdegraphics-3.4.2/doc/kuickshow/Makefile.in
---- kdegraphics-3.4.2.orig/doc/kuickshow/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/doc/kuickshow/Makefile.in 2005-07-31 18:53:31.806285440 +0000
+--- doc/kuickshow/Makefile.in
++++ doc/kuickshow/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -197,6 +197,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7818,9 +8002,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdegraphics-3.4.2.orig/doc/kview/Makefile.in kdegraphics-3.4.2/doc/kview/Makefile.in
---- kdegraphics-3.4.2.orig/doc/kview/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/doc/kview/Makefile.in 2005-07-31 18:53:31.824282704 +0000
+--- doc/kview/Makefile.in
++++ doc/kview/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -197,6 +197,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7885,10 +8074,15 @@
cp $(srcdir)/$$file $(distdir); \
done
-diff -Nru kdegraphics-3.4.2.orig/doc/Makefile.in kdegraphics-3.4.2/doc/Makefile.in
---- kdegraphics-3.4.2.orig/doc/Makefile.in 2005-07-20 20:08:42.000000000 +0000
-+++ kdegraphics-3.4.2/doc/Makefile.in 2005-07-31 18:53:31.552324048 +0000
-@@ -213,6 +213,9 @@
+--- kamera/Makefile.in
++++ kamera/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -214,6 +214,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7898,14 +8092,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -399,13 +402,13 @@
- KDE_DOCS = AUTO
- #>- SUBDIRS = $(AUTODIRS)
- #>+ 1
--SUBDIRS =. kcoloredit kamera kooka kpdf kruler kview kolourpaint kpovmodeler kuickshow kiconedit kghostview ksnapshot kdvi kgamma
-+SUBDIRS =. kdvi kpdf kooka kview kcoloredit ksnapshot kamera kgamma kruler kuickshow kolourpaint kiconedit kghostview kpovmodeler
- #>- all: all-recursive
- #>+ 1
+@@ -402,7 +405,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -7914,7 +8101,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -440,9 +443,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7926,10 +8113,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdegraphics-3.4.2.orig/kamera/kcontrol/Makefile.in kdegraphics-3.4.2/kamera/kcontrol/Makefile.in
---- kdegraphics-3.4.2.orig/kamera/kcontrol/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/kamera/kcontrol/Makefile.in 2005-07-31 18:53:31.915268872 +0000
-@@ -251,6 +251,9 @@
+--- kamera/kcontrol/Makefile.in
++++ kamera/kcontrol/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kcm_kamera_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -251,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7939,7 +8140,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -447,7 +450,7 @@
+@@ -447,7 +448,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -7948,7 +8149,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -485,9 +488,9 @@
+@@ -485,9 +486,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7960,10 +8161,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/kamera/kioslave/Makefile.in kdegraphics-3.4.2/kamera/kioslave/Makefile.in
---- kdegraphics-3.4.2.orig/kamera/kioslave/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/kamera/kioslave/Makefile.in 2005-07-31 18:53:31.940265072 +0000
-@@ -248,6 +248,9 @@
+--- kamera/kioslave/Makefile.in
++++ kamera/kioslave/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -20,8 +20,6 @@
+
+
+
+-SOURCES = $(kio_kamera_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -248,6 +246,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7973,7 +8188,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -446,7 +449,7 @@
+@@ -446,7 +447,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -7982,7 +8197,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -484,9 +487,9 @@
+@@ -484,9 +485,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7994,43 +8209,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/kamera/Makefile.in kdegraphics-3.4.2/kamera/Makefile.in
---- kdegraphics-3.4.2.orig/kamera/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/kamera/Makefile.in 2005-07-31 18:53:31.872275408 +0000
-@@ -214,6 +214,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -402,7 +405,7 @@
- all: docs-am all-recursive
+--- kamera/pics/Makefile.in
++++ kamera/pics/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
- .SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -440,9 +443,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
-diff -Nru kdegraphics-3.4.2.orig/kamera/pics/Makefile.in kdegraphics-3.4.2/kamera/pics/Makefile.in
---- kdegraphics-3.4.2.orig/kamera/pics/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/kamera/pics/Makefile.in 2005-07-31 18:53:31.959262184 +0000
@@ -197,6 +197,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8107,10 +8293,24 @@
#>+ 15
force-reedit:
-diff -Nru kdegraphics-3.4.2.orig/kcoloredit/Makefile.in kdegraphics-3.4.2/kcoloredit/Makefile.in
---- kdegraphics-3.4.2.orig/kcoloredit/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/kcoloredit/Makefile.in 2005-07-31 18:53:32.029251544 +0000
-@@ -271,6 +271,9 @@
+--- kcoloredit/Makefile.in
++++ kcoloredit/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kcolorchooser_SOURCES) $(kcoloredit_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -271,6 +269,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8120,7 +8320,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -483,7 +486,7 @@
+@@ -483,7 +484,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8129,7 +8329,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -521,9 +524,9 @@
+@@ -521,9 +522,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8141,7 +8341,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -836,18 +839,18 @@
+@@ -836,18 +837,18 @@
.NOEXPORT:
#>+ 3
@@ -8166,7 +8366,7 @@
#>+ 3
kcoloreditdoc.moc: $(srcdir)/kcoloreditdoc.h
-@@ -921,34 +924,34 @@
+@@ -921,34 +922,34 @@
#>+ 3
clean-metasources:
@@ -8212,7 +8412,7 @@
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcoloredit.png
#>+ 15
-@@ -990,7 +993,7 @@
+@@ -990,7 +991,7 @@
#>+ 11
@@ -8221,10 +8421,24 @@
@echo 'creating kcoloredit.all_cpp.cpp ...'; \
rm -f kcoloredit.all_cpp.files kcoloredit.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kcoloredit.all_cpp.final; \
-diff -Nru kdegraphics-3.4.2.orig/kdvi/Makefile.in kdegraphics-3.4.2/kdvi/Makefile.in
---- kdegraphics-3.4.2.orig/kdvi/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/kdvi/Makefile.in 2005-07-31 18:53:32.135235432 +0000
-@@ -308,6 +308,9 @@
+--- kdvi/Makefile.in
++++ kdvi/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+
+
+
+-SOURCES = $(kdvipart_la_SOURCES) $(kdvi_SOURCES) $(squeeze_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -308,6 +306,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8234,7 +8448,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -554,7 +557,7 @@
+@@ -554,7 +555,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -8243,7 +8457,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -592,9 +595,9 @@
+@@ -592,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8255,7 +8469,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1163,13 +1166,6 @@
+@@ -1163,13 +1164,6 @@
#>+ 3
@@ -8269,7 +8483,7 @@
psgs.moc: $(srcdir)/psgs.h
$(MOC) $(srcdir)/psgs.h -o psgs.moc
-@@ -1177,11 +1173,11 @@
+@@ -1177,11 +1171,11 @@
mocs: psgs.moc
#>+ 3
@@ -8284,7 +8498,7 @@
#>+ 3
fontprogress.moc: $(srcdir)/fontprogress.h
-@@ -1191,6 +1187,13 @@
+@@ -1191,6 +1185,13 @@
mocs: fontprogress.moc
#>+ 3
@@ -8298,7 +8512,7 @@
dviwin.moc: $(srcdir)/dviwin.h
$(MOC) $(srcdir)/dviwin.h -o dviwin.moc
-@@ -1205,18 +1208,18 @@
+@@ -1205,18 +1206,18 @@
mocs: fontpool.moc
#>+ 3
@@ -8323,7 +8537,7 @@
#>+ 3
optionDialogFontsWidget.moc: $(srcdir)/optionDialogFontsWidget.h
-@@ -1227,10 +1230,10 @@
+@@ -1227,10 +1228,10 @@
#>+ 3
clean-metasources:
@@ -8336,9 +8550,14 @@
#>+ 5
clean-ui:
-diff -Nru kdegraphics-3.4.2.orig/kdvi/pix/Makefile.in kdegraphics-3.4.2/kdvi/pix/Makefile.in
---- kdegraphics-3.4.2.orig/kdvi/pix/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/kdvi/pix/Makefile.in 2005-07-31 18:53:32.152232848 +0000
+--- kdvi/pix/Makefile.in
++++ kdvi/pix/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -197,6 +197,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8392,10 +8611,24 @@
#>+ 15
force-reedit:
-diff -Nru kdegraphics-3.4.2.orig/kfax/Makefile.in kdegraphics-3.4.2/kfax/Makefile.in
---- kdegraphics-3.4.2.orig/kfax/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/kfax/Makefile.in 2005-07-31 18:53:32.214223424 +0000
-@@ -256,6 +256,9 @@
+--- kfax/Makefile.in
++++ kfax/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kfax_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -256,6 +254,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8405,7 +8638,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -461,7 +464,7 @@
+@@ -461,7 +462,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8414,7 +8647,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -499,9 +502,9 @@
+@@ -499,9 +500,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8426,7 +8659,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -855,15 +858,15 @@
+@@ -855,15 +856,15 @@
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
$(INSTALL_DATA) $(srcdir)/cr32-app-kfax.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfax.png
@@ -8445,10 +8678,24 @@
#>+ 15
force-reedit:
-diff -Nru kdegraphics-3.4.2.orig/kfaxview/Makefile.in kdegraphics-3.4.2/kfaxview/Makefile.in
---- kdegraphics-3.4.2.orig/kfaxview/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/kfaxview/Makefile.in 2005-07-31 18:53:32.253217496 +0000
-@@ -254,6 +254,9 @@
+--- kfaxview/Makefile.in
++++ kfaxview/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(kfaxpart_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -254,6 +252,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8458,7 +8705,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -455,7 +458,7 @@
+@@ -455,7 +456,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -8467,7 +8714,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -493,9 +496,9 @@
+@@ -493,9 +494,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8479,10 +8726,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/kfile-plugins/bmp/Makefile.in kdegraphics-3.4.2/kfile-plugins/bmp/Makefile.in
---- kdegraphics-3.4.2.orig/kfile-plugins/bmp/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/kfile-plugins/bmp/Makefile.in 2005-07-31 18:53:32.319207464 +0000
-@@ -245,6 +245,9 @@
+--- kfile-plugins/Makefile.in
++++ kfile-plugins/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -214,6 +214,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8492,16 +8744,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -448,7 +451,7 @@
+@@ -406,7 +409,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -486,9 +489,9 @@
+@@ -444,9 +447,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8511,12 +8763,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/kfile-plugins/dds/Makefile.in kdegraphics-3.4.2/kfile-plugins/dds/Makefile.in
---- kdegraphics-3.4.2.orig/kfile-plugins/dds/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/kfile-plugins/dds/Makefile.in 2005-07-31 18:53:32.347203208 +0000
-@@ -245,6 +245,9 @@
+
+ mostlyclean-libtool:
+--- kfile-plugins/bmp/Makefile.in
++++ kfile-plugins/bmp/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kfile_bmp_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -245,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8526,7 +8792,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -448,7 +451,7 @@
+@@ -448,7 +449,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8535,7 +8801,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -486,9 +489,9 @@
+@@ -486,9 +487,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8547,10 +8813,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/kfile-plugins/dvi/Makefile.in kdegraphics-3.4.2/kfile-plugins/dvi/Makefile.in
---- kdegraphics-3.4.2.orig/kfile-plugins/dvi/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/kfile-plugins/dvi/Makefile.in 2005-07-31 18:53:32.371199560 +0000
-@@ -245,6 +245,9 @@
+--- kfile-plugins/dds/Makefile.in
++++ kfile-plugins/dds/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kfile_dds_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -245,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8560,7 +8840,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -448,7 +451,7 @@
+@@ -448,7 +449,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8569,7 +8849,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -486,9 +489,9 @@
+@@ -486,9 +487,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8581,10 +8861,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/kfile-plugins/exr/Makefile.in kdegraphics-3.4.2/kfile-plugins/exr/Makefile.in
---- kdegraphics-3.4.2.orig/kfile-plugins/exr/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/kfile-plugins/exr/Makefile.in 2005-07-31 18:53:32.402194848 +0000
-@@ -246,6 +246,9 @@
+--- kfile-plugins/dvi/Makefile.in
++++ kfile-plugins/dvi/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kfile_dvi_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -245,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8594,7 +8888,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -451,7 +454,7 @@
+@@ -448,7 +449,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8603,7 +8897,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -489,9 +492,9 @@
+@@ -486,9 +487,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8615,10 +8909,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/kfile-plugins/gif/Makefile.in kdegraphics-3.4.2/kfile-plugins/gif/Makefile.in
---- kdegraphics-3.4.2.orig/kfile-plugins/gif/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/kfile-plugins/gif/Makefile.in 2005-07-31 18:53:32.441188920 +0000
-@@ -245,6 +245,9 @@
+--- kfile-plugins/exr/Makefile.in
++++ kfile-plugins/exr/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kfile_exr_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -246,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8628,7 +8936,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -449,7 +452,7 @@
+@@ -451,7 +452,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8637,7 +8945,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -487,9 +490,9 @@
+@@ -489,9 +490,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8649,10 +8957,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/kfile-plugins/ico/Makefile.in kdegraphics-3.4.2/kfile-plugins/ico/Makefile.in
---- kdegraphics-3.4.2.orig/kfile-plugins/ico/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/kfile-plugins/ico/Makefile.in 2005-07-31 18:53:32.469184664 +0000
-@@ -245,6 +245,9 @@
+--- kfile-plugins/gif/Makefile.in
++++ kfile-plugins/gif/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kfile_gif_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -245,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8662,7 +8984,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -448,7 +451,7 @@
+@@ -449,7 +450,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8671,7 +8993,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -486,9 +489,9 @@
+@@ -487,9 +488,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8683,10 +9005,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/kfile-plugins/jpeg/Makefile.in kdegraphics-3.4.2/kfile-plugins/jpeg/Makefile.in
---- kdegraphics-3.4.2.orig/kfile-plugins/jpeg/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/kfile-plugins/jpeg/Makefile.in 2005-07-31 18:53:32.500179952 +0000
-@@ -248,6 +248,9 @@
+--- kfile-plugins/ico/Makefile.in
++++ kfile-plugins/ico/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kfile_ico_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -245,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8696,7 +9032,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -452,7 +455,7 @@
+@@ -448,7 +449,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8705,7 +9041,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -490,9 +493,9 @@
+@@ -486,9 +487,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8717,10 +9053,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/kfile-plugins/Makefile.in kdegraphics-3.4.2/kfile-plugins/Makefile.in
---- kdegraphics-3.4.2.orig/kfile-plugins/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/kfile-plugins/Makefile.in 2005-07-31 18:53:32.269215064 +0000
-@@ -214,6 +214,9 @@
+--- kfile-plugins/jpeg/Makefile.in
++++ kfile-plugins/jpeg/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kfile_jpeg_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -248,6 +246,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8730,16 +9080,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -406,7 +409,7 @@
- all: docs-am all-recursive
+@@ -452,7 +453,7 @@
.SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -444,9 +447,9 @@
+@@ -490,9 +491,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8749,12 +9099,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- kfile-plugins/pcx/Makefile.in
++++ kfile-plugins/pcx/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
- mostlyclean-libtool:
-diff -Nru kdegraphics-3.4.2.orig/kfile-plugins/pcx/Makefile.in kdegraphics-3.4.2/kfile-plugins/pcx/Makefile.in
---- kdegraphics-3.4.2.orig/kfile-plugins/pcx/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/kfile-plugins/pcx/Makefile.in 2005-07-31 18:53:32.525176152 +0000
-@@ -246,6 +246,9 @@
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kfile_pcx_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -246,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8764,7 +9128,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -447,7 +450,7 @@
+@@ -447,7 +448,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8773,7 +9137,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -485,9 +488,9 @@
+@@ -485,9 +486,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8785,10 +9149,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/kfile-plugins/pdf/Makefile.in kdegraphics-3.4.2/kfile-plugins/pdf/Makefile.in
---- kdegraphics-3.4.2.orig/kfile-plugins/pdf/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/kfile-plugins/pdf/Makefile.in 2005-07-31 18:53:32.554171744 +0000
-@@ -245,6 +245,9 @@
+--- kfile-plugins/pdf/Makefile.in
++++ kfile-plugins/pdf/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kfile_pdf_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -245,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8798,7 +9176,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -448,7 +451,7 @@
+@@ -448,7 +449,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8807,7 +9185,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -486,9 +489,9 @@
+@@ -486,9 +487,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8819,10 +9197,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/kfile-plugins/png/Makefile.in kdegraphics-3.4.2/kfile-plugins/png/Makefile.in
---- kdegraphics-3.4.2.orig/kfile-plugins/png/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/kfile-plugins/png/Makefile.in 2005-07-31 18:53:32.598165056 +0000
-@@ -245,6 +245,9 @@
+--- kfile-plugins/png/Makefile.in
++++ kfile-plugins/png/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kfile_png_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -245,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8832,7 +9224,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -448,7 +451,7 @@
+@@ -448,7 +449,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8841,7 +9233,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -486,9 +489,9 @@
+@@ -486,9 +487,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8853,10 +9245,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/kfile-plugins/pnm/Makefile.in kdegraphics-3.4.2/kfile-plugins/pnm/Makefile.in
---- kdegraphics-3.4.2.orig/kfile-plugins/pnm/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/kfile-plugins/pnm/Makefile.in 2005-07-31 18:53:32.635159432 +0000
-@@ -245,6 +245,9 @@
+--- kfile-plugins/pnm/Makefile.in
++++ kfile-plugins/pnm/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kfile_pnm_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -245,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8866,7 +9272,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -448,7 +451,7 @@
+@@ -448,7 +449,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8875,7 +9281,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -486,9 +489,9 @@
+@@ -486,9 +487,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8887,10 +9293,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/kfile-plugins/ps/Makefile.in kdegraphics-3.4.2/kfile-plugins/ps/Makefile.in
---- kdegraphics-3.4.2.orig/kfile-plugins/ps/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/kfile-plugins/ps/Makefile.in 2005-07-31 18:53:32.667154568 +0000
-@@ -252,6 +252,9 @@
+--- kfile-plugins/ps/Makefile.in
++++ kfile-plugins/ps/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(gsthumbnail_la_SOURCES) $(kfile_ps_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -252,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8900,7 +9320,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -458,7 +461,7 @@
+@@ -458,7 +459,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8909,7 +9329,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -496,9 +499,9 @@
+@@ -496,9 +497,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8921,10 +9341,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/kfile-plugins/rgb/Makefile.in kdegraphics-3.4.2/kfile-plugins/rgb/Makefile.in
---- kdegraphics-3.4.2.orig/kfile-plugins/rgb/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/kfile-plugins/rgb/Makefile.in 2005-07-31 18:53:32.693150616 +0000
-@@ -245,6 +245,9 @@
+--- kfile-plugins/rgb/Makefile.in
++++ kfile-plugins/rgb/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kfile_rgb_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -245,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8934,7 +9368,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -448,7 +451,7 @@
+@@ -448,7 +449,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8943,7 +9377,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -486,9 +489,9 @@
+@@ -486,9 +487,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8955,10 +9389,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/kfile-plugins/tga/Makefile.in kdegraphics-3.4.2/kfile-plugins/tga/Makefile.in
---- kdegraphics-3.4.2.orig/kfile-plugins/tga/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/kfile-plugins/tga/Makefile.in 2005-07-31 18:53:32.719146664 +0000
-@@ -245,6 +245,9 @@
+--- kfile-plugins/tga/Makefile.in
++++ kfile-plugins/tga/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kfile_tga_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -245,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8968,7 +9416,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -448,7 +451,7 @@
+@@ -448,7 +449,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8977,7 +9425,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -486,9 +489,9 @@
+@@ -486,9 +487,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8989,10 +9437,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/kfile-plugins/tiff/Makefile.in kdegraphics-3.4.2/kfile-plugins/tiff/Makefile.in
---- kdegraphics-3.4.2.orig/kfile-plugins/tiff/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/kfile-plugins/tiff/Makefile.in 2005-07-31 18:53:32.748142256 +0000
-@@ -246,6 +246,9 @@
+--- kfile-plugins/tiff/Makefile.in
++++ kfile-plugins/tiff/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kfile_tiff_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -246,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9002,7 +9464,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -447,7 +450,7 @@
+@@ -447,7 +448,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9011,7 +9473,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -485,9 +488,9 @@
+@@ -485,9 +486,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9023,10 +9485,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/kfile-plugins/xbm/Makefile.in kdegraphics-3.4.2/kfile-plugins/xbm/Makefile.in
---- kdegraphics-3.4.2.orig/kfile-plugins/xbm/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/kfile-plugins/xbm/Makefile.in 2005-07-31 18:53:32.773138456 +0000
-@@ -245,6 +245,9 @@
+--- kfile-plugins/xbm/Makefile.in
++++ kfile-plugins/xbm/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kfile_xbm_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -245,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9036,7 +9512,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -448,7 +451,7 @@
+@@ -448,7 +449,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9045,7 +9521,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -486,9 +489,9 @@
+@@ -486,9 +487,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9057,10 +9533,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/kfile-plugins/xpm/Makefile.in kdegraphics-3.4.2/kfile-plugins/xpm/Makefile.in
---- kdegraphics-3.4.2.orig/kfile-plugins/xpm/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/kfile-plugins/xpm/Makefile.in 2005-07-31 18:53:32.799134504 +0000
-@@ -245,6 +245,9 @@
+--- kfile-plugins/xpm/Makefile.in
++++ kfile-plugins/xpm/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kfile_xpm_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -245,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9070,7 +9560,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -446,7 +449,7 @@
+@@ -446,7 +447,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9079,7 +9569,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -484,9 +487,9 @@
+@@ -484,9 +485,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9091,10 +9581,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/kgamma/kcmkgamma/Makefile.in kdegraphics-3.4.2/kgamma/kcmkgamma/Makefile.in
---- kdegraphics-3.4.2.orig/kgamma/kcmkgamma/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/kgamma/kcmkgamma/Makefile.in 2005-07-31 18:53:32.890120672 +0000
-@@ -260,6 +260,9 @@
+--- kgamma/Makefile.in
++++ kgamma/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -214,6 +214,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9104,16 +9599,64 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -459,7 +462,7 @@
+@@ -402,7 +405,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -440,9 +443,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
+--- kgamma/kcmkgamma/Makefile.in
++++ kgamma/kcmkgamma/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(kcm_kgamma_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -260,6 +258,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -459,7 +460,7 @@
+
+ .SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -497,9 +500,9 @@
+@@ -497,9 +498,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9125,7 +9668,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -903,22 +906,22 @@
+@@ -903,22 +904,22 @@
mocs: displaynumber.moc
#>+ 3
@@ -9155,9 +9698,14 @@
#>+ 2
KDE_DIST=gammactrl.h xf86configpath.h kgamma.h kgamma.desktop displaynumber.h Makefile.in xvidextwrap.h Makefile.am
-diff -Nru kdegraphics-3.4.2.orig/kgamma/kcmkgamma/pics/Makefile.in kdegraphics-3.4.2/kgamma/kcmkgamma/pics/Makefile.in
---- kdegraphics-3.4.2.orig/kgamma/kcmkgamma/pics/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/kgamma/kcmkgamma/pics/Makefile.in 2005-07-31 18:53:32.909117784 +0000
+--- kgamma/kcmkgamma/pics/Makefile.in
++++ kgamma/kcmkgamma/pics/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -207,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -9189,44 +9737,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdegraphics-3.4.2.orig/kgamma/Makefile.in kdegraphics-3.4.2/kgamma/Makefile.in
---- kdegraphics-3.4.2.orig/kgamma/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/kgamma/Makefile.in 2005-07-31 18:53:32.828130096 +0000
-@@ -214,6 +214,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -402,7 +405,7 @@
- all: docs-am all-recursive
+--- kgamma/xf86gammacfg/Makefile.in
++++ kgamma/xf86gammacfg/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
- .SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -440,9 +443,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- mostlyclean-libtool:
-diff -Nru kdegraphics-3.4.2.orig/kgamma/xf86gammacfg/Makefile.in kdegraphics-3.4.2/kgamma/xf86gammacfg/Makefile.in
---- kdegraphics-3.4.2.orig/kgamma/xf86gammacfg/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/kgamma/xf86gammacfg/Makefile.in 2005-07-31 18:53:32.930114592 +0000
-@@ -235,6 +235,9 @@
+-SOURCES = $(xf86gammacfg_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -235,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9236,7 +9764,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -429,7 +432,7 @@
+@@ -429,7 +430,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9245,7 +9773,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -467,9 +470,9 @@
+@@ -467,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9257,44 +9785,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/kghostview/data/Makefile.in kdegraphics-3.4.2/kghostview/data/Makefile.in
---- kdegraphics-3.4.2.orig/kghostview/data/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/kghostview/data/Makefile.in 2005-07-31 18:53:33.082091488 +0000
-@@ -207,6 +207,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
- all: docs-am all-am
+--- kghostview/Makefile.in
++++ kghostview/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
- .SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -434,9 +437,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+@@ -19,8 +19,6 @@
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- mostlyclean-libtool:
-diff -Nru kdegraphics-3.4.2.orig/kghostview/Makefile.in kdegraphics-3.4.2/kghostview/Makefile.in
---- kdegraphics-3.4.2.orig/kghostview/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/kghostview/Makefile.in 2005-07-31 18:53:33.069093464 +0000
-@@ -316,6 +316,9 @@
+
+-SOURCES = $(libdscparse_la_SOURCES) $(libkghostviewlib_la_SOURCES) $(libkghostviewpart_la_SOURCES) $(kghostview_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -316,6 +314,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9304,7 +9812,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -558,7 +561,7 @@
+@@ -558,7 +559,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -9313,7 +9821,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -596,9 +599,9 @@
+@@ -596,9 +597,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9325,7 +9833,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1277,18 +1280,18 @@
+@@ -1277,18 +1278,18 @@
mocs: kgvmainwidget.moc
#>+ 3
@@ -9350,7 +9858,7 @@
#>+ 3
viewcontrol.moc: $(srcdir)/viewcontrol.h
-@@ -1322,7 +1325,7 @@
+@@ -1322,7 +1323,7 @@
#>+ 3
clean-metasources:
@@ -9359,7 +9867,7 @@
#>+ 2
KDE_DIST=kgv_part.rc cr16-app-kghostview.png update-to-xt-names.pl kghostview.upd generalsettingswidget.ui viewcontrol.cpp cr128-app-kghostview.png viewcontrol.h kghostviewui.rc cr64-app-kghostview.png configuration.kcfgc Makefile.in cr48-app-kghostview.png cr32-app-kghostview.png gssettingswidget.ui.h gssettingswidget.ui kghostview.kcfg version.h generalsettingswidget.ui.h kgv.h Makefile.am
-@@ -1347,23 +1350,23 @@
+@@ -1347,23 +1348,23 @@
#>+ 19
install-kde-icons:
@@ -9392,7 +9900,7 @@
#>+ 15
force-reedit:
-@@ -1416,7 +1419,7 @@
+@@ -1416,7 +1417,7 @@
rm -f libdscparse_la.all_cpp.final libdscparse_la.all_cpp.files
#>+ 11
@@ -9401,10 +9909,15 @@
@echo 'creating libkghostviewlib_la.all_cpp.cpp ...'; \
rm -f libkghostviewlib_la.all_cpp.files libkghostviewlib_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkghostviewlib_la.all_cpp.final; \
-diff -Nru kdegraphics-3.4.2.orig/kiconedit/Makefile.in kdegraphics-3.4.2/kiconedit/Makefile.in
---- kdegraphics-3.4.2.orig/kiconedit/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/kiconedit/Makefile.in 2005-07-31 18:53:33.198073856 +0000
-@@ -269,6 +269,9 @@
+--- kghostview/data/Makefile.in
++++ kghostview/data/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -207,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9414,16 +9927,64 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -473,7 +476,7 @@
+@@ -396,7 +399,7 @@
+ all: docs-am all-am
.SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -434,9 +437,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
+--- kiconedit/Makefile.in
++++ kiconedit/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(kiconedit_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -269,6 +267,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -473,7 +474,7 @@
+
+ .SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -511,9 +514,9 @@
+@@ -511,9 +512,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9435,7 +9996,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -949,18 +952,18 @@
+@@ -949,18 +950,18 @@
mocs: kicon.moc
#>+ 3
@@ -9460,7 +10021,7 @@
#>+ 3
kiconcolors.moc: $(srcdir)/kiconcolors.h
-@@ -970,22 +973,22 @@
+@@ -970,22 +971,22 @@
mocs: kiconcolors.moc
#>+ 3
@@ -9490,7 +10051,7 @@
#>+ 2
KDE_DIST=kiconedit.h kiconeditui.rc kiconedit.desktop kicon.h kcolorgrid.h kiconconfig.h properties.h utils.h Makefile.in kresize.h palettetoolbar.h version.h knew.h Makefile.am kicongrid.h kiconcolors.h
-@@ -1032,7 +1035,7 @@
+@@ -1032,7 +1033,7 @@
#>+ 11
@@ -9499,7 +10060,7 @@
@echo 'creating kiconedit.all_cpp.cpp ...'; \
rm -f kiconedit.all_cpp.files kiconedit.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kiconedit.all_cpp.final; \
-@@ -1079,8 +1082,8 @@
+@@ -1079,8 +1080,8 @@
knew.lo: knew.moc
kiconconfig.o: kiconconfig.moc
kiconcolors.o: kiconcolors.moc
@@ -9509,43 +10070,14 @@
kcolorgrid.lo: kcolorgrid.moc
palettetoolbar.lo: palettetoolbar.moc
nmcheck:
-diff -Nru kdegraphics-3.4.2.orig/kiconedit/pics/icons/Makefile.in kdegraphics-3.4.2/kiconedit/pics/icons/Makefile.in
---- kdegraphics-3.4.2.orig/kiconedit/pics/icons/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/kiconedit/pics/icons/Makefile.in 2005-07-31 18:53:33.232068688 +0000
-@@ -207,6 +207,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -399,7 +402,7 @@
- all: docs-am all-am
+--- kiconedit/pics/Makefile.in
++++ kiconedit/pics/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
- .SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -437,9 +440,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
-diff -Nru kdegraphics-3.4.2.orig/kiconedit/pics/Makefile.in kdegraphics-3.4.2/kiconedit/pics/Makefile.in
---- kdegraphics-3.4.2.orig/kiconedit/pics/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/kiconedit/pics/Makefile.in 2005-07-31 18:53:33.218070816 +0000
@@ -213,6 +213,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -9598,9 +10130,14 @@
#>+ 15
force-reedit:
-diff -Nru kdegraphics-3.4.2.orig/kiconedit/pics/toolbar/Makefile.in kdegraphics-3.4.2/kiconedit/pics/toolbar/Makefile.in
---- kdegraphics-3.4.2.orig/kiconedit/pics/toolbar/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/kiconedit/pics/toolbar/Makefile.in 2005-07-31 18:53:33.247066408 +0000
+--- kiconedit/pics/icons/Makefile.in
++++ kiconedit/pics/icons/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -207,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -9611,7 +10148,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -420,7 +423,7 @@
+@@ -399,7 +402,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9620,7 +10157,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -458,9 +461,9 @@
+@@ -437,9 +440,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9632,19 +10169,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -619,7 +622,7 @@
- .NOEXPORT:
+--- kiconedit/pics/toolbar/Makefile.in
++++ kiconedit/pics/toolbar/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
- #>+ 2
--KDE_DIST=fill-cursor.xpm ellipse.png eraser-cursor.xpm spraycan-cursor.xpm airbrush-cursor.xpm grid.png line.png paintbrush.png paintbrush-cursor.xpm areaselect.png aim.png pointer.png spraycan.png kdepalette.png fileclose.png flood-cursor.xpm grayscale.png aim-cursor.xpm transform.png window_new.png circle.png selectcircle.png filledcircle.png Makefile.in flood.png rectangle.png selectrect.png colorpicker-cursor.xpm filledrectangle.png filledellipse.png Makefile.am
-+KDE_DIST=fill-cursor.xpm ellipse.png eraser-cursor.xpm spraycan-cursor.xpm airbrush-cursor.xpm grid.png line.png paintbrush.png areaselect.png paintbrush-cursor.xpm aim.png pointer.png spraycan.png fileclose.png kdepalette.png flood-cursor.xpm grayscale.png aim-cursor.xpm transform.png window_new.png circle.png selectcircle.png filledcircle.png Makefile.in flood.png rectangle.png selectrect.png colorpicker-cursor.xpm filledrectangle.png filledellipse.png Makefile.am
-
- #>+ 2
- docs-am:
-diff -Nru kdegraphics-3.4.2.orig/kmrml/kmrml/kcontrol/Makefile.in kdegraphics-3.4.2/kmrml/kmrml/kcontrol/Makefile.in
---- kdegraphics-3.4.2.orig/kmrml/kmrml/kcontrol/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/kmrml/kmrml/kcontrol/Makefile.in 2005-07-31 18:53:33.382045888 +0000
-@@ -252,6 +252,9 @@
+@@ -207,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9654,16 +10187,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -453,7 +456,7 @@
+@@ -420,7 +423,7 @@
+ all: docs-am all-am
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -491,9 +494,9 @@
+@@ -458,9 +461,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9673,12 +10206,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/kmrml/kmrml/lib/Makefile.in kdegraphics-3.4.2/kmrml/kmrml/lib/Makefile.in
---- kdegraphics-3.4.2.orig/kmrml/kmrml/lib/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/kmrml/kmrml/lib/Makefile.in 2005-07-31 18:53:33.407042088 +0000
-@@ -238,6 +238,9 @@
+
+ mostlyclean-libtool:
+@@ -619,7 +622,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=fill-cursor.xpm ellipse.png eraser-cursor.xpm spraycan-cursor.xpm airbrush-cursor.xpm grid.png line.png paintbrush.png paintbrush-cursor.xpm areaselect.png aim.png pointer.png spraycan.png kdepalette.png fileclose.png flood-cursor.xpm grayscale.png aim-cursor.xpm transform.png window_new.png circle.png selectcircle.png filledcircle.png Makefile.in flood.png rectangle.png selectrect.png colorpicker-cursor.xpm filledrectangle.png filledellipse.png Makefile.am
++KDE_DIST=fill-cursor.xpm ellipse.png eraser-cursor.xpm spraycan-cursor.xpm airbrush-cursor.xpm grid.png line.png paintbrush.png areaselect.png paintbrush-cursor.xpm aim.png pointer.png spraycan.png fileclose.png kdepalette.png flood-cursor.xpm grayscale.png aim-cursor.xpm transform.png window_new.png circle.png selectcircle.png filledcircle.png Makefile.in flood.png rectangle.png selectrect.png colorpicker-cursor.xpm filledrectangle.png filledellipse.png Makefile.am
+
+ #>+ 2
+ docs-am:
+--- kmrml/Makefile.in
++++ kmrml/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -214,6 +214,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9688,16 +10235,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -437,7 +440,7 @@
+@@ -402,7 +405,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -475,9 +478,9 @@
+@@ -440,9 +443,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9708,11 +10255,40 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- clean-noinstLTLIBRARIES:
-diff -Nru kdegraphics-3.4.2.orig/kmrml/kmrml/Makefile.in kdegraphics-3.4.2/kmrml/kmrml/Makefile.in
---- kdegraphics-3.4.2.orig/kmrml/kmrml/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/kmrml/kmrml/Makefile.in 2005-07-31 18:53:33.343051816 +0000
-@@ -301,6 +301,9 @@
+ mostlyclean-libtool:
+--- kmrml/kmrml/Makefile.in
++++ kmrml/kmrml/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,10 +17,6 @@
+
+
+
+-#>- SOURCES = $(kio_mrml_la_SOURCES) $(libkmrmlpart_la_SOURCES) $(mrmlsearch_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kio_mrml_la_SOURCES) $(libkmrmlpart_la_SOURCES) $(mrmlsearch_la_SOURCES) $(mrmlsearch_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -126,8 +122,11 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- SOURCES = $(kio_mrml_la_SOURCES) $(libkmrmlpart_la_SOURCES) \
++#>- $(mrmlsearch_la_SOURCES)
++#>+ 2
+ SOURCES = $(kio_mrml_la_SOURCES) $(libkmrmlpart_la_SOURCES) \
+- $(mrmlsearch_la_SOURCES)
++ $(mrmlsearch_la_SOURCES) $(mrmlsearch_SOURCES)
+ #>- DIST_SOURCES = $(kio_mrml_la_SOURCES) $(libkmrmlpart_la_SOURCES) \
+ #>- $(mrmlsearch_la_SOURCES)
+ #>+ 2
+@@ -301,6 +300,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9722,7 +10298,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -520,7 +523,7 @@
+@@ -520,7 +522,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9731,7 +10307,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -558,9 +561,9 @@
+@@ -558,9 +560,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9743,7 +10319,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1142,18 +1145,18 @@
+@@ -1142,18 +1144,18 @@
mocs: browser.moc
#>+ 3
@@ -9768,7 +10344,7 @@
#>+ 3
algorithmcombo.moc: $(srcdir)/algorithmcombo.h
-@@ -1196,7 +1199,7 @@
+@@ -1196,7 +1198,7 @@
#>+ 3
clean-metasources:
@@ -9777,7 +10353,7 @@
#>+ 2
KDE_DIST=mrml_creator.h browser.h mrml.protocol mrml-servicemenu.desktop propertywidgets.h mrml_part.desktop mrml_view.h algorithmdialog.h mrml_elements.h propertysheet.h collectioncombo.h mrml.h Makefile.in algorithmcombo.h mrml.desktop loader.h propertywidgets.cpp mrml_part.h Makefile.am
-@@ -1247,7 +1250,7 @@
+@@ -1247,7 +1249,7 @@
#>+ 11
@@ -9786,10 +10362,24 @@
@echo 'creating libkmrmlpart_la.all_cpp.cpp ...'; \
rm -f libkmrmlpart_la.all_cpp.files libkmrmlpart_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkmrmlpart_la.all_cpp.final; \
-diff -Nru kdegraphics-3.4.2.orig/kmrml/kmrml/server/Makefile.in kdegraphics-3.4.2/kmrml/kmrml/server/Makefile.in
---- kdegraphics-3.4.2.orig/kmrml/kmrml/server/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/kmrml/kmrml/server/Makefile.in 2005-07-31 18:53:33.434037984 +0000
-@@ -245,6 +245,9 @@
+--- kmrml/kmrml/kcontrol/Makefile.in
++++ kmrml/kmrml/kcontrol/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kcm_kmrml_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -252,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9799,7 +10389,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,7 +447,7 @@
+@@ -453,7 +454,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9808,7 +10398,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -482,9 +485,9 @@
+@@ -491,9 +492,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9820,10 +10410,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/kmrml/Makefile.in kdegraphics-3.4.2/kmrml/Makefile.in
---- kdegraphics-3.4.2.orig/kmrml/Makefile.in 2005-07-20 20:08:43.000000000 +0000
-+++ kdegraphics-3.4.2/kmrml/Makefile.in 2005-07-31 18:53:33.265063672 +0000
-@@ -214,6 +214,9 @@
+--- kmrml/kmrml/lib/Makefile.in
++++ kmrml/kmrml/lib/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkmrmlstuff_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -238,6 +236,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9833,16 +10437,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -402,7 +405,7 @@
- all: docs-am all-recursive
+@@ -437,7 +438,7 @@
.SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -440,9 +443,9 @@
+@@ -475,9 +476,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9853,11 +10457,25 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- mostlyclean-libtool:
-diff -Nru kdegraphics-3.4.2.orig/kolourpaint/cursors/Makefile.in kdegraphics-3.4.2/kolourpaint/cursors/Makefile.in
---- kdegraphics-3.4.2.orig/kolourpaint/cursors/Makefile.in 2005-07-20 20:08:44.000000000 +0000
-+++ kdegraphics-3.4.2/kolourpaint/cursors/Makefile.in 2005-07-31 18:53:33.672001808 +0000
-@@ -235,6 +235,9 @@
+ clean-noinstLTLIBRARIES:
+--- kmrml/kmrml/server/Makefile.in
++++ kmrml/kmrml/server/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(kded_daemonwatcher_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -245,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9867,7 +10485,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -432,7 +435,7 @@
+@@ -444,7 +445,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9876,7 +10494,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -470,9 +473,9 @@
+@@ -482,9 +483,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9886,12 +10504,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- kolourpaint/Makefile.in
++++ kolourpaint/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
- clean-noinstLTLIBRARIES:
-diff -Nru kdegraphics-3.4.2.orig/kolourpaint/Makefile.in kdegraphics-3.4.2/kolourpaint/Makefile.in
---- kdegraphics-3.4.2.orig/kolourpaint/Makefile.in 2005-07-20 20:08:44.000000000 +0000
-+++ kdegraphics-3.4.2/kolourpaint/Makefile.in 2005-07-31 18:53:33.648005456 +0000
-@@ -294,6 +294,9 @@
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(kolourpaint_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -294,6 +292,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9901,7 +10533,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -523,7 +526,7 @@
+@@ -523,7 +524,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9910,7 +10542,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -561,9 +564,9 @@
+@@ -561,9 +562,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9922,7 +10554,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1085,7 +1088,7 @@
+@@ -1085,7 +1086,7 @@
-rm -f kpthumbnail.moc kpmainwindow.moc kpviewmanager.moc kpviewscrollablecontainer.moc kpdocumentsaveoptionswidget.moc kpselectiondrag.moc kpdocument.moc kpcommandhistory.moc kpselection.moc kpview.moc kpsinglekeytriggersaction.moc
#>+ 2
@@ -9931,10 +10563,24 @@
#>+ 2
docs-am:
-diff -Nru kdegraphics-3.4.2.orig/kolourpaint/pics/custom/Makefile.in kdegraphics-3.4.2/kolourpaint/pics/custom/Makefile.in
---- kdegraphics-3.4.2.orig/kolourpaint/pics/custom/Makefile.in 2005-07-20 20:08:44.000000000 +0000
-+++ kdegraphics-3.4.2/kolourpaint/pics/custom/Makefile.in 2005-07-31 18:53:33.718994664 +0000
-@@ -207,6 +207,9 @@
+--- kolourpaint/cursors/Makefile.in
++++ kolourpaint/cursors/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libkolourpaintcursors_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -235,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9944,16 +10590,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -403,7 +406,7 @@
- all: docs-am all-am
+@@ -432,7 +433,7 @@
.SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -441,9 +444,9 @@
+@@ -470,9 +471,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9964,10 +10610,15 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- mostlyclean-libtool:
-diff -Nru kdegraphics-3.4.2.orig/kolourpaint/pics/Makefile.in kdegraphics-3.4.2/kolourpaint/pics/Makefile.in
---- kdegraphics-3.4.2.orig/kolourpaint/pics/Makefile.in 2005-07-20 20:08:44.000000000 +0000
-+++ kdegraphics-3.4.2/kolourpaint/pics/Makefile.in 2005-07-31 18:53:33.701997248 +0000
+ clean-noinstLTLIBRARIES:
+--- kolourpaint/pics/Makefile.in
++++ kolourpaint/pics/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -213,6 +213,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -10101,10 +10752,15 @@
#>+ 15
force-reedit:
-diff -Nru kdegraphics-3.4.2.orig/kolourpaint/pixmapfx/Makefile.in kdegraphics-3.4.2/kolourpaint/pixmapfx/Makefile.in
---- kdegraphics-3.4.2.orig/kolourpaint/pixmapfx/Makefile.in 2005-07-20 20:08:44.000000000 +0000
-+++ kdegraphics-3.4.2/kolourpaint/pixmapfx/Makefile.in 2005-07-31 18:53:33.767987216 +0000
-@@ -239,6 +239,9 @@
+--- kolourpaint/pics/custom/Makefile.in
++++ kolourpaint/pics/custom/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -207,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10114,16 +10770,64 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -446,7 +449,7 @@
+@@ -403,7 +406,7 @@
+ all: docs-am all-am
.SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -441,9 +444,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
+--- kolourpaint/pixmapfx/Makefile.in
++++ kolourpaint/pixmapfx/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libkolourpaintpixmapfx_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -239,6 +237,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -446,7 +447,7 @@
+
+ .SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -484,9 +487,9 @@
+@@ -484,9 +485,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10135,7 +10839,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -731,6 +734,20 @@
+@@ -731,6 +732,20 @@
mocs: kpeffectflatten.moc
#>+ 3
@@ -10156,7 +10860,7 @@
kpeffectinvert.moc: $(srcdir)/kpeffectinvert.h
$(MOC) $(srcdir)/kpeffectinvert.h -o kpeffectinvert.moc
-@@ -752,36 +769,22 @@
+@@ -752,36 +767,22 @@
mocs: kpeffectemboss.moc
#>+ 3
@@ -10200,7 +10904,7 @@
#>+ 2
KDE_DIST=kpeffectsdialog.h kpeffectemboss.h kpeffectbalance.h kpfloodfill.h kpeffectblursharpen.h kpeffectinvert.h kpeffectreducecolors.h kppixmapfx.h kpeffectflatten.h Makefile.in kpcoloreffect.h Makefile.am
-@@ -828,7 +831,7 @@
+@@ -828,7 +829,7 @@
#>+ 11
@@ -10209,7 +10913,7 @@
@echo 'creating libkolourpaintpixmapfx_la.all_cpp.cpp ...'; \
rm -f libkolourpaintpixmapfx_la.all_cpp.files libkolourpaintpixmapfx_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkolourpaintpixmapfx_la.all_cpp.final; \
-@@ -870,8 +873,8 @@
+@@ -870,8 +871,8 @@
#>+ 19
kpeffectemboss.lo: kpeffectemboss.moc
kpeffectsdialog.o: kpeffectsdialog.moc
@@ -10219,7 +10923,7 @@
kpeffectflatten.o: kpeffectflatten.moc
nmcheck:
kpeffectbalance.lo: kpeffectbalance.moc
-@@ -882,7 +885,7 @@
+@@ -882,7 +883,7 @@
kpeffectreducecolors.o: kpeffectreducecolors.moc
kpeffectflatten.lo: kpeffectflatten.moc
kpeffectinvert.o: kpeffectinvert.moc
@@ -10228,10 +10932,24 @@
+kpeffectemboss.o: kpeffectemboss.moc
kpcoloreffect.o: kpcoloreffect.moc
kpeffectsdialog.lo: kpeffectsdialog.moc
-diff -Nru kdegraphics-3.4.2.orig/kolourpaint/tools/Makefile.in kdegraphics-3.4.2/kolourpaint/tools/Makefile.in
---- kdegraphics-3.4.2.orig/kolourpaint/tools/Makefile.in 2005-07-20 20:08:44.000000000 +0000
-+++ kdegraphics-3.4.2/kolourpaint/tools/Makefile.in 2005-07-31 18:53:34.049944352 +0000
-@@ -254,6 +254,9 @@
+--- kolourpaint/tools/Makefile.in
++++ kolourpaint/tools/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libkolourpainttools_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -254,6 +252,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10241,7 +10959,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -497,7 +500,7 @@
+@@ -497,7 +498,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10250,7 +10968,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -535,9 +538,9 @@
+@@ -535,9 +536,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10262,7 +10980,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -960,7 +963,7 @@
+@@ -960,7 +961,7 @@
-rm -f kptool.moc kptoolcolorwasher.moc kptoolflip.moc kptooltext.moc kptoolrectangle.moc kptoolroundedrectangle.moc kptoolpen.moc kptoolairspray.moc kptoolfloodfill.moc kptoolpolyline.moc kptoolskew.moc kptoolpreviewdialog.moc kptoolselection.moc kptoolresizescale.moc kptoolbrush.moc kptoolcolorpicker.moc kptoolline.moc kptoolpolygon.moc kptooleraser.moc kptoolcurve.moc kptoolaction.moc kptoolellipse.moc kptoolrotate.moc
#>+ 2
@@ -10271,10 +10989,24 @@
#>+ 2
docs-am:
-diff -Nru kdegraphics-3.4.2.orig/kolourpaint/views/Makefile.in kdegraphics-3.4.2/kolourpaint/views/Makefile.in
---- kdegraphics-3.4.2.orig/kolourpaint/views/Makefile.in 2005-07-20 20:08:44.000000000 +0000
-+++ kdegraphics-3.4.2/kolourpaint/views/Makefile.in 2005-07-31 18:53:34.081939488 +0000
-@@ -236,6 +236,9 @@
+--- kolourpaint/views/Makefile.in
++++ kolourpaint/views/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libkolourpaintviews_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -236,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10284,7 +11016,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -437,7 +440,7 @@
+@@ -437,7 +438,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10293,7 +11025,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -475,9 +478,9 @@
+@@ -475,9 +476,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10305,7 +11037,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -709,18 +712,18 @@
+@@ -709,18 +710,18 @@
.NOEXPORT:
#>+ 3
@@ -10330,7 +11062,7 @@
#>+ 3
kpzoomedthumbnailview.moc: $(srcdir)/kpzoomedthumbnailview.h
-@@ -738,7 +741,7 @@
+@@ -738,7 +739,7 @@
#>+ 3
clean-metasources:
@@ -10339,7 +11071,7 @@
#>+ 2
KDE_DIST=kpunzoomedthumbnailview.h kpzoomedthumbnailview.h kpzoomedview.h Makefile.in Makefile.am kpthumbnailview.h
-@@ -785,7 +788,7 @@
+@@ -785,7 +786,7 @@
#>+ 11
@@ -10348,7 +11080,7 @@
@echo 'creating libkolourpaintviews_la.all_cpp.cpp ...'; \
rm -f libkolourpaintviews_la.all_cpp.files libkolourpaintviews_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkolourpaintviews_la.all_cpp.final; \
-@@ -826,8 +829,8 @@
+@@ -826,8 +827,8 @@
#>+ 11
nmcheck:
@@ -10358,10 +11090,24 @@
kpunzoomedthumbnailview.lo: kpunzoomedthumbnailview.moc
kpzoomedview.o: kpzoomedview.moc
nmcheck-am: nmcheck
-diff -Nru kdegraphics-3.4.2.orig/kolourpaint/widgets/Makefile.in kdegraphics-3.4.2/kolourpaint/widgets/Makefile.in
---- kdegraphics-3.4.2.orig/kolourpaint/widgets/Makefile.in 2005-07-20 20:08:44.000000000 +0000
-+++ kdegraphics-3.4.2/kolourpaint/widgets/Makefile.in 2005-07-31 18:53:34.140930520 +0000
-@@ -245,6 +245,9 @@
+--- kolourpaint/widgets/Makefile.in
++++ kolourpaint/widgets/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libkolourpaintwidgets_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -245,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10371,7 +11117,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -453,7 +456,7 @@
+@@ -453,7 +454,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10380,7 +11126,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -491,9 +494,9 @@
+@@ -491,9 +492,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10392,7 +11138,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -776,18 +779,18 @@
+@@ -776,18 +777,18 @@
mocs: kpresizesignallinglabel.moc
#>+ 3
@@ -10417,7 +11163,7 @@
#>+ 3
kptoolwidgetfillstyle.moc: $(srcdir)/kptoolwidgetfillstyle.h
-@@ -819,10 +822,10 @@
+@@ -819,10 +820,10 @@
#>+ 3
clean-metasources:
@@ -10430,7 +11176,7 @@
#>+ 2
docs-am:
-@@ -866,7 +869,7 @@
+@@ -866,7 +867,7 @@
#>+ 11
@@ -10439,7 +11185,7 @@
@echo 'creating libkolourpaintwidgets_la.all_cpp.cpp ...'; \
rm -f libkolourpaintwidgets_la.all_cpp.files libkolourpaintwidgets_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkolourpaintwidgets_la.all_cpp.final; \
-@@ -915,8 +918,8 @@
+@@ -915,8 +916,8 @@
kpresizesignallinglabel.o: kpresizesignallinglabel.moc
kptoolwidgetfillstyle.o: kptoolwidgetfillstyle.moc
kpcolorsimilaritydialog.o: kpcolorsimilaritydialog.moc
@@ -10449,10 +11195,24 @@
nmcheck:
kpcolortoolbar.o: kpcolortoolbar.moc
kptoolwidgeterasersize.lo: kptoolwidgeterasersize.moc
-diff -Nru kdegraphics-3.4.2.orig/kooka/Makefile.in kdegraphics-3.4.2/kooka/Makefile.in
---- kdegraphics-3.4.2.orig/kooka/Makefile.in 2005-07-20 20:08:44.000000000 +0000
-+++ kdegraphics-3.4.2/kooka/Makefile.in 2005-07-31 18:53:34.292907416 +0000
-@@ -285,6 +285,9 @@
+--- kooka/Makefile.in
++++ kooka/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kooka_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -285,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10462,7 +11222,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -506,7 +509,7 @@
+@@ -506,7 +507,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10471,7 +11231,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -544,9 +547,9 @@
+@@ -544,9 +545,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10483,7 +11243,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -982,81 +985,67 @@
+@@ -982,81 +983,67 @@
.NOEXPORT:
#>+ 3
@@ -10592,7 +11352,7 @@
#>+ 3
imageselectline.moc: $(srcdir)/imageselectline.h
-@@ -1080,6 +1069,20 @@
+@@ -1080,6 +1067,20 @@
mocs: scanpackager.moc
#>+ 3
@@ -10613,7 +11373,7 @@
kookaview.moc: $(srcdir)/kookaview.h
$(MOC) $(srcdir)/kookaview.h -o kookaview.moc
-@@ -1087,11 +1090,11 @@
+@@ -1087,11 +1088,11 @@
mocs: kookaview.moc
#>+ 3
@@ -10628,7 +11388,7 @@
#>+ 3
kooka.moc: $(srcdir)/kooka.h
-@@ -1109,7 +1112,7 @@
+@@ -1109,7 +1110,7 @@
#>+ 3
clean-metasources:
@@ -10637,7 +11397,7 @@
#>+ 2
KDE_DIST=README.KADMOS kookaui.rc WARNING kooka.desktop CREDITS kookarc CHANGES configure.in.in Makefile.in dwmenuaction.h version.h Makefile.am
-@@ -1156,7 +1159,7 @@
+@@ -1156,7 +1157,7 @@
#>+ 11
@@ -10646,7 +11406,7 @@
@echo 'creating kooka.all_cpp.cpp ...'; \
rm -f kooka.all_cpp.files kooka.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kooka.all_cpp.final; \
-@@ -1201,14 +1204,14 @@
+@@ -1201,14 +1202,14 @@
kocrbase.lo: kocrbase.moc
imgnamecombo.o: imgnamecombo.moc
img_saver.o: img_saver.moc
@@ -10664,9 +11424,14 @@
kookapref.lo: kookapref.moc
nmcheck-am: nmcheck
imgprintdialog.lo: imgprintdialog.moc
-diff -Nru kdegraphics-3.4.2.orig/kooka/pics/Makefile.in kdegraphics-3.4.2/kooka/pics/Makefile.in
---- kdegraphics-3.4.2.orig/kooka/pics/Makefile.in 2005-07-20 20:08:44.000000000 +0000
-+++ kdegraphics-3.4.2/kooka/pics/Makefile.in 2005-07-31 18:53:34.308904984 +0000
+--- kooka/pics/Makefile.in
++++ kooka/pics/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -207,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -10707,10 +11472,24 @@
#>+ 2
docs-am:
-diff -Nru kdegraphics-3.4.2.orig/kpdf/conf/Makefile.in kdegraphics-3.4.2/kpdf/conf/Makefile.in
---- kdegraphics-3.4.2.orig/kpdf/conf/Makefile.in 2005-07-20 20:08:44.000000000 +0000
-+++ kdegraphics-3.4.2/kpdf/conf/Makefile.in 2005-07-31 18:53:34.387892976 +0000
-@@ -242,6 +242,9 @@
+--- kpdf/Makefile.in
++++ kpdf/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkpdfpart_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -264,6 +262,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10720,7 +11499,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -442,7 +445,7 @@
+@@ -473,7 +474,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10729,7 +11508,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -480,9 +483,9 @@
+@@ -511,9 +512,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10739,12 +11518,62 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+@@ -968,26 +969,26 @@
- clean-noinstLTLIBRARIES:
-diff -Nru kdegraphics-3.4.2.orig/kpdf/core/generator_pdf/Makefile.in kdegraphics-3.4.2/kpdf/core/generator_pdf/Makefile.in
---- kdegraphics-3.4.2.orig/kpdf/core/generator_pdf/Makefile.in 2005-07-20 20:08:44.000000000 +0000
-+++ kdegraphics-3.4.2/kpdf/core/generator_pdf/Makefile.in 2005-07-31 18:53:34.478879144 +0000
-@@ -229,6 +229,9 @@
+ #>+ 22
+ install-kde-icons:
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpdf.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpdf.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+ $(INSTALL_DATA) $(srcdir)/cr128-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kpdf.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/cr22-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kpdf.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpdf.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpdf.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/cr64-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kpdf.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpdf.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpdf.png
+
+ uninstall-kde-icons:
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpdf.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpdf.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kpdf.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kpdf.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpdf.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpdf.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kpdf.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpdf.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpdf.png
+
+ #>+ 15
+ force-reedit:
+--- kpdf/conf/Makefile.in
++++ kpdf/conf/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkpdfconf_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -242,6 +240,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10754,7 +11583,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -442,7 +443,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10763,7 +11592,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -480,9 +481,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10775,10 +11604,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdegraphics-3.4.2.orig/kpdf/core/Makefile.in kdegraphics-3.4.2/kpdf/core/Makefile.in
---- kdegraphics-3.4.2.orig/kpdf/core/Makefile.in 2005-07-20 20:08:44.000000000 +0000
-+++ kdegraphics-3.4.2/kpdf/core/Makefile.in 2005-07-31 18:53:34.456882488 +0000
-@@ -248,6 +248,9 @@
+--- kpdf/core/Makefile.in
++++ kpdf/core/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libkpdfcore_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -248,6 +246,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10788,7 +11631,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -442,7 +445,7 @@
+@@ -442,7 +443,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10797,7 +11640,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -480,9 +483,9 @@
+@@ -480,9 +481,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10809,10 +11652,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdegraphics-3.4.2.orig/kpdf/Makefile.in kdegraphics-3.4.2/kpdf/Makefile.in
---- kdegraphics-3.4.2.orig/kpdf/Makefile.in 2005-07-20 20:08:44.000000000 +0000
-+++ kdegraphics-3.4.2/kpdf/Makefile.in 2005-07-31 18:53:34.359897232 +0000
-@@ -264,6 +264,9 @@
+--- kpdf/core/generator_pdf/Makefile.in
++++ kpdf/core/generator_pdf/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libgeneratorpdf_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -229,6 +227,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10822,7 +11679,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -473,7 +476,7 @@
+@@ -422,7 +423,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10831,7 +11688,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -511,9 +514,9 @@
+@@ -460,9 +461,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10841,48 +11698,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
-@@ -968,26 +971,26 @@
- #>+ 22
- install-kde-icons:
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpdf.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpdf.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
- $(INSTALL_DATA) $(srcdir)/cr128-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kpdf.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
- $(INSTALL_DATA) $(srcdir)/cr22-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kpdf.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpdf.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpdf.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- $(INSTALL_DATA) $(srcdir)/cr64-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kpdf.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpdf.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpdf.png
+ clean-noinstLTLIBRARIES:
+--- kpdf/shell/Makefile.in
++++ kpdf/shell/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
- uninstall-kde-icons:
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpdf.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpdf.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kpdf.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kpdf.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpdf.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpdf.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kpdf.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpdf.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpdf.png
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
- #>+ 15
- force-reedit:
-diff -Nru kdegraphics-3.4.2.orig/kpdf/shell/Makefile.in kdegraphics-3.4.2/kpdf/shell/Makefile.in
---- kdegraphics-3.4.2.orig/kpdf/shell/Makefile.in 2005-07-20 20:08:44.000000000 +0000
-+++ kdegraphics-3.4.2/kpdf/shell/Makefile.in 2005-07-31 18:53:34.501875648 +0000
-@@ -247,6 +247,9 @@
+
+-SOURCES = $(kpdf_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -247,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10892,7 +11727,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,7 +447,7 @@
+@@ -444,7 +445,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10901,7 +11736,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -482,9 +485,9 @@
+@@ -482,9 +483,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10913,10 +11748,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/kpdf/ui/Makefile.in kdegraphics-3.4.2/kpdf/ui/Makefile.in
---- kdegraphics-3.4.2.orig/kpdf/ui/Makefile.in 2005-07-20 20:08:44.000000000 +0000
-+++ kdegraphics-3.4.2/kpdf/ui/Makefile.in 2005-07-31 18:53:34.670849960 +0000
-@@ -236,6 +236,9 @@
+--- kpdf/ui/Makefile.in
++++ kpdf/ui/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libkpdfui_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -236,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10926,7 +11775,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -431,7 +434,7 @@
+@@ -431,7 +432,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10935,7 +11784,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -469,9 +472,9 @@
+@@ -469,9 +470,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10947,7 +11796,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -750,25 +753,25 @@
+@@ -750,25 +751,25 @@
mocs: searchwidget.moc
#>+ 3
@@ -10981,7 +11830,7 @@
#>+ 2
docs-am:
-@@ -812,7 +815,7 @@
+@@ -812,7 +813,7 @@
#>+ 11
@@ -10990,77 +11839,14 @@
@echo 'creating libkpdfui_la.all_cpp.cpp ...'; \
rm -f libkpdfui_la.all_cpp.files libkpdfui_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkpdfui_la.all_cpp.final; \
-diff -Nru kdegraphics-3.4.2.orig/kpdf/xpdf/fofi/Makefile.in kdegraphics-3.4.2/kpdf/xpdf/fofi/Makefile.in
---- kdegraphics-3.4.2.orig/kpdf/xpdf/fofi/Makefile.in 2005-07-20 20:08:44.000000000 +0000
-+++ kdegraphics-3.4.2/kpdf/xpdf/fofi/Makefile.in 2005-07-31 18:53:34.712843576 +0000
-@@ -234,6 +234,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -429,7 +432,7 @@
+--- kpdf/xpdf/Makefile.in
++++ kpdf/xpdf/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
- .SUFFIXES:
- .SUFFIXES: .cc .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -467,9 +470,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- clean-noinstLTLIBRARIES:
-diff -Nru kdegraphics-3.4.2.orig/kpdf/xpdf/goo/Makefile.in kdegraphics-3.4.2/kpdf/xpdf/goo/Makefile.in
---- kdegraphics-3.4.2.orig/kpdf/xpdf/goo/Makefile.in 2005-07-20 20:08:44.000000000 +0000
-+++ kdegraphics-3.4.2/kpdf/xpdf/goo/Makefile.in 2005-07-31 18:53:34.733840384 +0000
-@@ -242,6 +242,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -433,7 +436,7 @@
-
- .SUFFIXES:
- .SUFFIXES: .c .cc .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -471,9 +474,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- clean-noinstLTLIBRARIES:
-diff -Nru kdegraphics-3.4.2.orig/kpdf/xpdf/Makefile.in kdegraphics-3.4.2/kpdf/xpdf/Makefile.in
---- kdegraphics-3.4.2.orig/kpdf/xpdf/Makefile.in 2005-07-20 20:08:44.000000000 +0000
-+++ kdegraphics-3.4.2/kpdf/xpdf/Makefile.in 2005-07-31 18:53:34.686847528 +0000
@@ -213,6 +213,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -11092,44 +11878,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdegraphics-3.4.2.orig/kpdf/xpdf/splash/Makefile.in kdegraphics-3.4.2/kpdf/xpdf/splash/Makefile.in
---- kdegraphics-3.4.2.orig/kpdf/xpdf/splash/Makefile.in 2005-07-20 20:08:44.000000000 +0000
-+++ kdegraphics-3.4.2/kpdf/xpdf/splash/Makefile.in 2005-07-31 18:53:34.760836280 +0000
-@@ -244,6 +244,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -439,7 +442,7 @@
+--- kpdf/xpdf/fofi/Makefile.in
++++ kpdf/xpdf/fofi/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
- .SUFFIXES:
- .SUFFIXES: .cc .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -477,9 +480,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+@@ -15,8 +15,6 @@
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ @SET_MAKE@
- clean-noinstLTLIBRARIES:
-diff -Nru kdegraphics-3.4.2.orig/kpdf/xpdf/xpdf/Makefile.in kdegraphics-3.4.2/kpdf/xpdf/xpdf/Makefile.in
---- kdegraphics-3.4.2.orig/kpdf/xpdf/xpdf/Makefile.in 2005-07-20 20:08:44.000000000 +0000
-+++ kdegraphics-3.4.2/kpdf/xpdf/xpdf/Makefile.in 2005-07-31 18:53:34.795830960 +0000
-@@ -252,6 +252,9 @@
+-SOURCES = $(libfofi_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -234,6 +232,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11139,7 +11905,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -458,7 +461,7 @@
+@@ -429,7 +430,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -11148,7 +11914,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -496,9 +499,9 @@
+@@ -467,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11160,53 +11926,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -764,7 +767,7 @@
- .NOEXPORT:
+--- kpdf/xpdf/goo/Makefile.in
++++ kpdf/xpdf/goo/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
- #>+ 2
--KDE_DIST=PDFDocEncoding.h Link.h CompactFontTables.h NameToCharCode.h UnicodeTypeTable.h Array.h CharTypes.h JPXStream.h Lexer.h Stream.h PSOutputDev.h Annot.h UnicodeMap.h xpdf_config.h SplashOutputDev.h Stream-CCITT.h Object.h NameToUnicodeTable.h XRef.h Dict.h OutputDev.h Decrypt.h JBIG2Stream.h Catalog.h DCTStream.h Error.h GlobalParams.h UnicodeMapTables.h FontEncodingTables.h PDFDoc.h Gfx.h UTF8.h BuiltinFontTables.h GfxFont.h JArithmeticDecoder.h Parser.h CMap.h Function.h CharCodeToUnicode.h Makefile.in BuiltinFont.h FlateStream.h Page.h PSTokenizer.h ErrorCodes.h GfxState.h TextOutputDev.h Makefile.am Outline.h
-+KDE_DIST=PDFDocEncoding.h Link.h CompactFontTables.h NameToCharCode.h UnicodeTypeTable.h Array.h CharTypes.h JPXStream.h Lexer.h Stream.h PSOutputDev.h Annot.h UnicodeMap.h SplashOutputDev.h xpdf_config.h Object.h Stream-CCITT.h NameToUnicodeTable.h XRef.h Dict.h OutputDev.h Decrypt.h JBIG2Stream.h Catalog.h DCTStream.h Error.h GlobalParams.h UnicodeMapTables.h FontEncodingTables.h PDFDoc.h Gfx.h BuiltinFontTables.h UTF8.h GfxFont.h JArithmeticDecoder.h Parser.h CMap.h Function.h CharCodeToUnicode.h Makefile.in BuiltinFont.h FlateStream.h Page.h PSTokenizer.h ErrorCodes.h GfxState.h TextOutputDev.h Makefile.am Outline.h
+@@ -15,8 +15,6 @@
- #>+ 2
- docs-am:
-diff -Nru kdegraphics-3.4.2.orig/kpovmodeler/examples/includes/inlined/Makefile.in kdegraphics-3.4.2/kpovmodeler/examples/includes/inlined/Makefile.in
---- kdegraphics-3.4.2.orig/kpovmodeler/examples/includes/inlined/Makefile.in 2005-07-20 20:08:45.000000000 +0000
-+++ kdegraphics-3.4.2/kpovmodeler/examples/includes/inlined/Makefile.in 2005-07-31 18:53:35.697693856 +0000
-@@ -207,6 +207,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -399,7 +402,7 @@
- all: docs-am all-am
+ @SET_MAKE@
- .SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -437,9 +440,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
-diff -Nru kdegraphics-3.4.2.orig/kpovmodeler/examples/includes/Makefile.in kdegraphics-3.4.2/kpovmodeler/examples/includes/Makefile.in
---- kdegraphics-3.4.2.orig/kpovmodeler/examples/includes/Makefile.in 2005-07-20 20:08:45.000000000 +0000
-+++ kdegraphics-3.4.2/kpovmodeler/examples/includes/Makefile.in 2005-07-31 18:53:35.681696288 +0000
-@@ -213,6 +213,9 @@
+-SOURCES = $(libgoo_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -242,6 +240,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11216,16 +11953,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -401,7 +404,7 @@
- all: docs-am all-recursive
+@@ -433,7 +434,7 @@
.SUFFIXES:
+ .SUFFIXES: .c .cc .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -439,9 +442,9 @@
+@@ -471,9 +472,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11236,45 +11973,25 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- mostlyclean-libtool:
-diff -Nru kdegraphics-3.4.2.orig/kpovmodeler/examples/includes/original/Makefile.in kdegraphics-3.4.2/kpovmodeler/examples/includes/original/Makefile.in
---- kdegraphics-3.4.2.orig/kpovmodeler/examples/includes/original/Makefile.in 2005-07-20 20:08:45.000000000 +0000
-+++ kdegraphics-3.4.2/kpovmodeler/examples/includes/original/Makefile.in 2005-07-31 18:53:35.714691272 +0000
-@@ -207,6 +207,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -399,7 +402,7 @@
- all: docs-am all-am
+ clean-noinstLTLIBRARIES:
+--- kpdf/xpdf/splash/Makefile.in
++++ kpdf/xpdf/splash/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
- .SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -437,9 +440,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+@@ -15,8 +15,6 @@
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ @SET_MAKE@
- mostlyclean-libtool:
-diff -Nru kdegraphics-3.4.2.orig/kpovmodeler/examples/Makefile.in kdegraphics-3.4.2/kpovmodeler/examples/Makefile.in
---- kdegraphics-3.4.2.orig/kpovmodeler/examples/Makefile.in 2005-07-20 20:08:45.000000000 +0000
-+++ kdegraphics-3.4.2/kpovmodeler/examples/Makefile.in 2005-07-31 18:53:35.664698872 +0000
-@@ -213,6 +213,9 @@
+-SOURCES = $(libsplash_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -244,6 +242,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11284,16 +12001,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -401,7 +404,7 @@
- all: docs-am all-recursive
+@@ -439,7 +440,7 @@
.SUFFIXES:
+ .SUFFIXES: .cc .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -439,9 +442,9 @@
+@@ -477,9 +478,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11304,45 +12021,55 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- mostlyclean-libtool:
-diff -Nru kdegraphics-3.4.2.orig/kpovmodeler/examples/scenes/advanced/Makefile.in kdegraphics-3.4.2/kpovmodeler/examples/scenes/advanced/Makefile.in
---- kdegraphics-3.4.2.orig/kpovmodeler/examples/scenes/advanced/Makefile.in 2005-07-20 20:08:45.000000000 +0000
-+++ kdegraphics-3.4.2/kpovmodeler/examples/scenes/advanced/Makefile.in 2005-07-31 18:53:35.745686560 +0000
-@@ -207,6 +207,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
- all: docs-am all-am
+ clean-noinstLTLIBRARIES:
+--- kpdf/xpdf/xpdf/Makefile.in
++++ kpdf/xpdf/xpdf/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
- .SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -434,9 +437,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+@@ -15,8 +15,6 @@
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ @SET_MAKE@
- mostlyclean-libtool:
-diff -Nru kdegraphics-3.4.2.orig/kpovmodeler/examples/scenes/csg/Makefile.in kdegraphics-3.4.2/kpovmodeler/examples/scenes/csg/Makefile.in
---- kdegraphics-3.4.2.orig/kpovmodeler/examples/scenes/csg/Makefile.in 2005-07-20 20:08:45.000000000 +0000
-+++ kdegraphics-3.4.2/kpovmodeler/examples/scenes/csg/Makefile.in 2005-07-31 18:53:35.760684280 +0000
-@@ -207,6 +207,9 @@
+-SOURCES = $(libxpdf_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -59,10 +57,10 @@
+ am_libxpdf_la_OBJECTS = Annot.lo Array.lo BuiltinFont.lo \
+ BuiltinFontTables.lo Catalog.lo CharCodeToUnicode.lo CMap.lo \
+ Decrypt.lo Dict.lo DCTStream.lo FontEncodingTables.lo \
+- FlateStream.lo Function.lo Gfx.lo GfxFont.lo GfxState.lo \
+- GlobalParams.lo JArithmeticDecoder.lo JBIG2Stream.lo Lexer.lo \
+- Link.lo NameToCharCode.lo Object.lo Outline.lo OutputDev.lo \
+- PDFDoc.lo PDFDocEncoding.lo PSTokenizer.lo Page.lo Parser.lo \
++ Function.lo Gfx.lo GfxFont.lo GfxState.lo GlobalParams.lo \
++ JArithmeticDecoder.lo JBIG2Stream.lo Lexer.lo Link.lo \
++ NameToCharCode.lo Object.lo Outline.lo OutputDev.lo PDFDoc.lo \
++ PDFDocEncoding.lo PSTokenizer.lo Page.lo Parser.lo \
+ PSOutputDev.lo SplashOutputDev.lo Stream.lo JPXStream.lo \
+ TextOutputDev.lo UnicodeMap.lo UnicodeTypeTable.lo XRef.lo
+ #>- libxpdf_la_OBJECTS = $(am_libxpdf_la_OBJECTS)
+@@ -71,10 +69,10 @@
+ libxpdf_la_nofinal_OBJECTS = Annot.lo Array.lo BuiltinFont.lo \
+ BuiltinFontTables.lo Catalog.lo CharCodeToUnicode.lo CMap.lo \
+ Decrypt.lo Dict.lo DCTStream.lo FontEncodingTables.lo \
+- FlateStream.lo Function.lo Gfx.lo GfxFont.lo GfxState.lo \
+- GlobalParams.lo JArithmeticDecoder.lo JBIG2Stream.lo Lexer.lo \
+- Link.lo NameToCharCode.lo Object.lo Outline.lo OutputDev.lo \
+- PDFDoc.lo PDFDocEncoding.lo PSTokenizer.lo Page.lo Parser.lo \
++ Function.lo Gfx.lo GfxFont.lo GfxState.lo GlobalParams.lo \
++ JArithmeticDecoder.lo JBIG2Stream.lo Lexer.lo Link.lo \
++ NameToCharCode.lo Object.lo Outline.lo OutputDev.lo PDFDoc.lo \
++ PDFDocEncoding.lo PSTokenizer.lo Page.lo Parser.lo \
+ PSOutputDev.lo SplashOutputDev.lo Stream.lo JPXStream.lo \
+ TextOutputDev.lo UnicodeMap.lo UnicodeTypeTable.lo XRef.lo
+ @KDE_USE_FINAL_FALSE at libxpdf_la_OBJECTS = $(libxpdf_la_nofinal_OBJECTS)
+@@ -252,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11352,16 +12079,25 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
- all: docs-am all-am
+@@ -439,7 +440,7 @@
+ libxpdf_la_LIBADD = $(LIB_X11) $(LIBFREETYPE_LIBS) $(LIBPAPER_LIBS) $(XFT_LIBS) $(LIBJPEG) ../goo/libgoo.la ../fofi/libfofi.la ../splash/libsplash.la
+ libxpdf_la_SOURCES = Annot.cc Array.cc BuiltinFont.cc BuiltinFontTables.cc \
+ Catalog.cc CharCodeToUnicode.cc CMap.cc Decrypt.cc Dict.cc DCTStream.cc \
+- FontEncodingTables.cc FlateStream.cc Function.cc Gfx.cc \
++ FontEncodingTables.cc Function.cc Gfx.cc \
+ GfxFont.cc GfxState.cc GlobalParams.cc JArithmeticDecoder.cc \
+ JBIG2Stream.cc Lexer.cc Link.cc NameToCharCode.cc Object.cc Outline.cc \
+ OutputDev.cc PDFDoc.cc PDFDocEncoding.cc PSTokenizer.cc \
+@@ -458,7 +459,7 @@
.SUFFIXES:
+ .SUFFIXES: .cc .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -496,9 +497,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11372,113 +12108,56 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- mostlyclean-libtool:
-diff -Nru kdegraphics-3.4.2.orig/kpovmodeler/examples/scenes/interior/Makefile.in kdegraphics-3.4.2/kpovmodeler/examples/scenes/interior/Makefile.in
---- kdegraphics-3.4.2.orig/kpovmodeler/examples/scenes/interior/Makefile.in 2005-07-20 20:08:45.000000000 +0000
-+++ kdegraphics-3.4.2/kpovmodeler/examples/scenes/interior/Makefile.in 2005-07-31 18:53:35.774682152 +0000
-@@ -207,6 +207,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
- all: docs-am all-am
+ clean-noinstLTLIBRARIES:
+@@ -528,7 +529,6 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/DCTStream.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/Decrypt.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/Dict.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/FlateStream.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/FontEncodingTables.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/Function.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/Gfx.Plo at am__quote@
+@@ -764,7 +764,7 @@
+ .NOEXPORT:
- .SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -434,9 +437,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ #>+ 2
+-KDE_DIST=PDFDocEncoding.h Link.h CompactFontTables.h NameToCharCode.h UnicodeTypeTable.h Array.h CharTypes.h JPXStream.h Lexer.h Stream.h PSOutputDev.h Annot.h UnicodeMap.h xpdf_config.h SplashOutputDev.h Stream-CCITT.h Object.h NameToUnicodeTable.h XRef.h Dict.h OutputDev.h Decrypt.h JBIG2Stream.h Catalog.h DCTStream.h Error.h GlobalParams.h UnicodeMapTables.h FontEncodingTables.h PDFDoc.h Gfx.h UTF8.h BuiltinFontTables.h GfxFont.h JArithmeticDecoder.h Parser.h CMap.h Function.h CharCodeToUnicode.h Makefile.in BuiltinFont.h FlateStream.h Page.h PSTokenizer.h ErrorCodes.h GfxState.h TextOutputDev.h Makefile.am Outline.h
++KDE_DIST=PDFDocEncoding.h Link.h CompactFontTables.h NameToCharCode.h UnicodeTypeTable.h Array.h CharTypes.h JPXStream.h Lexer.h Stream.h PSOutputDev.h Annot.h UnicodeMap.h SplashOutputDev.h xpdf_config.h Object.h Stream-CCITT.h NameToUnicodeTable.h XRef.h Dict.h OutputDev.h Decrypt.h JBIG2Stream.h Catalog.h DCTStream.h Error.h GlobalParams.h UnicodeMapTables.h FontEncodingTables.h PDFDoc.h Gfx.h BuiltinFontTables.h UTF8.h FlateStream.cc GfxFont.h JArithmeticDecoder.h Parser.h CMap.h Function.h CharCodeToUnicode.h Makefile.in BuiltinFont.h FlateStream.h Page.h PSTokenizer.h ErrorCodes.h GfxState.h TextOutputDev.h Makefile.am Outline.h
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ #>+ 2
+ docs-am:
+@@ -808,11 +808,11 @@
- mostlyclean-libtool:
-diff -Nru kdegraphics-3.4.2.orig/kpovmodeler/examples/scenes/lights/Makefile.in kdegraphics-3.4.2/kpovmodeler/examples/scenes/lights/Makefile.in
---- kdegraphics-3.4.2.orig/kpovmodeler/examples/scenes/lights/Makefile.in 2005-07-20 20:08:45.000000000 +0000
-+++ kdegraphics-3.4.2/kpovmodeler/examples/scenes/lights/Makefile.in 2005-07-31 18:53:35.792679416 +0000
-@@ -207,6 +207,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
- all: docs-am all-am
- .SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -434,9 +437,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ #>+ 11
+-libxpdf_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/Annot.cc $(srcdir)/Array.cc $(srcdir)/BuiltinFont.cc $(srcdir)/BuiltinFontTables.cc $(srcdir)/Catalog.cc $(srcdir)/CharCodeToUnicode.cc $(srcdir)/CMap.cc $(srcdir)/Decrypt.cc $(srcdir)/Dict.cc $(srcdir)/DCTStream.cc $(srcdir)/FontEncodingTables.cc $(srcdir)/FlateStream.cc $(srcdir)/Function.cc $(srcdir)/Gfx.cc $(srcdir)/GfxFont.cc $(srcdir)/GfxState.cc $(srcdir)/GlobalParams.cc $(srcdir)/JArithmeticDecoder.cc $(srcdir)/JBIG2Stream.cc $(srcdir)/Lexer.cc $(srcdir)/Link.cc $(srcdir)/NameToCharCode.cc $(srcdir)/Object.cc $(srcdir)/Outline.cc $(srcdir)/OutputDev.cc $(srcdir)/PDFDoc.cc $(srcdir)/PDFDocEncoding.cc $(srcdir)/PSTokenizer.cc $(srcdir)/Page.cc $(srcdir)/Parser.cc $(srcdir)/PSOutputDev.cc $(srcdir)/SplashOutputDev.cc $(srcdir)/Stream.cc $(srcdir)/JPXStream.cc $(srcdir)/TextOutputDev.cc $(srcdir)/UnicodeMap.cc $(srcdir)/UnicodeTypeTable.cc $(srcdir)/XRef.cc
++libxpdf_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/Annot.cc $(srcdir)/Array.cc $(srcdir)/BuiltinFont.cc $(srcdir)/BuiltinFontTables.cc $(srcdir)/Catalog.cc $(srcdir)/CharCodeToUnicode.cc $(srcdir)/CMap.cc $(srcdir)/Decrypt.cc $(srcdir)/Dict.cc $(srcdir)/DCTStream.cc $(srcdir)/FontEncodingTables.cc $(srcdir)/Function.cc $(srcdir)/Gfx.cc $(srcdir)/GfxFont.cc $(srcdir)/GfxState.cc $(srcdir)/GlobalParams.cc $(srcdir)/JArithmeticDecoder.cc $(srcdir)/JBIG2Stream.cc $(srcdir)/Lexer.cc $(srcdir)/Link.cc $(srcdir)/NameToCharCode.cc $(srcdir)/Object.cc $(srcdir)/Outline.cc $(srcdir)/OutputDev.cc $(srcdir)/PDFDoc.cc $(srcdir)/PDFDocEncoding.cc $(srcdir)/PSTokenizer.cc $(srcdir)/Page.cc $(srcdir)/Parser.cc $(srcdir)/PSOutputDev.cc $(srcdir)/SplashOutputDev.cc $(srcdir)/Stream.cc $(srcdir)/JPXStream.cc $(srcdir)/TextOutputDev.cc $(srcdir)/UnicodeMap.cc $(srcdir)/UnicodeTypeTable.cc $(srcdir)/XRef.cc
+ @echo 'creating libxpdf_la.all_cc.cc ...'; \
+ rm -f libxpdf_la.all_cc.files libxpdf_la.all_cc.final; \
+ echo "#define KDE_USE_FINAL 1" >> libxpdf_la.all_cc.final; \
+- for file in Annot.cc Array.cc BuiltinFont.cc BuiltinFontTables.cc Catalog.cc CharCodeToUnicode.cc CMap.cc Decrypt.cc Dict.cc DCTStream.cc FontEncodingTables.cc FlateStream.cc Function.cc Gfx.cc GfxFont.cc GfxState.cc GlobalParams.cc JArithmeticDecoder.cc JBIG2Stream.cc Lexer.cc Link.cc NameToCharCode.cc Object.cc Outline.cc OutputDev.cc PDFDoc.cc PDFDocEncoding.cc PSTokenizer.cc Page.cc Parser.cc PSOutputDev.cc SplashOutputDev.cc Stream.cc JPXStream.cc TextOutputDev.cc UnicodeMap.cc UnicodeTypeTable.cc XRef.cc ; do \
++ for file in Annot.cc Array.cc BuiltinFont.cc BuiltinFontTables.cc Catalog.cc CharCodeToUnicode.cc CMap.cc Decrypt.cc Dict.cc DCTStream.cc FontEncodingTables.cc Function.cc Gfx.cc GfxFont.cc GfxState.cc GlobalParams.cc JArithmeticDecoder.cc JBIG2Stream.cc Lexer.cc Link.cc NameToCharCode.cc Object.cc Outline.cc OutputDev.cc PDFDoc.cc PDFDocEncoding.cc PSTokenizer.cc Page.cc Parser.cc PSOutputDev.cc SplashOutputDev.cc Stream.cc JPXStream.cc TextOutputDev.cc UnicodeMap.cc UnicodeTypeTable.cc XRef.cc ; do \
+ echo "#include \"$$file\"" >> libxpdf_la.all_cc.files; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libxpdf_la.all_cc.final; \
+ done; \
+--- kpovmodeler/Makefile.in
++++ kpovmodeler/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+@@ -18,8 +18,6 @@
- mostlyclean-libtool:
-diff -Nru kdegraphics-3.4.2.orig/kpovmodeler/examples/scenes/Makefile.in kdegraphics-3.4.2/kpovmodeler/examples/scenes/Makefile.in
---- kdegraphics-3.4.2.orig/kpovmodeler/examples/scenes/Makefile.in 2005-07-20 20:08:45.000000000 +0000
-+++ kdegraphics-3.4.2/kpovmodeler/examples/scenes/Makefile.in 2005-07-31 18:53:35.731688688 +0000
-@@ -213,6 +213,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -401,7 +404,7 @@
- all: docs-am all-recursive
- .SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -439,9 +442,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
-diff -Nru kdegraphics-3.4.2.orig/kpovmodeler/examples/scenes/objects/Makefile.in kdegraphics-3.4.2/kpovmodeler/examples/scenes/objects/Makefile.in
---- kdegraphics-3.4.2.orig/kpovmodeler/examples/scenes/objects/Makefile.in 2005-07-20 20:08:45.000000000 +0000
-+++ kdegraphics-3.4.2/kpovmodeler/examples/scenes/objects/Makefile.in 2005-07-31 18:53:35.808676984 +0000
-@@ -207,6 +207,9 @@
+-SOURCES = $(libkpovmodeler_la_SOURCES) $(libkpovmodelerpart_la_SOURCES) $(kpovmodeler_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -441,6 +439,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11488,50 +12167,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -398,7 +401,7 @@
- all: docs-am all-am
+@@ -957,7 +958,7 @@
.SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -436,9 +439,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
-diff -Nru kdegraphics-3.4.2.orig/kpovmodeler/Makefile.in kdegraphics-3.4.2/kpovmodeler/Makefile.in
---- kdegraphics-3.4.2.orig/kpovmodeler/Makefile.in 2005-07-20 20:08:45.000000000 +0000
-+++ kdegraphics-3.4.2/kpovmodeler/Makefile.in 2005-07-31 18:53:35.648701304 +0000
-@@ -441,6 +441,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -957,7 +960,7 @@
-
- .SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -995,9 +998,9 @@
+@@ -995,9 +996,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11543,7 +12188,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1771,18 +1774,18 @@
+@@ -1771,18 +1772,18 @@
mocs: pmcylinderedit.moc
#>+ 3
@@ -11568,7 +12213,7 @@
#>+ 3
pmblobedit.moc: $(srcdir)/pmblobedit.h
-@@ -1820,18 +1823,18 @@
+@@ -1820,18 +1821,18 @@
mocs: pmobjectselect.moc
#>+ 3
@@ -11593,7 +12238,7 @@
#>+ 3
pmcameraedit.moc: $(srcdir)/pmcameraedit.h
-@@ -1841,18 +1844,18 @@
+@@ -1841,18 +1842,18 @@
mocs: pmcameraedit.moc
#>+ 3
@@ -11618,7 +12263,7 @@
#>+ 3
pmlayoutsettings.moc: $(srcdir)/pmlayoutsettings.h
-@@ -1876,25 +1879,25 @@
+@@ -1876,25 +1877,25 @@
mocs: pmdockwidget_private.moc
#>+ 3
@@ -11653,7 +12298,7 @@
#>+ 3
pmlightgroupedit.moc: $(srcdir)/pmlightgroupedit.h
-@@ -1904,11 +1907,11 @@
+@@ -1904,11 +1905,11 @@
mocs: pmlightgroupedit.moc
#>+ 3
@@ -11668,7 +12313,7 @@
#>+ 3
pmactions.moc: $(srcdir)/pmactions.h
-@@ -1932,13 +1935,6 @@
+@@ -1932,13 +1933,6 @@
mocs: pmlibrarybrowser.moc
#>+ 3
@@ -11682,7 +12327,7 @@
pmlightedit.moc: $(srcdir)/pmlightedit.h
$(MOC) $(srcdir)/pmlightedit.h -o pmlightedit.moc
-@@ -1946,11 +1942,11 @@
+@@ -1946,11 +1940,11 @@
mocs: pmlightedit.moc
#>+ 3
@@ -11697,7 +12342,7 @@
#>+ 3
pmobjectlibrarysettings.moc: $(srcdir)/pmobjectlibrarysettings.h
-@@ -1960,6 +1956,13 @@
+@@ -1960,6 +1954,13 @@
mocs: pmobjectlibrarysettings.moc
#>+ 3
@@ -11711,7 +12356,7 @@
pmfactory.moc: $(srcdir)/pmfactory.h
$(MOC) $(srcdir)/pmfactory.h -o pmfactory.moc
-@@ -1988,18 +1991,18 @@
+@@ -1988,18 +1989,18 @@
mocs: pmlatheedit.moc
#>+ 3
@@ -11736,7 +12381,7 @@
#>+ 3
pmclippedbyedit.moc: $(srcdir)/pmclippedbyedit.h
-@@ -2037,18 +2040,18 @@
+@@ -2037,18 +2038,18 @@
mocs: pmdialogeditbase.moc
#>+ 3
@@ -11761,7 +12406,7 @@
#>+ 3
pmboundedbyedit.moc: $(srcdir)/pmboundedbyedit.h
-@@ -2177,6 +2180,13 @@
+@@ -2177,6 +2178,13 @@
mocs: pmphotonsedit.moc
#>+ 3
@@ -11775,7 +12420,7 @@
pmsoredit.moc: $(srcdir)/pmsoredit.h
$(MOC) $(srcdir)/pmsoredit.h -o pmsoredit.moc
-@@ -2198,11 +2208,11 @@
+@@ -2198,11 +2206,11 @@
mocs: pmdeclareedit.moc
#>+ 3
@@ -11790,7 +12435,7 @@
#>+ 3
pmsqeedit.moc: $(srcdir)/pmsqeedit.h
-@@ -2212,25 +2222,25 @@
+@@ -2212,25 +2220,25 @@
mocs: pmsqeedit.moc
#>+ 3
@@ -11825,7 +12470,7 @@
#>+ 3
pmglview.moc: $(srcdir)/pmglview.h
-@@ -2240,13 +2250,6 @@
+@@ -2240,13 +2248,6 @@
mocs: pmglview.moc
#>+ 3
@@ -11839,7 +12484,7 @@
pmmaterialedit.moc: $(srcdir)/pmmaterialedit.h
$(MOC) $(srcdir)/pmmaterialedit.h -o pmmaterialedit.moc
-@@ -2359,18 +2362,18 @@
+@@ -2359,18 +2360,18 @@
mocs: pmpovrayrenderwidget.moc
#>+ 3
@@ -11864,7 +12509,7 @@
#>+ 3
pmgridsettings.moc: $(srcdir)/pmgridsettings.h
-@@ -2394,18 +2397,18 @@
+@@ -2394,18 +2395,18 @@
mocs: pmrendermanager.moc
#>+ 3
@@ -11889,7 +12534,7 @@
#>+ 3
pmheightfieldedit.moc: $(srcdir)/pmheightfieldedit.h
-@@ -2429,18 +2432,18 @@
+@@ -2429,18 +2430,18 @@
mocs: pmvectoredit.moc
#>+ 3
@@ -11914,7 +12559,7 @@
#>+ 3
pmrotateedit.moc: $(srcdir)/pmrotateedit.h
-@@ -2558,7 +2561,7 @@
+@@ -2558,7 +2559,7 @@
#>+ 3
clean-metasources:
@@ -11923,7 +12568,7 @@
#>+ 2
KDE_DIST=lo16-app-kpovmodeler.png cr32-mime-kpovmodeler_doc.png baseinsertrules.xml BUGS pmvariant.h pmenumproperty.h questionmark.png kdoc.rules kpovmodelershell.rc Makefile.am StyleConvention REQUIREMENTS pmalledits.h pmmetaobject.h lo32-app-kpovmodeler.png Makefile.in cr32-app-kpovmodeler.png povraydocmap.xml configure.in.in pmthreestate.h cr16-mime-kpovmodeler_doc.png kpovmodelerui.rc cr16-app-kpovmodeler.png cr48-mime-kpovmodeler_doc.png configure.in.bot kpovmodelerbrowser.rc cr48-app-kpovmodeler.png pminsertrules.dtd
-@@ -2577,32 +2580,32 @@
+@@ -2577,32 +2578,32 @@
#>+ 28
install-kde-icons:
@@ -11968,9 +12613,443 @@
#>+ 15
force-reedit:
-diff -Nru kdegraphics-3.4.2.orig/kpovmodeler/pics/crystalsvg/Makefile.in kdegraphics-3.4.2/kpovmodeler/pics/crystalsvg/Makefile.in
---- kdegraphics-3.4.2.orig/kpovmodeler/pics/crystalsvg/Makefile.in 2005-07-20 20:08:45.000000000 +0000
-+++ kdegraphics-3.4.2/kpovmodeler/pics/crystalsvg/Makefile.in 2005-07-31 18:53:35.994648712 +0000
+--- kpovmodeler/examples/Makefile.in
++++ kpovmodeler/examples/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -213,6 +213,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -401,7 +404,7 @@
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -439,9 +442,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
+--- kpovmodeler/examples/includes/Makefile.in
++++ kpovmodeler/examples/includes/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -213,6 +213,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -401,7 +404,7 @@
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -439,9 +442,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
+--- kpovmodeler/examples/includes/inlined/Makefile.in
++++ kpovmodeler/examples/includes/inlined/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -207,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -399,7 +402,7 @@
+ all: docs-am all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -437,9 +440,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
+--- kpovmodeler/examples/includes/original/Makefile.in
++++ kpovmodeler/examples/includes/original/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -207,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -399,7 +402,7 @@
+ all: docs-am all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -437,9 +440,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
+--- kpovmodeler/examples/scenes/Makefile.in
++++ kpovmodeler/examples/scenes/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -213,6 +213,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -401,7 +404,7 @@
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -439,9 +442,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
+--- kpovmodeler/examples/scenes/advanced/Makefile.in
++++ kpovmodeler/examples/scenes/advanced/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -207,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -396,7 +399,7 @@
+ all: docs-am all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -434,9 +437,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
+--- kpovmodeler/examples/scenes/csg/Makefile.in
++++ kpovmodeler/examples/scenes/csg/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -207,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -396,7 +399,7 @@
+ all: docs-am all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -434,9 +437,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
+--- kpovmodeler/examples/scenes/interior/Makefile.in
++++ kpovmodeler/examples/scenes/interior/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -207,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -396,7 +399,7 @@
+ all: docs-am all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -434,9 +437,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
+--- kpovmodeler/examples/scenes/lights/Makefile.in
++++ kpovmodeler/examples/scenes/lights/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -207,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -396,7 +399,7 @@
+ all: docs-am all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -434,9 +437,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
+--- kpovmodeler/examples/scenes/objects/Makefile.in
++++ kpovmodeler/examples/scenes/objects/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -207,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -398,7 +401,7 @@
+ all: docs-am all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -436,9 +439,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
+--- kpovmodeler/pics/Makefile.in
++++ kpovmodeler/pics/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -213,6 +213,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -401,7 +404,7 @@
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -439,9 +442,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
+--- kpovmodeler/pics/crystalsvg/Makefile.in
++++ kpovmodeler/pics/crystalsvg/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -197,6 +197,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -12411,6 +13490,7 @@
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmlistpattern.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlistpattern.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmaddpointabove.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddpointabove.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmskysphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmskysphere.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdrag.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdrag.png
$(INSTALL_DATA) $(srcdir)/cr22-action-pmprojectedthrough.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmprojectedthrough.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmtexturedeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturedeclare.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmtexturemapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturemapdeclare.png
@@ -12439,7 +13519,6 @@
+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmnormallist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormallist.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmspheresweep.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmspheresweep.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdifference.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdifference.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdrag.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdrag.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmcolormap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolormap.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmintersection.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmintersection.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmaddpoint.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddpoint.png
@@ -12840,6 +13919,7 @@
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlistpattern.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddpointabove.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmskysphere.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdrag.png
-rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmprojectedthrough.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturedeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturemapdeclare.png
@@ -12868,16 +13948,20 @@
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormallist.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmspheresweep.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdifference.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdrag.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolormap.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmintersection.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddpoint.png
#>+ 15
force-reedit:
-diff -Nru kdegraphics-3.4.2.orig/kpovmodeler/pics/locolor/Makefile.in kdegraphics-3.4.2/kpovmodeler/pics/locolor/Makefile.in
---- kdegraphics-3.4.2.orig/kpovmodeler/pics/locolor/Makefile.in 2005-07-20 20:08:45.000000000 +0000
-+++ kdegraphics-3.4.2/kpovmodeler/pics/locolor/Makefile.in 2005-07-31 18:53:36.047640656 +0000
+--- kpovmodeler/pics/locolor/Makefile.in
++++ kpovmodeler/pics/locolor/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -197,6 +197,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -13186,44 +14270,24 @@
#>+ 15
force-reedit:
-diff -Nru kdegraphics-3.4.2.orig/kpovmodeler/pics/Makefile.in kdegraphics-3.4.2/kpovmodeler/pics/Makefile.in
---- kdegraphics-3.4.2.orig/kpovmodeler/pics/Makefile.in 2005-07-20 20:08:45.000000000 +0000
-+++ kdegraphics-3.4.2/kpovmodeler/pics/Makefile.in 2005-07-31 18:53:35.823674704 +0000
-@@ -213,6 +213,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -401,7 +404,7 @@
- all: docs-am all-recursive
+--- kruler/Makefile.in
++++ kruler/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
- .SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -439,9 +442,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- mostlyclean-libtool:
-diff -Nru kdegraphics-3.4.2.orig/kruler/Makefile.in kdegraphics-3.4.2/kruler/Makefile.in
---- kdegraphics-3.4.2.orig/kruler/Makefile.in 2005-07-20 20:08:45.000000000 +0000
-+++ kdegraphics-3.4.2/kruler/Makefile.in 2005-07-31 18:53:36.083635184 +0000
-@@ -262,6 +262,9 @@
+-SOURCES = $(kruler_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -262,6 +260,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13233,7 +14297,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -461,7 +464,7 @@
+@@ -461,7 +462,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13242,7 +14306,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -499,9 +502,9 @@
+@@ -499,9 +500,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13254,9 +14318,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/kruler/pics/Makefile.in kdegraphics-3.4.2/kruler/pics/Makefile.in
---- kdegraphics-3.4.2.orig/kruler/pics/Makefile.in 2005-07-20 20:08:45.000000000 +0000
-+++ kdegraphics-3.4.2/kruler/pics/Makefile.in 2005-07-31 18:53:36.101632448 +0000
+--- kruler/pics/Makefile.in
++++ kruler/pics/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -207,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -13309,10 +14378,24 @@
#>+ 15
force-reedit:
-diff -Nru kdegraphics-3.4.2.orig/ksnapshot/Makefile.in kdegraphics-3.4.2/ksnapshot/Makefile.in
---- kdegraphics-3.4.2.orig/ksnapshot/Makefile.in 2005-07-20 20:08:45.000000000 +0000
-+++ kdegraphics-3.4.2/ksnapshot/Makefile.in 2005-07-31 18:53:36.144625912 +0000
-@@ -247,6 +247,9 @@
+--- ksnapshot/Makefile.in
++++ ksnapshot/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(ksnapshot_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -247,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13322,7 +14405,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -448,7 +451,7 @@
+@@ -448,7 +449,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13331,7 +14414,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -486,9 +489,9 @@
+@@ -486,9 +487,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13343,7 +14426,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -808,19 +811,19 @@
+@@ -808,19 +809,19 @@
#>+ 16
install-kde-icons:
@@ -13366,10 +14449,24 @@
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/ksnapshot.svgz
#>+ 15
-diff -Nru kdegraphics-3.4.2.orig/ksvg/core/Makefile.in kdegraphics-3.4.2/ksvg/core/Makefile.in
---- kdegraphics-3.4.2.orig/ksvg/core/Makefile.in 2005-07-20 20:08:45.000000000 +0000
-+++ kdegraphics-3.4.2/ksvg/core/Makefile.in 2005-07-31 18:53:36.209616032 +0000
-@@ -248,6 +248,9 @@
+--- ksvg/Makefile.in
++++ ksvg/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libksvg_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -259,6 +257,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13379,16 +14476,64 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -446,7 +449,7 @@
+@@ -459,7 +460,7 @@
.SUFFIXES:
+ .SUFFIXES: .cc .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -497,9 +498,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- ksvg/core/Makefile.in
++++ ksvg/core/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(libksvgcore_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -248,6 +246,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -446,7 +447,7 @@
+
+ .SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -484,9 +487,9 @@
+@@ -484,9 +485,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13400,7 +14545,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -790,22 +793,22 @@
+@@ -790,22 +791,22 @@
mocs: KSVGReader.moc
#>+ 3
@@ -13430,10 +14575,24 @@
#>+ 2
KDE_DIST=KSVGHelper.h KSVGReader.h KSVGLoader.h Makefile.am KSVGTextChunk.h Makefile.in ksvgrenderer.desktop
-diff -Nru kdegraphics-3.4.2.orig/ksvg/dom/Makefile.in kdegraphics-3.4.2/ksvg/dom/Makefile.in
---- kdegraphics-3.4.2.orig/ksvg/dom/Makefile.in 2005-07-20 20:08:45.000000000 +0000
-+++ kdegraphics-3.4.2/ksvg/dom/Makefile.in 2005-07-31 18:53:36.315599920 +0000
-@@ -363,6 +363,9 @@
+--- ksvg/dom/Makefile.in
++++ ksvg/dom/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libksvgdom_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -363,6 +361,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13443,7 +14602,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -607,7 +610,7 @@
+@@ -607,7 +608,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -13452,7 +14611,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -645,9 +648,9 @@
+@@ -645,9 +646,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13464,10 +14623,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdegraphics-3.4.2.orig/ksvg/ecma/Makefile.in kdegraphics-3.4.2/ksvg/ecma/Makefile.in
---- kdegraphics-3.4.2.orig/ksvg/ecma/Makefile.in 2005-07-20 20:08:45.000000000 +0000
-+++ kdegraphics-3.4.2/ksvg/ecma/Makefile.in 2005-07-31 18:53:36.342595816 +0000
-@@ -234,6 +234,9 @@
+--- ksvg/ecma/Makefile.in
++++ ksvg/ecma/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libksvgecma_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -234,6 +232,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13477,7 +14650,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -427,7 +430,7 @@
+@@ -427,7 +428,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13486,7 +14659,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -465,9 +468,9 @@
+@@ -465,9 +466,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13498,10 +14671,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdegraphics-3.4.2.orig/ksvg/impl/libs/art_support/Makefile.in kdegraphics-3.4.2/ksvg/impl/libs/art_support/Makefile.in
---- kdegraphics-3.4.2.orig/ksvg/impl/libs/art_support/Makefile.in 2005-07-20 20:08:46.000000000 +0000
-+++ kdegraphics-3.4.2/ksvg/impl/libs/art_support/Makefile.in 2005-07-31 18:53:36.522568456 +0000
-@@ -224,6 +224,9 @@
+--- ksvg/impl/Makefile.in
++++ ksvg/impl/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libksvgdomimpl_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -399,6 +397,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13511,16 +14698,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -415,7 +418,7 @@
+@@ -700,7 +701,7 @@
.SUFFIXES:
- .SUFFIXES: .c .lo .o .obj
+ .SUFFIXES: .cc .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -453,9 +456,9 @@
+@@ -738,9 +739,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13532,9 +14719,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdegraphics-3.4.2.orig/ksvg/impl/libs/libtext2path/Makefile.in kdegraphics-3.4.2/ksvg/impl/libs/libtext2path/Makefile.in
---- kdegraphics-3.4.2.orig/ksvg/impl/libs/libtext2path/Makefile.in 2005-07-20 20:08:46.000000000 +0000
-+++ kdegraphics-3.4.2/ksvg/impl/libs/libtext2path/Makefile.in 2005-07-31 18:53:36.541565568 +0000
+@@ -1282,7 +1283,7 @@
+ -rm -f SVGScriptElementImpl.moc SVGDocumentImpl.moc SVGImageElementImpl.moc SVGTimeScheduler.moc
+
+ #>+ 2
+-KDE_DIST=SVGList.h SVGFEGaussianBlurElementImpl.h SVGComponentTransferFunctionElementImpl.h SVGFontFaceFormatElementImpl.h SVGFEMorphologyElementImpl.h SVGPaintServerImpl.h SVGStringListImpl.h SVGLocatableImpl.h SVGAElementImpl.h SVGAltGlyphDefElementImpl.h SVGForeignObjectElementImpl.h SVGElementImpl.h SVGFESpotLightElementImpl.h SVGAnimateTransformElementImpl.h SVGAnimatedLengthListImpl.h SVGDefinitionSrcElementImpl.h SVGTitleElementImpl.h SVGTSpanElementImpl.h SVGStyleElementImpl.h SVGTransformListImpl.h SVGPathSegMovetoImpl.h SVGPathSegLinetoVerticalImpl.h SVGHelperImpl.h SVGSymbolElementImpl.h SVGFETileElementImpl.h SVGTextPositioningElementImpl.h SVGTestsImpl.h SVGTimeScheduler.h SVGNumberListImpl.h SVGPointImpl.h SVGShapeImpl.h SVGFilterElementImpl.h SVGFEDisplacementMapElementImpl.h SVGTransformImpl.h SVGFETurbulenceElementImpl.h SVGElementInstanceImpl.h SVGFEFuncRElementImpl.h SVGFEFuncAElementImpl.h SVGFESpecularLightingElementImpl.h SVGFEPointLightElementImpl.h SVGMissingGlyphElementImpl.h SVGLinearGradientElementImpl.h SVGAngleImpl.h SVGAnimatedPreserveAspectRatioImpl.h SVGEllipseElementImpl.h SVGFontElementImpl.h SVGGElementImpl.h SVGAnimatedStringImpl.h SVGPreserveAspectRatioImpl.h SVGMatrixImpl.h SVGPathSegLinetoHorizontalImpl.h SVGFitToViewBoxImpl.h SVGDescElementImpl.h SVGFEFuncBElementImpl.h SVGAnimateMotionElementImpl.h SVGPointListImpl.h SVGFontFaceElementImpl.h SVGRadialGradientElementImpl.h SVGFilterPrimitiveStandardAttributesImpl.h SVGPathElementImpl.h SVGAnimateColorElementImpl.h SVGPathSegArcImpl.h SVGFEMergeNodeElementImpl.h SVGFEFloodElementImpl.h SVGAnimatedNumberListImpl.h SVGGlyphElementImpl.h SVGAnimatedBooleanImpl.h SVGFEMergeElementImpl.h SVGColorProfileElementImpl.h SVGFontFaceNameElementImpl.h SVGFEColorMatrixElementImpl.h SVGCircleElementImpl.h SVGRectElementImpl.h SVGFEComponentTransferElementImpl.h SVGAnimatedEnumerationImpl.h SVGAnimatedPathDataImpl.h SVGFEOffsetElementImpl.h SVGPaintImpl.h SVGAnimatedNumberImpl.h Makefile.am SVGAnimateElementImpl.h SVGZoomAndPanImpl.h SVGFontFaceUriElementImpl.h SVGNumberImpl.h SVGElementInstanceListImpl.h SVGPathSegLinetoImpl.h SVGPatternElementImpl.h SVGAltGlyphElementImpl.h SVGStylableImpl.h SVGColorProfileRuleImpl.h SVGAnimatedAngleImpl.h SVGURIReferenceImpl.h Makefile.in SVGEventImpl.h SVGLengthImpl.h SVGTransformableImpl.h SVGTextContentElementImpl.h SVGDefsElementImpl.h SVGMPathElementImpl.h SVGSwitchElementImpl.h SVGFECompositeElementImpl.h SVGHKernElementImpl.h SVGAnimatedLengthImpl.h SVGAnimatedRectImpl.h SVGStopElementImpl.h SVGSetElementImpl.h SVGMarkerElementImpl.h SVGViewElementImpl.h SVGFEFuncGElementImpl.h SVGFEConvolveMatrixElementImpl.h SVGPathSegCurvetoCubicSmoothImpl.h SVGWindowImpl.h SVGImageElementImpl.h SVGAnimationElementImpl.h SVGPathSegClosePathImpl.h SVGFEImageElementImpl.h SVGClipPathElementImpl.h SVGVKernElementImpl.h SVGZoomEventImpl.h SVGSVGElementImpl.h SVGTRefElementImpl.h SVGPathSegListImpl.h SVGICCColorImpl.h SVGPolyElementImpl.h svgpathparser.h SVGTextPathElementImpl.h SVGPathSegImpl.h SVGAnimatedIntegerImpl.h LRUCache.h SVGColorImpl.h SVGGlyphRefElementImpl.h SVGDocumentImpl.h SVGScriptElementImpl.h SVGPathSegCurvetoQuadraticSmoothImpl.h SVGAnimatedTransformListImpl.h SVGCSSRuleImpl.h SVGContainerImpl.h SVGEcma.h SVGPolylineElementImpl.h SVGCursorElementImpl.h SVGMetadataElementImpl.h SVGLengthListImpl.h SVGFEBlendElementImpl.h SVGLangSpaceImpl.h SVGAnimatedPointsImpl.h SVGUseElementImpl.h SVGViewSpecImpl.h SVGFEDiffuseLightingElementImpl.h SVGExternalResourcesRequiredImpl.h SVGFontFaceSrcElementImpl.h SVGTextElementImpl.h SVGGradientElementImpl.h SVGLineElementImpl.h SVGUnitConverter.h SVGBBoxTarget.h SVGRectImpl.h SVGPolygonElementImpl.h SVGFEDistantLightElementImpl.h SVGPathSegCurvetoCubicImpl.h SVGMaskElementImpl.h SVGPathSegCurvetoQuadraticImpl.h
++KDE_DIST=SVGList.h SVGFEGaussianBlurElementImpl.h SVGComponentTransferFunctionElementImpl.h SVGFontFaceFormatElementImpl.h SVGFEMorphologyElementImpl.h SVGPaintServerImpl.h SVGStringListImpl.h SVGLocatableImpl.h SVGAltGlyphDefElementImpl.h SVGAElementImpl.h SVGForeignObjectElementImpl.h SVGElementImpl.h SVGFESpotLightElementImpl.h SVGAnimateTransformElementImpl.h SVGAnimatedLengthListImpl.h SVGDefinitionSrcElementImpl.h SVGTitleElementImpl.h SVGTSpanElementImpl.h SVGStyleElementImpl.h SVGTransformListImpl.h SVGPathSegMovetoImpl.h SVGPathSegLinetoVerticalImpl.h SVGHelperImpl.h SVGSymbolElementImpl.h SVGFETileElementImpl.h SVGTextPositioningElementImpl.h SVGTestsImpl.h SVGNumberListImpl.h SVGTimeScheduler.h SVGPointImpl.h SVGShapeImpl.h SVGFilterElementImpl.h SVGFEDisplacementMapElementImpl.h SVGTransformImpl.h SVGFETurbulenceElementImpl.h SVGElementInstanceImpl.h SVGFEFuncRElementImpl.h SVGFEFuncAElementImpl.h SVGFESpecularLightingElementImpl.h SVGFEPointLightElementImpl.h SVGMissingGlyphElementImpl.h SVGLinearGradientElementImpl.h SVGAngleImpl.h SVGAnimatedPreserveAspectRatioImpl.h SVGEllipseElementImpl.h SVGFontElementImpl.h SVGGElementImpl.h SVGAnimatedStringImpl.h SVGPreserveAspectRatioImpl.h SVGMatrixImpl.h SVGPathSegLinetoHorizontalImpl.h SVGFitToViewBoxImpl.h SVGDescElementImpl.h SVGFEFuncBElementImpl.h SVGAnimateMotionElementImpl.h SVGPointListImpl.h SVGFontFaceElementImpl.h SVGRadialGradientElementImpl.h SVGFilterPrimitiveStandardAttributesImpl.h SVGPathElementImpl.h SVGAnimateColorElementImpl.h SVGPathSegArcImpl.h SVGFEMergeNodeElementImpl.h SVGFEFloodElementImpl.h SVGAnimatedNumberListImpl.h SVGGlyphElementImpl.h SVGAnimatedBooleanImpl.h SVGFEMergeElementImpl.h SVGColorProfileElementImpl.h SVGFontFaceNameElementImpl.h SVGFEColorMatrixElementImpl.h SVGCircleElementImpl.h SVGRectElementImpl.h SVGFEComponentTransferElementImpl.h SVGAnimatedEnumerationImpl.h SVGAnimatedPathDataImpl.h SVGFEOffsetElementImpl.h SVGPaintImpl.h SVGAnimatedNumberImpl.h Makefile.am SVGAnimateElementImpl.h SVGZoomAndPanImpl.h SVGFontFaceUriElementImpl.h SVGNumberImpl.h SVGElementInstanceListImpl.h SVGPathSegLinetoImpl.h SVGPatternElementImpl.h SVGAltGlyphElementImpl.h SVGStylableImpl.h SVGColorProfileRuleImpl.h SVGAnimatedAngleImpl.h SVGURIReferenceImpl.h Makefile.in SVGEventImpl.h SVGLengthImpl.h SVGTransformableImpl.h SVGTextContentElementImpl.h SVGMPathElementImpl.h SVGDefsElementImpl.h SVGSwitchElementImpl.h SVGFECompositeElementImpl.h SVGHKernElementImpl.h SVGAnimatedLengthImpl.h SVGAnimatedRectImpl.h SVGStopElementImpl.h SVGSetElementImpl.h SVGMarkerElementImpl.h SVGViewElementImpl.h SVGFEFuncGElementImpl.h SVGFEConvolveMatrixElementImpl.h SVGPathSegCurvetoCubicSmoothImpl.h SVGWindowImpl.h SVGImageElementImpl.h SVGAnimationElementImpl.h SVGPathSegClosePathImpl.h SVGFEImageElementImpl.h SVGClipPathElementImpl.h SVGVKernElementImpl.h SVGZoomEventImpl.h SVGTRefElementImpl.h SVGSVGElementImpl.h SVGPathSegListImpl.h SVGICCColorImpl.h SVGPolyElementImpl.h svgpathparser.h SVGTextPathElementImpl.h SVGPathSegImpl.h SVGAnimatedIntegerImpl.h LRUCache.h SVGColorImpl.h SVGGlyphRefElementImpl.h SVGDocumentImpl.h SVGScriptElementImpl.h SVGPathSegCurvetoQuadraticSmoothImpl.h SVGAnimatedTransformListImpl.h SVGCSSRuleImpl.h SVGContainerImpl.h SVGEcma.h SVGPolylineElementImpl.h SVGCursorElementImpl.h SVGMetadataElementImpl.h SVGLengthListImpl.h SVGFEBlendElementImpl.h SVGLangSpaceImpl.h SVGAnimatedPointsImpl.h SVGUseElementImpl.h SVGViewSpecImpl.h SVGFEDiffuseLightingElementImpl.h SVGExternalResourcesRequiredImpl.h SVGFontFaceSrcElementImpl.h SVGTextElementImpl.h SVGGradientElementImpl.h SVGLineElementImpl.h SVGUnitConverter.h SVGBBoxTarget.h SVGRectImpl.h SVGPolygonElementImpl.h SVGFEDistantLightElementImpl.h SVGPathSegCurvetoCubicImpl.h SVGMaskElementImpl.h SVGPathSegCurvetoQuadraticImpl.h
+
+ #>+ 2
+ docs-am:
+--- ksvg/impl/libs/Makefile.in
++++ ksvg/impl/libs/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -213,6 +213,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -13545,7 +14746,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -402,7 +405,7 @@
+@@ -401,7 +404,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -13554,7 +14755,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -440,9 +443,9 @@
+@@ -439,9 +442,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13566,10 +14767,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdegraphics-3.4.2.orig/ksvg/impl/libs/libtext2path/src/Makefile.in kdegraphics-3.4.2/ksvg/impl/libs/libtext2path/src/Makefile.in
---- kdegraphics-3.4.2.orig/ksvg/impl/libs/libtext2path/src/Makefile.in 2005-07-20 20:08:46.000000000 +0000
-+++ kdegraphics-3.4.2/ksvg/impl/libs/libtext2path/src/Makefile.in 2005-07-31 18:53:36.566561768 +0000
-@@ -247,6 +247,9 @@
+--- ksvg/impl/libs/art_support/Makefile.in
++++ ksvg/impl/libs/art_support/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libksvgart_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -224,6 +222,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13579,16 +14794,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -442,7 +445,7 @@
+@@ -415,7 +416,7 @@
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
+ .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -480,9 +483,9 @@
+@@ -453,9 +454,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13598,11 +14813,16 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/ksvg/impl/libs/Makefile.in kdegraphics-3.4.2/ksvg/impl/libs/Makefile.in
---- kdegraphics-3.4.2.orig/ksvg/impl/libs/Makefile.in 2005-07-20 20:08:46.000000000 +0000
-+++ kdegraphics-3.4.2/ksvg/impl/libs/Makefile.in 2005-07-31 18:53:36.502571496 +0000
+
+ clean-noinstLTLIBRARIES:
+--- ksvg/impl/libs/libtext2path/Makefile.in
++++ ksvg/impl/libs/libtext2path/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -213,6 +213,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -13613,7 +14833,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -401,7 +404,7 @@
+@@ -402,7 +405,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -13622,7 +14842,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -439,9 +442,9 @@
+@@ -440,9 +443,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13634,10 +14854,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdegraphics-3.4.2.orig/ksvg/impl/libs/xrgbrender/Makefile.in kdegraphics-3.4.2/ksvg/impl/libs/xrgbrender/Makefile.in
---- kdegraphics-3.4.2.orig/ksvg/impl/libs/xrgbrender/Makefile.in 2005-07-20 20:08:46.000000000 +0000
-+++ kdegraphics-3.4.2/ksvg/impl/libs/xrgbrender/Makefile.in 2005-07-31 18:53:36.607555536 +0000
-@@ -224,6 +224,9 @@
+--- ksvg/impl/libs/libtext2path/src/Makefile.in
++++ ksvg/impl/libs/libtext2path/src/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libtext2path_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -247,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13647,16 +14881,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -415,7 +418,7 @@
+@@ -442,7 +443,7 @@
.SUFFIXES:
- .SUFFIXES: .c .lo .o .obj
+ .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -453,9 +456,9 @@
+@@ -480,9 +481,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13666,12 +14900,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- ksvg/impl/libs/xrgbrender/Makefile.in
++++ ksvg/impl/libs/xrgbrender/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
- clean-noinstLTLIBRARIES:
-diff -Nru kdegraphics-3.4.2.orig/ksvg/impl/Makefile.in kdegraphics-3.4.2/ksvg/impl/Makefile.in
---- kdegraphics-3.4.2.orig/ksvg/impl/Makefile.in 2005-07-20 20:08:46.000000000 +0000
-+++ kdegraphics-3.4.2/ksvg/impl/Makefile.in 2005-07-31 18:53:36.484574232 +0000
-@@ -399,6 +399,9 @@
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libksvgxrgbrender_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -224,6 +222,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13681,16 +14929,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -700,7 +703,7 @@
+@@ -415,7 +416,7 @@
.SUFFIXES:
- .SUFFIXES: .cc .cpp .lo .o .obj
+ .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -738,9 +741,9 @@
+@@ -453,9 +454,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13702,19 +14950,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -1282,7 +1285,7 @@
- -rm -f SVGScriptElementImpl.moc SVGDocumentImpl.moc SVGImageElementImpl.moc SVGTimeScheduler.moc
+--- ksvg/plugin/Makefile.in
++++ ksvg/plugin/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
- #>+ 2
--KDE_DIST=SVGList.h SVGFEGaussianBlurElementImpl.h SVGComponentTransferFunctionElementImpl.h SVGFontFaceFormatElementImpl.h SVGFEMorphologyElementImpl.h SVGPaintServerImpl.h SVGStringListImpl.h SVGLocatableImpl.h SVGAElementImpl.h SVGAltGlyphDefElementImpl.h SVGForeignObjectElementImpl.h SVGElementImpl.h SVGFESpotLightElementImpl.h SVGAnimateTransformElementImpl.h SVGAnimatedLengthListImpl.h SVGDefinitionSrcElementImpl.h SVGTitleElementImpl.h SVGTSpanElementImpl.h SVGStyleElementImpl.h SVGTransformListImpl.h SVGPathSegMovetoImpl.h SVGPathSegLinetoVerticalImpl.h SVGHelperImpl.h SVGSymbolElementImpl.h SVGFETileElementImpl.h SVGTextPositioningElementImpl.h SVGTestsImpl.h SVGTimeScheduler.h SVGNumberListImpl.h SVGPointImpl.h SVGShapeImpl.h SVGFilterElementImpl.h SVGFEDisplacementMapElementImpl.h SVGTransformImpl.h SVGFETurbulenceElementImpl.h SVGElementInstanceImpl.h SVGFEFuncRElementImpl.h SVGFEFuncAElementImpl.h SVGFESpecularLightingElementImpl.h SVGFEPointLightElementImpl.h SVGMissingGlyphElementImpl.h SVGLinearGradientElementImpl.h SVGAngleImpl.h SVGAnimatedPreserveAspectRatioImpl.h SVGEllipseElementImpl.h SVGFontElementImpl.h SVGGElementImpl.h SVGAnimatedStringImpl.h SVGPreserveAspectRatioImpl.h SVGMatrixImpl.h SVGPathSegLinetoHorizontalImpl.h SVGFitToViewBoxImpl.h SVGDescElementImpl.h SVGFEFuncBElementImpl.h SVGAnimateMotionElementImpl.h SVGPointListImpl.h SVGFontFaceElementImpl.h SVGRadialGradientElementImpl.h SVGFilterPrimitiveStandardAttributesImpl.h SVGPathElementImpl.h SVGAnimateColorElementImpl.h SVGPathSegArcImpl.h SVGFEMergeNodeElementImpl.h SVGFEFloodElementImpl.h SVGAnimatedNumberListImpl.h SVGGlyphElementImpl.h SVGAnimatedBooleanImpl.h SVGFEMergeElementImpl.h SVGColorProfileElementImpl.h SVGFontFaceNameElementImpl.h SVGFEColorMatrixElementImpl.h SVGCircleElementImpl.h SVGRectElementImpl.h SVGFEComponentTransferElementImpl.h SVGAnimatedEnumerationImpl.h SVGAnimatedPathDataImpl.h SVGFEOffsetElementImpl.h SVGPaintImpl.h SVGAnimatedNumberImpl.h Makefile.am SVGAnimateElementImpl.h SVGZoomAndPanImpl.h SVGFontFaceUriElementImpl.h SVGNumberImpl.h SVGElementInstanceListImpl.h SVGPathSegLinetoImpl.h SVGPatternElementImpl.h SVGAltGlyphElementImpl.h SVGStylableImpl.h SVGColorProfileRuleImpl.h SVGAnimatedAngleImpl.h SVGURIReferenceImpl.h Makefile.in SVGEventImpl.h SVGLengthImpl.h SVGTransformableImpl.h SVGTextContentElementImpl.h SVGDefsElementImpl.h SVGMPathElementImpl.h SVGSwitchElementImpl.h SVGFECompositeElementImpl.h SVGHKernElementImpl.h SVGAnimatedLengthImpl.h SVGAnimatedRectImpl.h SVGStopElementImpl.h SVGSetElementImpl.h SVGMarkerElementImpl.h SVGViewElementImpl.h SVGFEFuncGElementImpl.h SVGFEConvolveMatrixElementImpl.h SVGPathSegCurvetoCubicSmoothImpl.h SVGWindowImpl.h SVGImageElementImpl.h SVGAnimationElementImpl.h SVGPathSegClosePathImpl.h SVGFEImageElementImpl.h SVGClipPathElementImpl.h SVGVKernElementImpl.h SVGZoomEventImpl.h SVGSVGElementImpl.h SVGTRefElementImpl.h SVGPathSegListImpl.h SVGICCColorImpl.h SVGPolyElementImpl.h svgpathparser.h SVGTextPathElementImpl.h SVGPathSegImpl.h SVGAnimatedIntegerImpl.h LRUCache.h SVGColorImpl.h SVGGlyphRefElementImpl.h SVGDocumentImpl.h SVGScriptElementImpl.h SVGPathSegCurvetoQuadraticSmoothImpl.h SVGAnimatedTransformListImpl.h SVGCSSRuleImpl.h SVGContainerImpl.h SVGEcma.h SVGPolylineElementImpl.h SVGCursorElementImpl.h SVGMetadataElementImpl.h SVGLengthListImpl.h SVGFEBlendElementImpl.h SVGLangSpaceImpl.h SVGAnimatedPointsImpl.h SVGUseElementImpl.h SVGViewSpecImpl.h SVGFEDiffuseLightingElementImpl.h SVGExternalResourcesRequiredImpl.h SVGFontFaceSrcElementImpl.h SVGTextElementImpl.h SVGGradientElementImpl.h SVGLineElementImpl.h SVGUnitConverter.h SVGBBoxTarget.h SVGRectImpl.h SVGPolygonElementImpl.h SVGFEDistantLightElementImpl.h SVGPathSegCurvetoCubicImpl.h SVGMaskElementImpl.h SVGPathSegCurvetoQuadraticImpl.h
-+KDE_DIST=SVGList.h SVGFEGaussianBlurElementImpl.h SVGComponentTransferFunctionElementImpl.h SVGFontFaceFormatElementImpl.h SVGFEMorphologyElementImpl.h SVGPaintServerImpl.h SVGStringListImpl.h SVGLocatableImpl.h SVGAltGlyphDefElementImpl.h SVGAElementImpl.h SVGForeignObjectElementImpl.h SVGElementImpl.h SVGFESpotLightElementImpl.h SVGAnimateTransformElementImpl.h SVGAnimatedLengthListImpl.h SVGDefinitionSrcElementImpl.h SVGTitleElementImpl.h SVGTSpanElementImpl.h SVGStyleElementImpl.h SVGTransformListImpl.h SVGPathSegMovetoImpl.h SVGPathSegLinetoVerticalImpl.h SVGHelperImpl.h SVGSymbolElementImpl.h SVGFETileElementImpl.h SVGTextPositioningElementImpl.h SVGTestsImpl.h SVGNumberListImpl.h SVGTimeScheduler.h SVGPointImpl.h SVGShapeImpl.h SVGFilterElementImpl.h SVGFEDisplacementMapElementImpl.h SVGTransformImpl.h SVGFETurbulenceElementImpl.h SVGElementInstanceImpl.h SVGFEFuncRElementImpl.h SVGFEFuncAElementImpl.h SVGFESpecularLightingElementImpl.h SVGFEPointLightElementImpl.h SVGMissingGlyphElementImpl.h SVGLinearGradientElementImpl.h SVGAngleImpl.h SVGAnimatedPreserveAspectRatioImpl.h SVGEllipseElementImpl.h SVGFontElementImpl.h SVGGElementImpl.h SVGAnimatedStringImpl.h SVGPreserveAspectRatioImpl.h SVGMatrixImpl.h SVGPathSegLinetoHorizontalImpl.h SVGFitToViewBoxImpl.h SVGDescElementImpl.h SVGFEFuncBElementImpl.h SVGAnimateMotionElementImpl.h SVGPointListImpl.h SVGFontFaceElementImpl.h SVGRadialGradientElementImpl.h SVGFilterPrimitiveStandardAttributesImpl.h SVGPathElementImpl.h SVGAnimateColorElementImpl.h SVGPathSegArcImpl.h SVGFEMergeNodeElementImpl.h SVGFEFloodElementImpl.h SVGAnimatedNumberListImpl.h SVGGlyphElementImpl.h SVGAnimatedBooleanImpl.h SVGFEMergeElementImpl.h SVGColorProfileElementImpl.h SVGFontFaceNameElementImpl.h SVGFEColorMatrixElementImpl.h SVGCircleElementImpl.h SVGRectElementImpl.h SVGFEComponentTransferElementImpl.h SVGAnimatedEnumerationImpl.h SVGAnimatedPathDataImpl.h SVGFEOffsetElementImpl.h SVGPaintImpl.h SVGAnimatedNumberImpl.h Makefile.am SVGAnimateElementImpl.h SVGZoomAndPanImpl.h SVGFontFaceUriElementImpl.h SVGNumberImpl.h SVGElementInstanceListImpl.h SVGPathSegLinetoImpl.h SVGPatternElementImpl.h SVGAltGlyphElementImpl.h SVGStylableImpl.h SVGColorProfileRuleImpl.h SVGAnimatedAngleImpl.h SVGURIReferenceImpl.h Makefile.in SVGEventImpl.h SVGLengthImpl.h SVGTransformableImpl.h SVGTextContentElementImpl.h SVGMPathElementImpl.h SVGDefsElementImpl.h SVGSwitchElementImpl.h SVGFECompositeElementImpl.h SVGHKernElementImpl.h SVGAnimatedLengthImpl.h SVGAnimatedRectImpl.h SVGStopElementImpl.h SVGSetElementImpl.h SVGMarkerElementImpl.h SVGViewElementImpl.h SVGFEFuncGElementImpl.h SVGFEConvolveMatrixElementImpl.h SVGPathSegCurvetoCubicSmoothImpl.h SVGWindowImpl.h SVGImageElementImpl.h SVGAnimationElementImpl.h SVGPathSegClosePathImpl.h SVGFEImageElementImpl.h SVGClipPathElementImpl.h SVGVKernElementImpl.h SVGZoomEventImpl.h SVGTRefElementImpl.h SVGSVGElementImpl.h SVGPathSegListImpl.h SVGICCColorImpl.h SVGPolyElementImpl.h svgpathparser.h SVGTextPathElementImpl.h SVGPathSegImpl.h SVGAnimatedIntegerImpl.h LRUCache.h SVGColorImpl.h SVGGlyphRefElementImpl.h SVGDocumentImpl.h SVGScriptElementImpl.h SVGPathSegCurvetoQuadraticSmoothImpl.h SVGAnimatedTransformListImpl.h SVGCSSRuleImpl.h SVGContainerImpl.h SVGEcma.h SVGPolylineElementImpl.h SVGCursorElementImpl.h SVGMetadataElementImpl.h SVGLengthListImpl.h SVGFEBlendElementImpl.h SVGLangSpaceImpl.h SVGAnimatedPointsImpl.h SVGUseElementImpl.h SVGViewSpecImpl.h SVGFEDiffuseLightingElementImpl.h SVGExternalResourcesRequiredImpl.h SVGFontFaceSrcElementImpl.h SVGTextElementImpl.h SVGGradientElementImpl.h SVGLineElementImpl.h SVGUnitConverter.h SVGBBoxTarget.h SVGRectImpl.h SVGPolygonElementImpl.h SVGFEDistantLightElementImpl.h SVGPathSegCurvetoCubicImpl.h SVGMaskElementImpl.h SVGPathSegCurvetoQuadraticImpl.h
+@@ -17,8 +17,6 @@
- #>+ 2
- docs-am:
-diff -Nru kdegraphics-3.4.2.orig/ksvg/Makefile.in kdegraphics-3.4.2/ksvg/Makefile.in
---- kdegraphics-3.4.2.orig/ksvg/Makefile.in 2005-07-20 20:08:45.000000000 +0000
-+++ kdegraphics-3.4.2/ksvg/Makefile.in 2005-07-31 18:53:36.175621200 +0000
-@@ -259,6 +259,9 @@
+
+
+-SOURCES = $(libksvgplugin_la_SOURCES) $(svgthumbnail_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -272,6 +270,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13724,16 +14977,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -459,7 +462,7 @@
+@@ -478,7 +479,7 @@
.SUFFIXES:
- .SUFFIXES: .cc .lo .o .obj
+ .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -497,9 +500,9 @@
+@@ -516,9 +517,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13743,12 +14996,60 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/ksvg/plugin/backends/agg/Makefile.in kdegraphics-3.4.2/ksvg/plugin/backends/agg/Makefile.in
---- kdegraphics-3.4.2.orig/ksvg/plugin/backends/agg/Makefile.in 2005-07-20 20:08:46.000000000 +0000
-+++ kdegraphics-3.4.2/ksvg/plugin/backends/agg/Makefile.in 2005-07-31 18:53:36.698541704 +0000
-@@ -248,6 +248,9 @@
+@@ -992,18 +993,18 @@
+ mocs: svgcreator.moc
+
+ #>+ 3
+-ksvg_plugin.moc: $(srcdir)/ksvg_plugin.h
+- $(MOC) $(srcdir)/ksvg_plugin.h -o ksvg_plugin.moc
++ksvg_factory.moc: $(srcdir)/ksvg_factory.h
++ $(MOC) $(srcdir)/ksvg_factory.h -o ksvg_factory.moc
+
+ #>+ 2
+-mocs: ksvg_plugin.moc
++mocs: ksvg_factory.moc
+
+ #>+ 3
+-ksvg_factory.moc: $(srcdir)/ksvg_factory.h
+- $(MOC) $(srcdir)/ksvg_factory.h -o ksvg_factory.moc
++ksvg_plugin.moc: $(srcdir)/ksvg_plugin.h
++ $(MOC) $(srcdir)/ksvg_plugin.h -o ksvg_plugin.moc
+
+ #>+ 2
+-mocs: ksvg_factory.moc
++mocs: ksvg_plugin.moc
+
+ #>+ 8
+ svgthumbnail.la.closure: $(svgthumbnail_la_OBJECTS) $(svgthumbnail_la_DEPENDENCIES)
+@@ -1016,7 +1017,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f ksvg_widget.moc svgcreator.moc ksvg_plugin.moc ksvg_factory.moc
++ -rm -f ksvg_widget.moc svgcreator.moc ksvg_factory.moc ksvg_plugin.moc
+
+ #>+ 2
+ KDE_DIST=ksvgplugin.rc svgthumbnail.desktop svgcreator.h ksvg_factory.h Makefile.am Makefile.in ksvg_widget.h ksvgplugin.desktop
+@@ -1067,7 +1068,7 @@
+
+
+ #>+ 11
+-libksvgplugin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ksvg_plugin.cpp $(srcdir)/ksvg_factory.cpp $(srcdir)/ksvg_widget.cpp ksvg_widget.moc ksvg_factory.moc ksvg_plugin.moc
++libksvgplugin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ksvg_plugin.cpp $(srcdir)/ksvg_factory.cpp $(srcdir)/ksvg_widget.cpp ksvg_widget.moc ksvg_plugin.moc ksvg_factory.moc
+ @echo 'creating libksvgplugin_la.all_cpp.cpp ...'; \
+ rm -f libksvgplugin_la.all_cpp.files libksvgplugin_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libksvgplugin_la.all_cpp.final; \
+--- ksvg/plugin/backends/Makefile.in
++++ ksvg/plugin/backends/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -213,6 +213,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13758,16 +15059,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -448,7 +451,7 @@
+@@ -401,7 +404,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -486,9 +489,9 @@
+@@ -439,9 +442,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13777,12 +15078,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/ksvg/plugin/backends/libart/Makefile.in kdegraphics-3.4.2/ksvg/plugin/backends/libart/Makefile.in
---- kdegraphics-3.4.2.orig/ksvg/plugin/backends/libart/Makefile.in 2005-07-20 20:08:46.000000000 +0000
-+++ kdegraphics-3.4.2/ksvg/plugin/backends/libart/Makefile.in 2005-07-31 18:53:36.726537448 +0000
-@@ -249,6 +249,9 @@
+
+ mostlyclean-libtool:
+--- ksvg/plugin/backends/agg/Makefile.in
++++ ksvg/plugin/backends/agg/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libksvgrendereragg_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -248,6 +246,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13792,7 +15107,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -445,7 +448,7 @@
+@@ -448,7 +449,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13801,7 +15116,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -483,9 +486,9 @@
+@@ -486,9 +487,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13813,10 +15128,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/ksvg/plugin/backends/Makefile.in kdegraphics-3.4.2/ksvg/plugin/backends/Makefile.in
---- kdegraphics-3.4.2.orig/ksvg/plugin/backends/Makefile.in 2005-07-20 20:08:46.000000000 +0000
-+++ kdegraphics-3.4.2/ksvg/plugin/backends/Makefile.in 2005-07-31 18:53:36.665546720 +0000
-@@ -213,6 +213,9 @@
+--- ksvg/plugin/backends/libart/Makefile.in
++++ ksvg/plugin/backends/libart/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libksvgrendererlibart_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -249,6 +247,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13826,16 +15155,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -401,7 +404,7 @@
- all: docs-am all-recursive
+@@ -445,7 +446,7 @@
.SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -439,9 +442,9 @@
+@@ -483,9 +484,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13845,12 +15174,17 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- ksvg/test/Makefile.in
++++ ksvg/test/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
- mostlyclean-libtool:
-diff -Nru kdegraphics-3.4.2.orig/ksvg/plugin/Makefile.in kdegraphics-3.4.2/ksvg/plugin/Makefile.in
---- kdegraphics-3.4.2.orig/ksvg/plugin/Makefile.in 2005-07-20 20:08:46.000000000 +0000
-+++ kdegraphics-3.4.2/ksvg/plugin/Makefile.in 2005-07-31 18:53:36.649549152 +0000
-@@ -272,6 +272,9 @@
+@@ -213,6 +213,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13860,16 +15194,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -478,7 +481,7 @@
+@@ -401,7 +404,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -516,9 +519,9 @@
+@@ -439,9 +442,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13879,55 +15213,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
-@@ -992,18 +995,18 @@
- mocs: svgcreator.moc
- #>+ 3
--ksvg_plugin.moc: $(srcdir)/ksvg_plugin.h
-- $(MOC) $(srcdir)/ksvg_plugin.h -o ksvg_plugin.moc
-+ksvg_factory.moc: $(srcdir)/ksvg_factory.h
-+ $(MOC) $(srcdir)/ksvg_factory.h -o ksvg_factory.moc
+ mostlyclean-libtool:
+--- ksvg/test/external/Makefile.in
++++ ksvg/test/external/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
- #>+ 2
--mocs: ksvg_plugin.moc
-+mocs: ksvg_factory.moc
+@@ -15,8 +15,6 @@
- #>+ 3
--ksvg_factory.moc: $(srcdir)/ksvg_factory.h
-- $(MOC) $(srcdir)/ksvg_factory.h -o ksvg_factory.moc
-+ksvg_plugin.moc: $(srcdir)/ksvg_plugin.h
-+ $(MOC) $(srcdir)/ksvg_plugin.h -o ksvg_plugin.moc
+ @SET_MAKE@
- #>+ 2
--mocs: ksvg_factory.moc
-+mocs: ksvg_plugin.moc
-
- #>+ 8
- svgthumbnail.la.closure: $(svgthumbnail_la_OBJECTS) $(svgthumbnail_la_DEPENDENCIES)
-@@ -1016,7 +1019,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f ksvg_widget.moc svgcreator.moc ksvg_plugin.moc ksvg_factory.moc
-+ -rm -f ksvg_widget.moc svgcreator.moc ksvg_factory.moc ksvg_plugin.moc
-
- #>+ 2
- KDE_DIST=ksvgplugin.rc svgthumbnail.desktop svgcreator.h ksvg_factory.h Makefile.am Makefile.in ksvg_widget.h ksvgplugin.desktop
-@@ -1067,7 +1070,7 @@
-
-
- #>+ 11
--libksvgplugin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ksvg_plugin.cpp $(srcdir)/ksvg_factory.cpp $(srcdir)/ksvg_widget.cpp ksvg_widget.moc ksvg_factory.moc ksvg_plugin.moc
-+libksvgplugin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ksvg_plugin.cpp $(srcdir)/ksvg_factory.cpp $(srcdir)/ksvg_widget.cpp ksvg_widget.moc ksvg_plugin.moc ksvg_factory.moc
- @echo 'creating libksvgplugin_la.all_cpp.cpp ...'; \
- rm -f libksvgplugin_la.all_cpp.files libksvgplugin_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libksvgplugin_la.all_cpp.final; \
-diff -Nru kdegraphics-3.4.2.orig/ksvg/test/external/Makefile.in kdegraphics-3.4.2/ksvg/test/external/Makefile.in
---- kdegraphics-3.4.2.orig/ksvg/test/external/Makefile.in 2005-07-20 20:08:46.000000000 +0000
-+++ kdegraphics-3.4.2/ksvg/test/external/Makefile.in 2005-07-31 18:53:36.772530456 +0000
-@@ -241,6 +241,9 @@
+-SOURCES = $(printnodetest_SOURCES) $(svgdisplay_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -241,6 +239,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13937,7 +15242,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -438,7 +441,7 @@
+@@ -438,7 +439,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -13946,7 +15251,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -476,9 +479,9 @@
+@@ -476,9 +477,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13958,43 +15263,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/ksvg/test/Makefile.in kdegraphics-3.4.2/ksvg/test/Makefile.in
---- kdegraphics-3.4.2.orig/ksvg/test/Makefile.in 2005-07-20 20:08:46.000000000 +0000
-+++ kdegraphics-3.4.2/ksvg/test/Makefile.in 2005-07-31 18:53:36.744534712 +0000
-@@ -213,6 +213,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -401,7 +404,7 @@
- all: docs-am all-recursive
+--- kuickshow/Makefile.in
++++ kuickshow/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
- .SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -439,9 +442,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
-diff -Nru kdegraphics-3.4.2.orig/kuickshow/Makefile.in kdegraphics-3.4.2/kuickshow/Makefile.in
---- kdegraphics-3.4.2.orig/kuickshow/Makefile.in 2005-07-20 20:08:46.000000000 +0000
-+++ kdegraphics-3.4.2/kuickshow/Makefile.in 2005-07-31 18:53:36.794527112 +0000
@@ -214,6 +214,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -14026,9 +15302,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdegraphics-3.4.2.orig/kuickshow/misc/Makefile.in kdegraphics-3.4.2/kuickshow/misc/Makefile.in
---- kdegraphics-3.4.2.orig/kuickshow/misc/Makefile.in 2005-07-20 20:08:46.000000000 +0000
-+++ kdegraphics-3.4.2/kuickshow/misc/Makefile.in 2005-07-31 18:53:36.807525136 +0000
+--- kuickshow/misc/Makefile.in
++++ kuickshow/misc/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -207,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -14060,9 +15341,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdegraphics-3.4.2.orig/kuickshow/pics/Makefile.in kdegraphics-3.4.2/kuickshow/pics/Makefile.in
---- kdegraphics-3.4.2.orig/kuickshow/pics/Makefile.in 2005-07-20 20:08:46.000000000 +0000
-+++ kdegraphics-3.4.2/kuickshow/pics/Makefile.in 2005-07-31 18:53:36.822522856 +0000
+--- kuickshow/pics/Makefile.in
++++ kuickshow/pics/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -207,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -14094,10 +15380,37 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdegraphics-3.4.2.orig/kuickshow/src/Makefile.in kdegraphics-3.4.2/kuickshow/src/Makefile.in
---- kdegraphics-3.4.2.orig/kuickshow/src/Makefile.in 2005-07-20 20:08:46.000000000 +0000
-+++ kdegraphics-3.4.2/kuickshow/src/Makefile.in 2005-07-31 18:53:36.977499296 +0000
-@@ -263,6 +263,9 @@
+--- kuickshow/src/Makefile.in
++++ kuickshow/src/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,10 +17,6 @@
+
+
+
+-#>- SOURCES = $(kuickshow_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kuickshow_la_SOURCES) $(kuickshow_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -107,7 +103,9 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(kuickshow_la_SOURCES)
++#>- SOURCES = $(kuickshow_la_SOURCES)
++#>+ 1
++SOURCES = $(kuickshow_la_SOURCES) $(kuickshow_SOURCES)
+ #>- DIST_SOURCES = $(kuickshow_la_SOURCES)
+ #>+ 1
+ DIST_SOURCES = $(kuickshow_la_SOURCES) $(kuickshow_SOURCES)
+@@ -263,6 +261,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14107,7 +15420,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -476,7 +479,7 @@
+@@ -476,7 +477,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14116,7 +15429,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -514,9 +517,9 @@
+@@ -514,9 +515,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14128,7 +15441,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -918,18 +921,18 @@
+@@ -918,18 +919,18 @@
mocs: aboutwidget.moc
#>+ 3
@@ -14153,7 +15466,7 @@
#>+ 3
imagewindow.moc: $(srcdir)/imagewindow.h
-@@ -1003,7 +1006,7 @@
+@@ -1003,7 +1004,7 @@
#>+ 3
clean-metasources:
@@ -14162,7 +15475,7 @@
#>+ 2
KDE_DIST=aboutwidget.h imagewindow.h kuickconfigdlg.h mainwidget.cpp kuickdata.h generalwidget.h defaultswidget.h imdata.h kuickshow.desktop kuickglobals.h filewidget.h kuick.h Makefile.am imlibwidget.h Makefile.in mainwidget.h printing.h cr32-app-kuickshow.png filefinder.h cr16-app-kuickshow.png slideshowwidget.h kuickshow.h lo32-app-kuickshow.png kurlwidget.h lo16-app-kuickshow.png kuickio.h version.h
-@@ -1013,19 +1016,19 @@
+@@ -1013,19 +1014,19 @@
#>+ 16
install-kde-icons:
@@ -14188,7 +15501,7 @@
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kuickshow.png
#>+ 15
-@@ -1067,7 +1070,7 @@
+@@ -1067,7 +1068,7 @@
#>+ 11
@@ -14197,7 +15510,7 @@
@echo 'creating libkdeinit_kuickshow_la.all_cpp.cpp ...'; \
rm -f libkdeinit_kuickshow_la.all_cpp.files libkdeinit_kuickshow_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkdeinit_kuickshow_la.all_cpp.final; \
-@@ -1079,7 +1082,7 @@
+@@ -1079,7 +1080,7 @@
rm -f libkdeinit_kuickshow_la.all_cpp.final libkdeinit_kuickshow_la.all_cpp.files
#>+ 11
@@ -14206,10 +15519,37 @@
@echo 'creating kuickshow_la.all_cpp.cpp ...'; \
rm -f kuickshow_la.all_cpp.files kuickshow_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kuickshow_la.all_cpp.final; \
-diff -Nru kdegraphics-3.4.2.orig/kview/config/Makefile.in kdegraphics-3.4.2/kview/config/Makefile.in
---- kdegraphics-3.4.2.orig/kview/config/Makefile.in 2005-07-20 20:08:46.000000000 +0000
-+++ kdegraphics-3.4.2/kview/config/Makefile.in 2005-07-31 18:53:37.061486528 +0000
-@@ -262,6 +262,9 @@
+--- kview/Makefile.in
++++ kview/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,10 +18,6 @@
+
+
+
+-#>- SOURCES = $(kview_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kview_la_SOURCES) $(kview_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -105,7 +101,9 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(kview_la_SOURCES)
++#>- SOURCES = $(kview_la_SOURCES)
++#>+ 1
++SOURCES = $(kview_la_SOURCES) $(kview_SOURCES)
+ #>- DIST_SOURCES = $(kview_la_SOURCES)
+ #>+ 1
+ DIST_SOURCES = $(kview_la_SOURCES) $(kview_SOURCES)
+@@ -277,6 +275,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14219,7 +15559,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -462,7 +465,7 @@
+@@ -482,7 +483,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14228,7 +15568,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -500,9 +503,9 @@
+@@ -520,9 +521,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14238,12 +15578,47 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/kview/config/plugins/Makefile.in kdegraphics-3.4.2/kview/config/plugins/Makefile.in
---- kdegraphics-3.4.2.orig/kview/config/plugins/Makefile.in 2005-07-20 20:08:46.000000000 +0000
-+++ kdegraphics-3.4.2/kview/config/plugins/Makefile.in 2005-07-31 18:53:37.090482120 +0000
-@@ -246,6 +246,9 @@
+@@ -1029,17 +1030,17 @@
+
+ #>+ 13
+ install-kde-icons:
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kview.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kview.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/cr32-app-kview.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kview.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/cr16-app-kview.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kview.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kview.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kview.png
+
+ uninstall-kde-icons:
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kview.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kview.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kview.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kview.png
+
+ #>+ 15
+ force-reedit:
+--- kview/config/Makefile.in
++++ kview/config/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kcm_kviewgeneralconfig_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -262,6 +260,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14253,7 +15628,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -443,7 +446,7 @@
+@@ -462,7 +463,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14262,7 +15637,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -481,9 +484,9 @@
+@@ -500,9 +501,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14274,10 +15649,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/kview/kimageviewer/Makefile.in kdegraphics-3.4.2/kview/kimageviewer/Makefile.in
---- kdegraphics-3.4.2.orig/kview/kimageviewer/Makefile.in 2005-07-20 20:08:46.000000000 +0000
-+++ kdegraphics-3.4.2/kview/kimageviewer/Makefile.in 2005-07-31 18:53:37.122477256 +0000
-@@ -250,6 +250,9 @@
+--- kview/config/plugins/Makefile.in
++++ kview/config/plugins/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kcm_kviewpluginsconfig_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -246,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14287,7 +15676,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -451,7 +454,7 @@
+@@ -443,7 +444,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14296,7 +15685,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -489,9 +492,9 @@
+@@ -481,9 +482,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14306,12 +15695,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/kview/kviewcanvas/config/Makefile.in kdegraphics-3.4.2/kview/kviewcanvas/config/Makefile.in
---- kdegraphics-3.4.2.orig/kview/kviewcanvas/config/Makefile.in 2005-07-20 20:08:46.000000000 +0000
-+++ kdegraphics-3.4.2/kview/kviewcanvas/config/Makefile.in 2005-07-31 18:53:37.200465400 +0000
-@@ -249,6 +249,9 @@
+--- kview/kimageviewer/Makefile.in
++++ kview/kimageviewer/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libkimageviewer_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -250,6 +248,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14321,7 +15724,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -448,7 +451,7 @@
+@@ -451,7 +452,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14330,7 +15733,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -486,9 +489,9 @@
+@@ -489,9 +490,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14340,12 +15743,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/kview/kviewcanvas/Makefile.in kdegraphics-3.4.2/kview/kviewcanvas/Makefile.in
---- kdegraphics-3.4.2.orig/kview/kviewcanvas/Makefile.in 2005-07-20 20:08:46.000000000 +0000
-+++ kdegraphics-3.4.2/kview/kviewcanvas/Makefile.in 2005-07-31 18:53:37.168470264 +0000
-@@ -264,6 +264,9 @@
+--- kview/kviewcanvas/Makefile.in
++++ kview/kviewcanvas/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(libkviewcanvas_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -264,6 +262,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14355,7 +15772,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -465,7 +468,7 @@
+@@ -465,7 +466,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14364,7 +15781,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -503,9 +506,9 @@
+@@ -503,9 +504,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14376,10 +15793,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/kview/kviewcanvas/test/Makefile.in kdegraphics-3.4.2/kview/kviewcanvas/test/Makefile.in
---- kdegraphics-3.4.2.orig/kview/kviewcanvas/test/Makefile.in 2005-07-20 20:08:46.000000000 +0000
-+++ kdegraphics-3.4.2/kview/kviewcanvas/test/Makefile.in 2005-07-31 18:53:37.222462056 +0000
-@@ -233,6 +233,9 @@
+--- kview/kviewcanvas/config/Makefile.in
++++ kview/kviewcanvas/config/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kcm_kviewcanvasconfig_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -249,6 +247,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14389,7 +15820,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -426,7 +429,7 @@
+@@ -448,7 +449,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14398,7 +15829,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -464,9 +467,9 @@
+@@ -486,9 +487,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14408,12 +15839,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- kview/kviewcanvas/test/Makefile.in
++++ kview/kviewcanvas/test/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
- clean-checkPROGRAMS:
-diff -Nru kdegraphics-3.4.2.orig/kview/kviewviewer/config/Makefile.in kdegraphics-3.4.2/kview/kviewviewer/config/Makefile.in
---- kdegraphics-3.4.2.orig/kview/kviewviewer/config/Makefile.in 2005-07-20 20:08:46.000000000 +0000
-+++ kdegraphics-3.4.2/kview/kviewviewer/config/Makefile.in 2005-07-31 18:53:37.302449896 +0000
-@@ -247,6 +247,9 @@
+@@ -14,8 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-SOURCES = $(test_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -233,6 +231,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14423,7 +15868,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,7 +447,7 @@
+@@ -426,7 +427,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14432,7 +15877,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -482,9 +485,9 @@
+@@ -464,9 +465,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14442,12 +15887,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/kview/kviewviewer/Makefile.in kdegraphics-3.4.2/kview/kviewviewer/Makefile.in
---- kdegraphics-3.4.2.orig/kview/kviewviewer/Makefile.in 2005-07-20 20:08:46.000000000 +0000
-+++ kdegraphics-3.4.2/kview/kviewviewer/Makefile.in 2005-07-31 18:53:37.272454456 +0000
-@@ -267,6 +267,9 @@
+
+ clean-checkPROGRAMS:
+--- kview/kviewviewer/Makefile.in
++++ kview/kviewviewer/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(libkviewviewer_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -267,6 +265,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14457,7 +15916,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -472,7 +475,7 @@
+@@ -472,7 +473,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14466,7 +15925,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -510,9 +513,9 @@
+@@ -510,9 +511,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14478,7 +15937,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -927,18 +930,18 @@
+@@ -927,18 +928,18 @@
#>+ 3
@@ -14503,7 +15962,7 @@
#>+ 3
imagesettings.moc: $(srcdir)/imagesettings.h
-@@ -949,7 +952,7 @@
+@@ -949,7 +950,7 @@
#>+ 3
clean-metasources:
@@ -14512,7 +15971,7 @@
#>+ 2
KDE_DIST=kviewvieweriface.h Makefile.am printimagesettings.ui kviewviewer.desktop kviewpopup.rc Makefile.in imagesettings.h kviewviewer.rc kviewviewer_ro.rc
-@@ -1005,7 +1008,7 @@
+@@ -1005,7 +1006,7 @@
#>+ 11
@@ -14521,10 +15980,24 @@
@echo 'creating libkviewviewer_la.all_cpp.cpp ...'; \
rm -f libkviewviewer_la.all_cpp.files libkviewviewer_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkviewviewer_la.all_cpp.final; \
-diff -Nru kdegraphics-3.4.2.orig/kview/kviewviewer/test/Makefile.in kdegraphics-3.4.2/kview/kviewviewer/test/Makefile.in
---- kdegraphics-3.4.2.orig/kview/kviewviewer/test/Makefile.in 2005-07-20 20:08:46.000000000 +0000
-+++ kdegraphics-3.4.2/kview/kviewviewer/test/Makefile.in 2005-07-31 18:53:37.326446248 +0000
-@@ -232,6 +232,9 @@
+--- kview/kviewviewer/config/Makefile.in
++++ kview/kviewviewer/config/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kcm_kviewviewerpluginsconfig_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -247,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14534,7 +16007,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -425,7 +428,7 @@
+@@ -444,7 +445,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14543,7 +16016,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -463,9 +466,9 @@
+@@ -482,9 +483,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14553,12 +16026,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- kview/kviewviewer/test/Makefile.in
++++ kview/kviewviewer/test/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
- clean-checkPROGRAMS:
-diff -Nru kdegraphics-3.4.2.orig/kview/Makefile.in kdegraphics-3.4.2/kview/Makefile.in
---- kdegraphics-3.4.2.orig/kview/Makefile.in 2005-07-20 20:08:46.000000000 +0000
-+++ kdegraphics-3.4.2/kview/Makefile.in 2005-07-31 18:53:37.032490936 +0000
-@@ -277,6 +277,9 @@
+@@ -14,8 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-SOURCES = $(test_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -232,6 +230,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14568,7 +16055,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -482,7 +485,7 @@
+@@ -425,7 +426,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14577,7 +16064,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -520,9 +523,9 @@
+@@ -463,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14587,33 +16074,17 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
- @$(NORMAL_INSTALL)
-@@ -1029,17 +1032,17 @@
- #>+ 13
- install-kde-icons:
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kview.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kview.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-kview.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kview.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-kview.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kview.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kview.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kview.png
+ clean-checkPROGRAMS:
+--- kview/modules/Makefile.in
++++ kview/modules/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
- uninstall-kde-icons:
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kview.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kview.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kview.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kview.png
-
- #>+ 15
- force-reedit:
-diff -Nru kdegraphics-3.4.2.orig/kview/modules/browser/Makefile.in kdegraphics-3.4.2/kview/modules/browser/Makefile.in
---- kdegraphics-3.4.2.orig/kview/modules/browser/Makefile.in 2005-07-20 20:08:46.000000000 +0000
-+++ kdegraphics-3.4.2/kview/modules/browser/Makefile.in 2005-07-31 18:53:37.374438952 +0000
-@@ -245,6 +245,9 @@
+@@ -213,6 +213,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14623,16 +16094,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -441,7 +444,7 @@
+@@ -401,7 +404,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -479,9 +482,9 @@
+@@ -439,9 +442,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14642,12 +16113,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/kview/modules/effects/Makefile.in kdegraphics-3.4.2/kview/modules/effects/Makefile.in
---- kdegraphics-3.4.2.orig/kview/modules/effects/Makefile.in 2005-07-20 20:08:46.000000000 +0000
-+++ kdegraphics-3.4.2/kview/modules/effects/Makefile.in 2005-07-31 18:53:37.403434544 +0000
-@@ -242,6 +242,9 @@
+
+ mostlyclean-libtool:
+--- kview/modules/browser/Makefile.in
++++ kview/modules/browser/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(kview_browserplugin_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -245,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14657,7 +16142,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -438,7 +441,7 @@
+@@ -441,7 +442,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14666,7 +16151,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -476,9 +479,9 @@
+@@ -479,9 +480,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14678,10 +16163,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/kview/modules/Makefile.in kdegraphics-3.4.2/kview/modules/Makefile.in
---- kdegraphics-3.4.2.orig/kview/modules/Makefile.in 2005-07-20 20:08:46.000000000 +0000
-+++ kdegraphics-3.4.2/kview/modules/Makefile.in 2005-07-31 18:53:37.343443664 +0000
-@@ -213,6 +213,9 @@
+--- kview/modules/effects/Makefile.in
++++ kview/modules/effects/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(kview_effectsplugin_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -242,6 +240,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14691,16 +16190,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -401,7 +404,7 @@
- all: docs-am all-recursive
+@@ -438,7 +439,7 @@
.SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -439,9 +442,9 @@
+@@ -476,9 +477,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14710,12 +16209,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- kview/modules/presenter/Makefile.in
++++ kview/modules/presenter/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
- mostlyclean-libtool:
-diff -Nru kdegraphics-3.4.2.orig/kview/modules/presenter/config/Makefile.in kdegraphics-3.4.2/kview/modules/presenter/config/Makefile.in
---- kdegraphics-3.4.2.orig/kview/modules/presenter/config/Makefile.in 2005-07-20 20:08:46.000000000 +0000
-+++ kdegraphics-3.4.2/kview/modules/presenter/config/Makefile.in 2005-07-31 18:53:37.471424208 +0000
-@@ -246,6 +246,9 @@
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(kview_presenterplugin_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -262,6 +260,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14725,7 +16238,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -443,7 +446,7 @@
+@@ -461,7 +462,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14734,7 +16247,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -481,9 +484,9 @@
+@@ -499,9 +500,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14746,10 +16259,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/kview/modules/presenter/Makefile.in kdegraphics-3.4.2/kview/modules/presenter/Makefile.in
---- kdegraphics-3.4.2.orig/kview/modules/presenter/Makefile.in 2005-07-20 20:08:46.000000000 +0000
-+++ kdegraphics-3.4.2/kview/modules/presenter/Makefile.in 2005-07-31 18:53:37.441428768 +0000
-@@ -262,6 +262,9 @@
+--- kview/modules/presenter/config/Makefile.in
++++ kview/modules/presenter/config/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kcm_kviewpresenterconfig_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -246,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14759,7 +16286,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -461,7 +464,7 @@
+@@ -443,7 +444,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14768,7 +16295,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -499,9 +502,9 @@
+@@ -481,9 +482,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14780,10 +16307,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/kview/modules/scale/Makefile.in kdegraphics-3.4.2/kview/modules/scale/Makefile.in
---- kdegraphics-3.4.2.orig/kview/modules/scale/Makefile.in 2005-07-20 20:08:46.000000000 +0000
-+++ kdegraphics-3.4.2/kview/modules/scale/Makefile.in 2005-07-31 18:53:37.501419648 +0000
-@@ -247,6 +247,9 @@
+--- kview/modules/scale/Makefile.in
++++ kview/modules/scale/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(kview_scale_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -247,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14793,7 +16334,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -443,7 +446,7 @@
+@@ -443,7 +444,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14802,7 +16343,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -481,9 +484,9 @@
+@@ -481,9 +482,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14814,10 +16355,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/kview/modules/scanner/Makefile.in kdegraphics-3.4.2/kview/modules/scanner/Makefile.in
---- kdegraphics-3.4.2.orig/kview/modules/scanner/Makefile.in 2005-07-20 20:08:46.000000000 +0000
-+++ kdegraphics-3.4.2/kview/modules/scanner/Makefile.in 2005-07-31 18:53:37.532414936 +0000
-@@ -242,6 +242,9 @@
+--- kview/modules/scanner/Makefile.in
++++ kview/modules/scanner/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(kview_scannerplugin_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -242,6 +240,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14827,7 +16382,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -438,7 +441,7 @@
+@@ -438,7 +439,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14836,7 +16391,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -476,9 +479,9 @@
+@@ -476,9 +477,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14848,10 +16403,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/kview/modules/template/Makefile.in kdegraphics-3.4.2/kview/modules/template/Makefile.in
---- kdegraphics-3.4.2.orig/kview/modules/template/Makefile.in 2005-07-20 20:08:46.000000000 +0000
-+++ kdegraphics-3.4.2/kview/modules/template/Makefile.in 2005-07-31 18:53:37.558410984 +0000
-@@ -243,6 +243,9 @@
+--- kview/modules/template/Makefile.in
++++ kview/modules/template/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(kview_templateplugin_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -243,6 +241,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14861,7 +16430,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -439,7 +442,7 @@
+@@ -439,7 +440,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14870,7 +16439,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -477,9 +480,9 @@
+@@ -477,9 +478,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14882,10 +16451,38 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/kview/photobook/Makefile.in kdegraphics-3.4.2/kview/photobook/Makefile.in
---- kdegraphics-3.4.2.orig/kview/photobook/Makefile.in 2005-07-20 20:08:47.000000000 +0000
-+++ kdegraphics-3.4.2/kview/photobook/Makefile.in 2005-07-31 18:53:37.607403536 +0000
-@@ -244,6 +244,9 @@
+--- kview/photobook/Makefile.in
++++ kview/photobook/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libphotobook_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -57,10 +55,10 @@
+ *) f=$$p;; \
+ esac;
+ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(partdir)" \
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(partdir)" \
+ "$(DESTDIR)$(partrcdir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
++kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+ libphotobook_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
+@@ -244,6 +242,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14895,7 +16492,21 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -445,7 +448,7 @@
+@@ -427,11 +428,9 @@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+ INCLUDES = $(all_includes)
+-lib_LTLIBRARIES = libphotobook.la
++kde_module_LTLIBRARIES = libphotobook.la
+ libphotobook_la_SOURCES = photobook.cpp
+-#>- libphotobook_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined
+-#>+ 1
+-libphotobook_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED)
++libphotobook_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+ libphotobook_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS)
+ partrcdir = $(kde_servicesdir)
+ partrc_DATA = photobook.desktop
+@@ -445,7 +444,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14904,7 +16515,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -483,9 +486,9 @@
+@@ -483,32 +482,32 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14914,12 +16525,142 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
++install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/kviewshell/Makefile.in kdegraphics-3.4.2/kviewshell/Makefile.in
---- kdegraphics-3.4.2.orig/kviewshell/Makefile.in 2005-07-20 20:08:47.000000000 +0000
-+++ kdegraphics-3.4.2/kviewshell/Makefile.in 2005-07-31 18:53:37.722386056 +0000
-@@ -311,6 +311,9 @@
+- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+ f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
++ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+ done
+
+-uninstall-libLTLIBRARIES:
++uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
++ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+
+-clean-libLTLIBRARIES:
+- -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++clean-kde_moduleLTLIBRARIES:
++ -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+ test "$$dir" != "$$p" || dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+@@ -518,7 +517,7 @@
+ #>+ 2
+ @KDE_USE_CLOSURE_TRUE at libphotobook.la: libphotobook.la.closure $(libphotobook_la_OBJECTS) $(libphotobook_la_DEPENDENCIES)
+ @KDE_USE_CLOSURE_FALSE at libphotobook.la: $(libphotobook_la_OBJECTS) $(libphotobook_la_DEPENDENCIES)
+- $(CXXLINK) -rpath $(libdir) $(libphotobook_la_LDFLAGS) $(libphotobook_la_OBJECTS) $(libphotobook_la_LIBADD) $(LIBS)
++ $(CXXLINK) -rpath $(kde_moduledir) $(libphotobook_la_LDFLAGS) $(libphotobook_la_OBJECTS) $(libphotobook_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -672,7 +671,7 @@
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(DATA)
+ installdirs:
+- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(partdir)" "$(DESTDIR)$(partrcdir)"; do \
++ for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(partdir)" "$(DESTDIR)$(partrcdir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+@@ -703,10 +702,10 @@
+ #>+ 1
+ clean: kde-rpo-clean clean-am
+
+-#>- clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
++#>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ #>- mostlyclean-am
+ #>+ 2
+-clean-am: clean-metasources clean-closures clean-bcheck clean-generic clean-libLTLIBRARIES clean-libtool \
++clean-am: clean-metasources clean-closures clean-bcheck clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ mostlyclean-am
+
+ distclean: distclean-am
+@@ -725,11 +724,15 @@
+
+ info-am:
+
+-#>- install-data-am: install-partDATA install-partrcDATA
+-#>+ 1
+-install-data-am: install-kde-icons install-partDATA install-partrcDATA
++#>- install-data-am: install-kde_moduleLTLIBRARIES install-partDATA \
++#>- install-partrcDATA
++#>+ 2
++install-data-am: install-kde-icons install-partDATA \
++ install-partrcDATA
+
+-install-exec-am: install-libLTLIBRARIES
++#>- install-exec-am:
++#>+ 1
++install-exec-am: install-kde_moduleLTLIBRARIES
+
+ install-info: install-info-am
+
+@@ -755,24 +758,24 @@
+
+ ps-am:
+
+-#>- uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
++#>- uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+ #>- uninstall-partDATA uninstall-partrcDATA
+ #>+ 2
+-uninstall-am: uninstall-kde-icons uninstall-info-am uninstall-libLTLIBRARIES \
++uninstall-am: uninstall-kde-icons uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+ uninstall-partDATA uninstall-partrcDATA
+
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libLTLIBRARIES clean-libtool ctags distclean \
++ clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am \
+- install-libLTLIBRARIES install-man install-partDATA \
++ install-kde_moduleLTLIBRARIES install-man install-partDATA \
+ install-partrcDATA install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+- uninstall-am uninstall-info-am uninstall-libLTLIBRARIES \
++ uninstall-am uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+ uninstall-partDATA uninstall-partrcDATA
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+--- kviewshell/Makefile.in
++++ kviewshell/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+
+
+
+-SOURCES = $(emptymultipagepart_la_SOURCES) $(kviewerpart_la_SOURCES) $(libifaces_la_SOURCES) $(libkmultipage_la_SOURCES) $(libkviewshell_la_SOURCES) $(kviewshell_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -311,6 +309,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14929,7 +16670,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -544,7 +545,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14938,7 +16679,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +583,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14950,7 +16691,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1109,18 +1112,18 @@
+@@ -1109,18 +1110,18 @@
mocs: emptyRenderer.moc
#>+ 3
@@ -14975,7 +16716,7 @@
#>+ 3
documentRenderer.moc: $(srcdir)/documentRenderer.h
-@@ -1165,18 +1168,18 @@
+@@ -1165,18 +1166,18 @@
mocs: zoom.moc
#>+ 3
@@ -15000,7 +16741,7 @@
#>+ 3
empty_multipage.moc: $(srcdir)/empty_multipage.h
-@@ -1223,10 +1226,10 @@
+@@ -1223,10 +1224,10 @@
#>+ 3
clean-metasources:
@@ -15013,7 +16754,7 @@
#>+ 4
clean-idl:
-@@ -1254,16 +1257,16 @@
+@@ -1254,16 +1255,16 @@
#>+ 13
install-kde-icons:
@@ -15033,7 +16774,7 @@
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kviewshell.png
#>+ 15
-@@ -1329,7 +1332,7 @@
+@@ -1329,7 +1330,7 @@
rm -f kviewerpart_la.all_cpp.final kviewerpart_la.all_cpp.files
#>+ 11
@@ -15042,10 +16783,24 @@
@echo 'creating libkmultipage_la.all_cpp.cpp ...'; \
rm -f libkmultipage_la.all_cpp.files libkmultipage_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkmultipage_la.all_cpp.final; \
-diff -Nru kdegraphics-3.4.2.orig/libkscan/Makefile.in kdegraphics-3.4.2/libkscan/Makefile.in
---- kdegraphics-3.4.2.orig/libkscan/Makefile.in 2005-07-20 20:08:47.000000000 +0000
-+++ kdegraphics-3.4.2/libkscan/Makefile.in 2005-07-31 18:53:37.901358848 +0000
-@@ -269,6 +269,9 @@
+--- libkscan/Makefile.in
++++ libkscan/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(libkscan_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -269,6 +267,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15055,7 +16810,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -481,7 +484,7 @@
+@@ -481,7 +482,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15064,7 +16819,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -519,9 +522,9 @@
+@@ -519,9 +520,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15076,9 +16831,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdegraphics-3.4.2.orig/libkscan/pics/Makefile.in kdegraphics-3.4.2/libkscan/pics/Makefile.in
---- kdegraphics-3.4.2.orig/libkscan/pics/Makefile.in 2005-07-20 20:08:47.000000000 +0000
-+++ kdegraphics-3.4.2/libkscan/pics/Makefile.in 2005-07-31 18:53:37.921355808 +0000
+--- libkscan/pics/Makefile.in
++++ libkscan/pics/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -197,6 +197,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -15128,58 +16888,3 @@
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_gray.png
#>+ 15
-diff -Nru kdegraphics-3.4.2.orig/Makefile.in kdegraphics-3.4.2/Makefile.in
---- kdegraphics-3.4.2.orig/Makefile.in 2005-07-20 20:08:42.000000000 +0000
-+++ kdegraphics-3.4.2/Makefile.in 2005-07-31 18:53:31.518329216 +0000
-@@ -230,6 +230,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -430,7 +433,7 @@
- .SUFFIXES:
- am--refresh:
- @:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -472,12 +475,12 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- $(SHELL) ./config.status --recheck
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- #>- cd $(srcdir) && $(AUTOCONF)
- #>+ 2
- cd $(srcdir) && rm -f configure
- cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
- config.h: stamp-h1
-@@ -489,7 +492,7 @@
- stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
- @rm -f stamp-h1
- cd $(top_builddir) && $(SHELL) ./config.status config.h
--$(srcdir)/config.h.in: $(am__configure_deps)
-+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_srcdir) && $(AUTOHEADER)
- rm -f stamp-h1
- touch $@
-@@ -912,7 +915,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=subdirs Makefile.in configure.files config.h.in configure.in aclocal.m4 kdegraphics.lsm configure.in.in acinclude.m4 Makefile.am Makefile.am.in
-+KDE_DIST=stamp-h.in subdirs Makefile.in configure.files config.h.in configure.in aclocal.m4 kdegraphics.lsm configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in
-
- #>+ 2
- docs-am:
More information about the Pkg-kde-commits
mailing list