[Pkg-kde-commits] rev 1128 - in branches/kde-3.4.0/packages/kdegraphics/debian: . patches
Pierre Habouzit
madcoder-guest@costa.debian.org
Wed, 25 May 2005 06:30:53 +0000
Author: madcoder-guest
Date: 2005-05-25 06:30:44 +0000 (Wed, 25 May 2005)
New Revision: 1128
Modified:
branches/kde-3.4.0/packages/kdegraphics/debian/changelog
branches/kde-3.4.0/packages/kdegraphics/debian/patches/98_buildprep.diff
Log:
kdegraphics buildprep
Modified: branches/kde-3.4.0/packages/kdegraphics/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdegraphics/debian/changelog 2005-05-25 06:25:13 UTC (rev 1127)
+++ branches/kde-3.4.0/packages/kdegraphics/debian/changelog 2005-05-25 06:30:44 UTC (rev 1128)
@@ -1,3 +1,9 @@
+kdegraphics (4:3.4.1-0pre1) alioth; urgency=low
+
+ * New upstream release.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 25 May 2005 08:28:48 +0200
+
kdegraphics (4:3.4.0-0pre1) alioth; urgency=low
* New upstream release.
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-05-25 06:25:13 UTC (rev 1127)
+++ branches/kde-3.4.0/packages/kdegraphics/debian/patches/98_buildprep.diff 2005-05-25 06:30:44 UTC (rev 1128)
@@ -1,123 +1,7 @@
-#DPATCHLEVEL=1
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/Makefile.in kdegraphics-3.4.0/Makefile.in
---- kdegraphics-3.4.0.orig/Makefile.in 2005-03-04 13:27:31.000000000 +0100
-+++ kdegraphics-3.4.0/Makefile.in 2005-03-05 02:51:43.534114060 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -229,6 +229,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@
-@@ -427,7 +430,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*) \
-@@ -469,12 +472,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
-@@ -486,7 +489,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 $@
-@@ -511,7 +514,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -523,7 +532,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -531,7 +540,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -552,7 +567,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -897,7 +912,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:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/acinclude.m4 kdegraphics-3.4.0/acinclude.m4
---- kdegraphics-3.4.0.orig/acinclude.m4 2005-03-04 13:26:26.000000000 +0100
-+++ kdegraphics-3.4.0/acinclude.m4 2005-03-05 02:50:16.550029041 +0100
-@@ -1682,15 +1682,6 @@
+diff -rua kdegraphics-3.4.1.orig/acinclude.m4 kdegraphics-3.4.1/acinclude.m4
+--- kdegraphics-3.4.1.orig/acinclude.m4 2005-05-23 18:00:08.000000000 +0200
++++ kdegraphics-3.4.1/acinclude.m4 2005-05-25 08:28:08.945734036 +0200
+@@ -1690,15 +1690,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -133,7 +17,7 @@
fi
AC_SUBST(KDE_USE_CLOSURE_TRUE)
AC_SUBST(KDE_USE_CLOSURE_FALSE)
-@@ -2131,9 +2122,6 @@
+@@ -2139,9 +2130,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -143,7 +27,7 @@
AC_TRY_COMPILE([
$2
],
-@@ -5686,6 +5674,7 @@
+@@ -5770,6 +5758,7 @@
## the same distribution terms that you use for the rest of that program.
# serial 47 AC_PROG_LIBTOOL
@@ -151,7 +35,7 @@
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -5745,7 +5734,7 @@
+@@ -5829,7 +5818,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -160,7 +44,7 @@
AC_SUBST(LIBTOOL)dnl
# Prevent multiple expansion
-@@ -6159,12 +6148,11 @@
+@@ -6243,12 +6232,11 @@
if AC_TRY_EVAL(ac_compile); then
case "`/usr/bin/file conftest.o`" in
*32-bit*)
@@ -174,7 +58,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -6176,7 +6164,6 @@
+@@ -6260,7 +6248,6 @@
esac
;;
*64-bit*)
@@ -182,7 +66,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -6306,7 +6293,7 @@
+@@ -6390,7 +6377,7 @@
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
@@ -191,7 +75,7 @@
case $build_os in
msdosdjgpp*)
-@@ -6335,20 +6322,26 @@
+@@ -6419,20 +6406,26 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -223,7 +107,7 @@
# Add a significant safety factor because C++ compilers can tack on massive
# amounts of additional arguments before passing them to the linker.
# It appears as though 1/2 is a usable value.
-@@ -6498,7 +6491,7 @@
+@@ -6582,7 +6575,7 @@
lt_cv_dlopen_self=yes
])
;;
@@ -232,7 +116,7 @@
*)
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
-@@ -6587,13 +6580,6 @@
+@@ -6671,13 +6664,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -246,7 +130,7 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -6617,8 +6603,11 @@
+@@ -6701,8 +6687,11 @@
fi
fi
chmod u+w .
@@ -260,7 +144,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -6735,7 +6724,7 @@
+@@ -6819,7 +6808,7 @@
*)
AC_MSG_RESULT([no])
;;
@@ -269,7 +153,7 @@
fi
])# AC_LIBTOOL_SYS_LIB_STRIP
-@@ -6748,7 +6737,7 @@
+@@ -6832,7 +6821,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -278,7 +162,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -6758,7 +6747,20 @@
+@@ -6842,7 +6831,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -300,7 +184,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -6823,7 +6825,7 @@
+@@ -6907,7 +6909,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -309,7 +193,7 @@
;;
beos*)
-@@ -6848,7 +6850,7 @@
+@@ -6932,7 +6934,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -318,7 +202,7 @@
need_version=no
need_lib_prefix=no
-@@ -6913,7 +6915,7 @@
+@@ -6997,7 +6999,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -327,7 +211,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -6936,7 +6938,7 @@
+@@ -7020,7 +7022,7 @@
dynamic_linker=no
;;
@@ -336,7 +220,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -6996,7 +6998,7 @@
+@@ -7080,7 +7082,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -345,7 +229,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -7011,7 +7013,7 @@
+@@ -7095,7 +7097,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -354,7 +238,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7022,7 +7024,7 @@
+@@ -7106,7 +7108,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -363,7 +247,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7084,22 +7086,19 @@
+@@ -7168,22 +7170,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -392,7 +276,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -7109,6 +7108,30 @@
+@@ -7193,6 +7192,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -423,7 +307,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -7118,7 +7141,7 @@
+@@ -7202,7 +7225,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -432,7 +316,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -7147,7 +7170,7 @@
+@@ -7231,7 +7254,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -441,7 +325,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -7167,7 +7190,7 @@
+@@ -7251,7 +7274,7 @@
os2*)
libname_spec='$name'
@@ -450,7 +334,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -7758,31 +7781,23 @@
+@@ -7842,31 +7865,23 @@
;;
cygwin*)
@@ -491,7 +375,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -7821,42 +7836,21 @@
+@@ -7905,42 +7920,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -541,7 +425,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
-@@ -7885,9 +7879,6 @@
+@@ -7969,9 +7963,6 @@
;;
osf3* | osf4* | osf5*)
@@ -551,7 +435,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -7897,7 +7888,6 @@
+@@ -7981,7 +7972,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -559,7 +443,7 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -8163,7 +8153,7 @@
+@@ -8247,7 +8237,7 @@
fi
if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
@@ -568,7 +452,7 @@
else
AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
_LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
-@@ -8213,7 +8203,7 @@
+@@ -8297,7 +8287,7 @@
fi
;;
@@ -577,7 +461,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -8223,29 +8213,29 @@
+@@ -8307,29 +8297,29 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -621,7 +505,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8253,8 +8243,8 @@
+@@ -8337,8 +8327,8 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -632,7 +516,7 @@
esac
AC_MSG_RESULT([$enable_shared])
-@@ -8362,8 +8352,8 @@
+@@ -8446,8 +8436,8 @@
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
if test "$with_gnu_ld" = yes; then
@@ -643,7 +527,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -8389,7 +8379,7 @@
+@@ -8473,7 +8463,7 @@
# linker, instead of GNU ld. If possible, this setting should
# overridden to take advantage of the native linker features on
# the platform it is being used on.
@@ -652,7 +536,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -8419,8 +8409,22 @@
+@@ -8503,8 +8493,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -677,7 +561,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -8466,15 +8470,16 @@
+@@ -8550,15 +8554,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -698,7 +582,7 @@
if test "$aix_use_runtimelinking" = yes; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
-@@ -8483,13 +8488,12 @@
+@@ -8567,13 +8572,12 @@
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -714,7 +598,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -8504,7 +8508,7 @@
+@@ -8588,7 +8592,7 @@
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -723,7 +607,7 @@
fi
fi
;;
-@@ -8521,12 +8525,12 @@
+@@ -8605,12 +8609,12 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -738,7 +622,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -8535,7 +8539,7 @@
+@@ -8619,7 +8623,7 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -747,7 +631,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -8546,20 +8550,20 @@
+@@ -8630,20 +8634,20 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -778,7 +662,7 @@
fi
;;
esac
-@@ -8569,19 +8573,19 @@
+@@ -8653,19 +8657,19 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -804,7 +688,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8616,7 +8620,7 @@
+@@ -8700,7 +8704,7 @@
freebsd-elf*)
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
;;
@@ -813,7 +697,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8638,7 +8642,7 @@
+@@ -8722,7 +8726,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
aCC)
@@ -822,7 +706,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8647,11 +8651,11 @@
+@@ -8731,11 +8735,11 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -836,7 +720,7 @@
else
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8708,7 +8712,7 @@
+@@ -8792,7 +8796,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -845,7 +729,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -8729,7 +8733,7 @@
+@@ -8813,7 +8817,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -854,7 +738,7 @@
;;
esac
fi
-@@ -8744,7 +8748,7 @@
+@@ -8828,7 +8832,7 @@
case $cc_basename in
CC)
# SGI C++
@@ -863,7 +747,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -8755,9 +8759,9 @@
+@@ -8839,9 +8843,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -875,7 +759,7 @@
fi
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -8774,8 +8778,8 @@
+@@ -8858,8 +8862,8 @@
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -886,7 +770,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8797,16 +8801,16 @@
+@@ -8881,16 +8885,16 @@
# Intel C++
with_gnu_ld=yes
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -907,7 +791,7 @@
runpath_var=LD_RUN_PATH
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -8844,7 +8848,7 @@
+@@ -8928,7 +8932,7 @@
;;
esac
;;
@@ -916,7 +800,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -8863,7 +8867,7 @@
+@@ -8947,7 +8951,7 @@
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -925,7 +809,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8880,7 +8884,7 @@
+@@ -8964,7 +8968,7 @@
;;
cxx)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -934,7 +818,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8898,7 +8902,7 @@
+@@ -8982,7 +8986,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -943,7 +827,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8923,7 +8927,7 @@
+@@ -9007,7 +9011,7 @@
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -952,7 +836,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8939,10 +8943,10 @@
+@@ -9023,10 +9027,10 @@
;;
cxx)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
@@ -965,7 +849,7 @@
$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -8961,7 +8965,7 @@
+@@ -9045,7 +9049,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -974,7 +858,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9018,9 +9022,9 @@
+@@ -9102,9 +9106,9 @@
CC)
# Sun C++ 4.2, 5.x and Centerline C++
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -986,7 +870,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -9054,7 +9058,7 @@
+@@ -9138,7 +9142,7 @@
;;
gcx)
# Green Hills C++ Compiler
@@ -995,7 +879,7 @@
# The C++ compiler must be used to create the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9064,9 +9068,9 @@
+@@ -9148,9 +9152,9 @@
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -1007,7 +891,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9075,9 +9079,9 @@
+@@ -9159,9 +9163,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -1019,7 +903,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9245,7 +9249,7 @@
+@@ -9329,7 +9333,7 @@
fi
;;
@@ -1028,7 +912,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -9354,7 +9358,7 @@
+@@ -9438,7 +9442,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -1037,7 +921,7 @@
test "$enable_shared" = yes && enable_static=no
;;
esac
-@@ -9496,11 +9500,12 @@
+@@ -9580,11 +9584,12 @@
# without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
@@ -1052,7 +936,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -9550,7 +9555,7 @@
+@@ -9634,7 +9639,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \
@@ -1061,7 +945,7 @@
_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
_LT_AC_TAGVAR(export_symbols_cmds, $1) | \
extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9681,7 +9686,7 @@
+@@ -9765,7 +9770,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -1070,7 +954,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -9712,7 +9717,7 @@
+@@ -9796,7 +9801,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -1079,7 +963,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -9956,7 +9961,10 @@
+@@ -10040,7 +10045,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -1091,7 +975,7 @@
fi
])# AC_LIBTOOL_CONFIG
-@@ -10029,7 +10037,7 @@
+@@ -10113,7 +10121,7 @@
symcode='[[BCDEGQRST]]'
;;
solaris* | sysv5*)
@@ -1100,7 +984,7 @@
;;
sysv4)
symcode='[[DFNSTU]]'
-@@ -10047,7 +10055,7 @@
+@@ -10131,7 +10139,7 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -1109,7 +993,7 @@
esac
# Try without a prefix undercore, then with it.
-@@ -10262,7 +10270,7 @@
+@@ -10346,7 +10354,7 @@
;;
esac
;;
@@ -1118,7 +1002,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -10313,7 +10321,7 @@
+@@ -10397,7 +10405,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
@@ -1127,7 +1011,7 @@
cxx)
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -10338,7 +10346,7 @@
+@@ -10422,7 +10430,7 @@
;;
esac
;;
@@ -1136,7 +1020,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -10649,6 +10657,9 @@
+@@ -10733,6 +10741,9 @@
cygwin* | mingw*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -1146,7 +1030,7 @@
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -10673,7 +10684,7 @@
+@@ -10757,7 +10768,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
@@ -1155,7 +1039,7 @@
_LT_AC_TAGVAR(always_export_symbols, $1)=no
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
# include_expsyms should be a list of space-separated symbols to be *always*
-@@ -10747,7 +10758,7 @@
+@@ -10831,7 +10842,7 @@
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -1164,7 +1048,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10757,13 +10768,13 @@
+@@ -10841,13 +10852,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -1180,7 +1064,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -10772,19 +10783,19 @@
+@@ -10856,19 +10867,19 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -1204,7 +1088,7 @@
fi
;;
-@@ -10802,8 +10813,8 @@
+@@ -10886,8 +10897,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -1215,7 +1099,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10816,10 +10827,36 @@
+@@ -10900,10 +10911,36 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
@@ -1254,7 +1138,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10869,9 +10906,20 @@
+@@ -10953,9 +10990,20 @@
else
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
fi
@@ -1277,7 +1161,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -10917,29 +10965,29 @@
+@@ -11001,29 +11049,29 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -1316,7 +1200,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -10954,7 +11002,7 @@
+@@ -11038,7 +11086,7 @@
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -1325,7 +1209,7 @@
fi
fi
;;
-@@ -10977,13 +11025,13 @@
+@@ -11061,13 +11109,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -1342,7 +1226,7 @@
# The linker will automatically build a .lib file if we build a DLL.
_LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
# FIXME: Should let the user specify the lib program.
-@@ -10997,21 +11045,21 @@
+@@ -11081,21 +11129,21 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -1377,7 +1261,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -11020,26 +11068,26 @@
+@@ -11104,26 +11152,26 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -1412,7 +1296,7 @@
;;
dgux*)
-@@ -11072,8 +11120,8 @@
+@@ -11156,8 +11204,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -1423,7 +1307,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11081,7 +11129,7 @@
+@@ -11165,7 +11213,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -1432,7 +1316,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -11099,10 +11147,10 @@
+@@ -11183,10 +11231,10 @@
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case "$host_cpu" in
hppa*64*|ia64*)
@@ -1445,7 +1329,7 @@
;;
esac
else
-@@ -11149,7 +11197,7 @@
+@@ -11233,7 +11281,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -1454,7 +1338,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-@@ -11159,7 +11207,7 @@
+@@ -11243,7 +11291,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -1463,7 +1347,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -11182,7 +11230,7 @@
+@@ -11266,7 +11314,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -1472,7 +1356,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
else
-@@ -11192,7 +11240,7 @@
+@@ -11276,7 +11324,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
;;
*)
@@ -1481,7 +1365,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
;;
esac
-@@ -11203,14 +11251,14 @@
+@@ -11287,14 +11335,14 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -1498,7 +1382,7 @@
else
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -11222,7 +11270,7 @@
+@@ -11306,7 +11354,7 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1507,7 +1391,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
else
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-@@ -11247,9 +11295,9 @@
+@@ -11331,9 +11379,9 @@
solaris*)
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
if test "$GCC" = yes; then
@@ -1519,7 +1403,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -11269,7 +11317,7 @@
+@@ -11353,7 +11401,7 @@
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
@@ -1528,7 +1412,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -11329,9 +11377,9 @@
+@@ -11413,9 +11461,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
_LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -1540,7 +1424,7 @@
fi
runpath_var='LD_RUN_PATH'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11389,7 +11437,7 @@
+@@ -11473,7 +11521,7 @@
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -1549,7 +1433,7 @@
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest
lib=conftest
-@@ -11548,8 +11596,8 @@
+@@ -11632,8 +11680,8 @@
fi
done
done
@@ -1559,3206 +1443,54 @@
AC_MSG_RESULT([$SED])
])
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/admin/config.guess kdegraphics-3.4.0/admin/config.guess
---- kdegraphics-3.4.0.orig/admin/config.guess 2004-08-02 16:17:40.000000000 +0200
-+++ kdegraphics-3.4.0/admin/config.guess 2005-03-05 02:52:00.704169908 +0100
-@@ -3,7 +3,7 @@
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+diff -rua kdegraphics-3.4.1.orig/aclocal.m4 kdegraphics-3.4.1/aclocal.m4
+--- kdegraphics-3.4.1.orig/aclocal.m4 2005-05-23 18:00:22.000000000 +0200
++++ kdegraphics-3.4.1/aclocal.m4 2005-05-25 08:28:26.725121598 +0200
+@@ -501,6 +501,35 @@
+ rmdir .tst 2>/dev/null
+ AC_SUBST([am__leading_dot])])
--timestamp='2004-06-24'
-+timestamp='2004-11-12'
-
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -203,9 +203,6 @@
- amiga:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
-- arc:OpenBSD:*:*)
-- echo mipsel-unknown-openbsd${UNAME_RELEASE}
-- exit 0 ;;
- cats:OpenBSD:*:*)
- echo arm-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
-@@ -230,18 +227,12 @@
- mvmeppc:OpenBSD:*:*)
- echo powerpc-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
-- pmax:OpenBSD:*:*)
-- echo mipsel-unknown-openbsd${UNAME_RELEASE}
-- exit 0 ;;
- sgi:OpenBSD:*:*)
-- echo mipseb-unknown-openbsd${UNAME_RELEASE}
-+ echo mips64-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- sun3:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
-- wgrisc:OpenBSD:*:*)
-- echo mipsel-unknown-openbsd${UNAME_RELEASE}
-- exit 0 ;;
- *:OpenBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
-@@ -328,6 +319,9 @@
- *:OS/390:*:*)
- echo i370-ibm-openedition
- exit 0 ;;
-+ *:z/VM:*:*)
-+ echo s390-ibm-zvmoe
-+ exit 0 ;;
- *:OS400:*:*)
- echo powerpc-ibm-os400
- exit 0 ;;
-@@ -351,7 +345,7 @@
- DRS?6000:unix:4.0:6*)
- echo sparc-icl-nx6
- exit 0 ;;
-- DRS?6000:UNIX_SV:4.2*:7*)
-+ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
- case `/usr/bin/uname -p` in
- sparc) echo sparc-icl-nx7 && exit 0 ;;
- esac ;;
-@@ -833,6 +827,12 @@
- cris:Linux:*:*)
- echo cris-axis-linux-gnu
- exit 0 ;;
-+ crisv32:Linux:*:*)
-+ echo crisv32-axis-linux-gnu
-+ exit 0 ;;
-+ frv:Linux:*:*)
-+ echo frv-unknown-linux-gnu
-+ exit 0 ;;
- ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
-@@ -1081,7 +1081,7 @@
- exit 0 ;;
- M68*:*:R3V[5678]*:*)
- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-- 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
-+ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
- OS_REL=''
- test -r /etc/.relid \
- && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-@@ -1179,9 +1179,10 @@
- echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
- exit 0 ;;
- *:Darwin:*:*)
-- case `uname -p` in
-+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-+ case $UNAME_PROCESSOR in
- *86) UNAME_PROCESSOR=i686 ;;
-- powerpc) UNAME_PROCESSOR=powerpc ;;
-+ unknown) UNAME_PROCESSOR=powerpc ;;
- esac
- echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
- exit 0 ;;
-@@ -1249,7 +1250,10 @@
- A*) echo alpha-dec-vms && exit 0 ;;
- I*) echo ia64-dec-vms && exit 0 ;;
- V*) echo vax-dec-vms && exit 0 ;;
-- esac
-+ esac ;;
-+ *:XENIX:*:SysV)
-+ echo i386-pc-xenix
-+ exit 0 ;;
- esac
-
- #echo '(No uname command or uname output not recognized.)' 1>&2
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/admin/config.guess.cdbs-orig kdegraphics-3.4.0/admin/config.guess.cdbs-orig
---- kdegraphics-3.4.0.orig/admin/config.guess.cdbs-orig 1970-01-01 01:00:00.000000000 +0100
-+++ kdegraphics-3.4.0/admin/config.guess.cdbs-orig 2004-08-02 16:17:40.000000000 +0200
-@@ -0,0 +1,1449 @@
-+#! /bin/sh
-+# Attempt to guess a canonical system name.
-+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-+# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
++# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
++# From Jim Meyering
+
-+timestamp='2004-06-24'
-+
-+# This file is free software; you can redistribute it and/or modify it
-+# under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
++# Free Software Foundation, Inc.
+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
-+# Originally written by Per Bothner <per@bothner.com>.
-+# Please send patches to <config-patches@gnu.org>. Submit a context
-+# diff and a properly formatted ChangeLog entry.
-+#
-+# This script attempts to guess a canonical system name similar to
-+# config.sub. If it succeeds, it prints the system name on stdout, and
-+# exits with 0. Otherwise, it exits with 1.
-+#
-+# The plan is that this can be called by configure scripts if you
-+# don't specify an explicit build system type.
++# serial 4
+
-+me=`echo "$0" | sed -e 's,.*/,,'`
++AC_DEFUN([AM_MAINTAINER_MODE],
++[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
++ dnl maintainer-mode is disabled by default
++ AC_ARG_ENABLE(maintainer-mode,
++[ --enable-maintainer-mode enable make rules and dependencies not useful
++ (and sometimes confusing) to the casual installer],
++ USE_MAINTAINER_MODE=$enableval,
++ USE_MAINTAINER_MODE=no)
++ AC_MSG_RESULT([$USE_MAINTAINER_MODE])
++ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
++ MAINT=$MAINTAINER_MODE_TRUE
++ AC_SUBST(MAINT)dnl
++]
++)
+
-+usage="\
-+Usage: $0 [OPTION]
++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+
-+Output the configuration name of the system \`$me' is run on.
-+
-+Operation modes:
-+ -h, --help print this help, then exit
-+ -t, --time-stamp print date of last modification, then exit
-+ -v, --version print version number, then exit
-+
-+Report bugs and patches to <config-patches@gnu.org>."
-+
-+version="\
-+GNU config.guess ($timestamp)
-+
-+Originally written by Per Bothner.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-+Free Software Foundation, Inc.
-+
-+This is free software; see the source for copying conditions. There is NO
-+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-+
-+help="
-+Try \`$me --help' for more information."
-+
-+# Parse command line
-+while test $# -gt 0 ; do
-+ case $1 in
-+ --time-stamp | --time* | -t )
-+ echo "$timestamp" ; exit 0 ;;
-+ --version | -v )
-+ echo "$version" ; exit 0 ;;
-+ --help | --h* | -h )
-+ echo "$usage"; exit 0 ;;
-+ -- ) # Stop option processing
-+ shift; break ;;
-+ - ) # Use stdin as input.
-+ break ;;
-+ -* )
-+ echo "$me: invalid option $1$help" >&2
-+ exit 1 ;;
-+ * )
-+ break ;;
-+ esac
-+done
-+
-+if test $# != 0; then
-+ echo "$me: too many arguments$help" >&2
-+ exit 1
-+fi
-+
-+trap 'exit 1' 1 2 15
-+
-+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-+# compiler to aid in system detection is discouraged as it requires
-+# temporary files to be created and, as you can see below, it is a
-+# headache to deal with in a portable fashion.
-+
-+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-+# use `HOST_CC' if defined, but it is deprecated.
-+
-+# Portable tmp directory creation inspired by the Autoconf team.
-+
-+set_cc_for_build='
-+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-+: ${TMPDIR=/tmp} ;
-+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
-+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
-+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
-+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-+dummy=$tmp/dummy ;
-+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-+case $CC_FOR_BUILD,$HOST_CC,$CC in
-+ ,,) echo "int x;" > $dummy.c ;
-+ for c in cc gcc c89 c99 ; do
-+ if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-+ CC_FOR_BUILD="$c"; break ;
-+ fi ;
-+ done ;
-+ if test x"$CC_FOR_BUILD" = x ; then
-+ CC_FOR_BUILD=no_compiler_found ;
-+ fi
-+ ;;
-+ ,,*) CC_FOR_BUILD=$CC ;;
-+ ,*,*) CC_FOR_BUILD=$HOST_CC ;;
-+esac ;'
-+
-+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-+# (ghazi@noc.rutgers.edu 1994-08-24)
-+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-+ PATH=$PATH:/.attbin ; export PATH
-+fi
-+
-+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-+UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
-+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-+
-+# Note: order is significant - the case branches are not exclusive.
-+
-+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-+ *:NetBSD:*:*)
-+ # NetBSD (nbsd) targets should (where applicable) match one or
-+ # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-+ # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
-+ # switched to ELF, *-*-netbsd* would select the old
-+ # object file format. This provides both forward
-+ # compatibility and a consistent mechanism for selecting the
-+ # object file format.
-+ #
-+ # Note: NetBSD doesn't particularly care about the vendor
-+ # portion of the name. We always set it to "unknown".
-+ sysctl="sysctl -n hw.machine_arch"
-+ UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-+ /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-+ case "${UNAME_MACHINE_ARCH}" in
-+ armeb) machine=armeb-unknown ;;
-+ arm*) machine=arm-unknown ;;
-+ sh3el) machine=shl-unknown ;;
-+ sh3eb) machine=sh-unknown ;;
-+ *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-+ esac
-+ # The Operating System including object format, if it has switched
-+ # to ELF recently, or will in the future.
-+ case "${UNAME_MACHINE_ARCH}" in
-+ arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-+ eval $set_cc_for_build
-+ if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-+ | grep __ELF__ >/dev/null
-+ then
-+ # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-+ # Return netbsd for either. FIX?
-+ os=netbsd
-+ else
-+ os=netbsdelf
-+ fi
-+ ;;
-+ *)
-+ os=netbsd
-+ ;;
-+ esac
-+ # The OS release
-+ # Debian GNU/NetBSD machines have a different userland, and
-+ # thus, need a distinct triplet. However, they do not need
-+ # kernel version information, so it can be replaced with a
-+ # suitable tag, in the style of linux-gnu.
-+ case "${UNAME_VERSION}" in
-+ Debian*)
-+ release='-gnu'
-+ ;;
-+ *)
-+ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-+ ;;
-+ esac
-+ # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-+ # contains redundant information, the shorter form:
-+ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-+ echo "${machine}-${os}${release}"
-+ exit 0 ;;
-+ amd64:OpenBSD:*:*)
-+ echo x86_64-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ amiga:OpenBSD:*:*)
-+ echo m68k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ arc:OpenBSD:*:*)
-+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ cats:OpenBSD:*:*)
-+ echo arm-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ hp300:OpenBSD:*:*)
-+ echo m68k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ luna88k:OpenBSD:*:*)
-+ echo m88k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ mac68k:OpenBSD:*:*)
-+ echo m68k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ macppc:OpenBSD:*:*)
-+ echo powerpc-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ mvme68k:OpenBSD:*:*)
-+ echo m68k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ mvme88k:OpenBSD:*:*)
-+ echo m88k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ mvmeppc:OpenBSD:*:*)
-+ echo powerpc-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ pmax:OpenBSD:*:*)
-+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ sgi:OpenBSD:*:*)
-+ echo mipseb-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ sun3:OpenBSD:*:*)
-+ echo m68k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ wgrisc:OpenBSD:*:*)
-+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:OpenBSD:*:*)
-+ echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:ekkoBSD:*:*)
-+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ macppc:MirBSD:*:*)
-+ echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:MirBSD:*:*)
-+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ alpha:OSF1:*:*)
-+ case $UNAME_RELEASE in
-+ *4.0)
-+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-+ ;;
-+ *5.*)
-+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-+ ;;
-+ esac
-+ # According to Compaq, /usr/sbin/psrinfo has been available on
-+ # OSF/1 and Tru64 systems produced since 1995. I hope that
-+ # covers most systems running today. This code pipes the CPU
-+ # types through head -n 1, so we only detect the type of CPU 0.
-+ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-+ case "$ALPHA_CPU_TYPE" in
-+ "EV4 (21064)")
-+ UNAME_MACHINE="alpha" ;;
-+ "EV4.5 (21064)")
-+ UNAME_MACHINE="alpha" ;;
-+ "LCA4 (21066/21068)")
-+ UNAME_MACHINE="alpha" ;;
-+ "EV5 (21164)")
-+ UNAME_MACHINE="alphaev5" ;;
-+ "EV5.6 (21164A)")
-+ UNAME_MACHINE="alphaev56" ;;
-+ "EV5.6 (21164PC)")
-+ UNAME_MACHINE="alphapca56" ;;
-+ "EV5.7 (21164PC)")
-+ UNAME_MACHINE="alphapca57" ;;
-+ "EV6 (21264)")
-+ UNAME_MACHINE="alphaev6" ;;
-+ "EV6.7 (21264A)")
-+ UNAME_MACHINE="alphaev67" ;;
-+ "EV6.8CB (21264C)")
-+ UNAME_MACHINE="alphaev68" ;;
-+ "EV6.8AL (21264B)")
-+ UNAME_MACHINE="alphaev68" ;;
-+ "EV6.8CX (21264D)")
-+ UNAME_MACHINE="alphaev68" ;;
-+ "EV6.9A (21264/EV69A)")
-+ UNAME_MACHINE="alphaev69" ;;
-+ "EV7 (21364)")
-+ UNAME_MACHINE="alphaev7" ;;
-+ "EV7.9 (21364A)")
-+ UNAME_MACHINE="alphaev79" ;;
-+ esac
-+ # A Pn.n version is a patched version.
-+ # A Vn.n version is a released version.
-+ # A Tn.n version is a released field test version.
-+ # A Xn.n version is an unreleased experimental baselevel.
-+ # 1.2 uses "1.2" for uname -r.
-+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-+ exit 0 ;;
-+ Alpha\ *:Windows_NT*:*)
-+ # How do we know it's Interix rather than the generic POSIX subsystem?
-+ # Should we change UNAME_MACHINE based on the output of uname instead
-+ # of the specific Alpha model?
-+ echo alpha-pc-interix
-+ exit 0 ;;
-+ 21064:Windows_NT:50:3)
-+ echo alpha-dec-winnt3.5
-+ exit 0 ;;
-+ Amiga*:UNIX_System_V:4.0:*)
-+ echo m68k-unknown-sysv4
-+ exit 0;;
-+ *:[Aa]miga[Oo][Ss]:*:*)
-+ echo ${UNAME_MACHINE}-unknown-amigaos
-+ exit 0 ;;
-+ *:[Mm]orph[Oo][Ss]:*:*)
-+ echo ${UNAME_MACHINE}-unknown-morphos
-+ exit 0 ;;
-+ *:OS/390:*:*)
-+ echo i370-ibm-openedition
-+ exit 0 ;;
-+ *:OS400:*:*)
-+ echo powerpc-ibm-os400
-+ exit 0 ;;
-+ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-+ echo arm-acorn-riscix${UNAME_RELEASE}
-+ exit 0;;
-+ SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-+ echo hppa1.1-hitachi-hiuxmpp
-+ exit 0;;
-+ Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-+ # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-+ if test "`(/bin/universe) 2>/dev/null`" = att ; then
-+ echo pyramid-pyramid-sysv3
-+ else
-+ echo pyramid-pyramid-bsd
-+ fi
-+ exit 0 ;;
-+ NILE*:*:*:dcosx)
-+ echo pyramid-pyramid-svr4
-+ exit 0 ;;
-+ DRS?6000:unix:4.0:6*)
-+ echo sparc-icl-nx6
-+ exit 0 ;;
-+ DRS?6000:UNIX_SV:4.2*:7*)
-+ case `/usr/bin/uname -p` in
-+ sparc) echo sparc-icl-nx7 && exit 0 ;;
-+ esac ;;
-+ sun4H:SunOS:5.*:*)
-+ echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+ exit 0 ;;
-+ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-+ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+ exit 0 ;;
-+ i86pc:SunOS:5.*:*)
-+ echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+ exit 0 ;;
-+ sun4*:SunOS:6*:*)
-+ # According to config.sub, this is the proper way to canonicalize
-+ # SunOS6. Hard to guess exactly what SunOS6 will be like, but
-+ # it's likely to be more like Solaris than SunOS4.
-+ echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+ exit 0 ;;
-+ sun4*:SunOS:*:*)
-+ case "`/usr/bin/arch -k`" in
-+ Series*|S4*)
-+ UNAME_RELEASE=`uname -v`
-+ ;;
-+ esac
-+ # Japanese Language versions have a version number like `4.1.3-JL'.
-+ echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-+ exit 0 ;;
-+ sun3*:SunOS:*:*)
-+ echo m68k-sun-sunos${UNAME_RELEASE}
-+ exit 0 ;;
-+ sun*:*:4.2BSD:*)
-+ UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-+ test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-+ case "`/bin/arch`" in
-+ sun3)
-+ echo m68k-sun-sunos${UNAME_RELEASE}
-+ ;;
-+ sun4)
-+ echo sparc-sun-sunos${UNAME_RELEASE}
-+ ;;
-+ esac
-+ exit 0 ;;
-+ aushp:SunOS:*:*)
-+ echo sparc-auspex-sunos${UNAME_RELEASE}
-+ exit 0 ;;
-+ # The situation for MiNT is a little confusing. The machine name
-+ # can be virtually everything (everything which is not
-+ # "atarist" or "atariste" at least should have a processor
-+ # > m68000). The system name ranges from "MiNT" over "FreeMiNT"
-+ # to the lowercase version "mint" (or "freemint"). Finally
-+ # the system name "TOS" denotes a system which is actually not
-+ # MiNT. But MiNT is downward compatible to TOS, so this should
-+ # be no problem.
-+ atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-+ echo m68k-atari-mint${UNAME_RELEASE}
-+ exit 0 ;;
-+ atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-+ echo m68k-atari-mint${UNAME_RELEASE}
-+ exit 0 ;;
-+ *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-+ echo m68k-atari-mint${UNAME_RELEASE}
-+ exit 0 ;;
-+ milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-+ echo m68k-milan-mint${UNAME_RELEASE}
-+ exit 0 ;;
-+ hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-+ echo m68k-hades-mint${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-+ echo m68k-unknown-mint${UNAME_RELEASE}
-+ exit 0 ;;
-+ m68k:machten:*:*)
-+ echo m68k-apple-machten${UNAME_RELEASE}
-+ exit 0 ;;
-+ powerpc:machten:*:*)
-+ echo powerpc-apple-machten${UNAME_RELEASE}
-+ exit 0 ;;
-+ RISC*:Mach:*:*)
-+ echo mips-dec-mach_bsd4.3
-+ exit 0 ;;
-+ RISC*:ULTRIX:*:*)
-+ echo mips-dec-ultrix${UNAME_RELEASE}
-+ exit 0 ;;
-+ VAX*:ULTRIX*:*:*)
-+ echo vax-dec-ultrix${UNAME_RELEASE}
-+ exit 0 ;;
-+ 2020:CLIX:*:* | 2430:CLIX:*:*)
-+ echo clipper-intergraph-clix${UNAME_RELEASE}
-+ exit 0 ;;
-+ mips:*:*:UMIPS | mips:*:*:RISCos)
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+#ifdef __cplusplus
-+#include <stdio.h> /* for printf() prototype */
-+ int main (int argc, char *argv[]) {
-+#else
-+ int main (argc, argv) int argc; char *argv[]; {
-+#endif
-+ #if defined (host_mips) && defined (MIPSEB)
-+ #if defined (SYSTYPE_SYSV)
-+ printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-+ #endif
-+ #if defined (SYSTYPE_SVR4)
-+ printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-+ #endif
-+ #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-+ printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-+ #endif
-+ #endif
-+ exit (-1);
-+ }
-+EOF
-+ $CC_FOR_BUILD -o $dummy $dummy.c \
-+ && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-+ && exit 0
-+ echo mips-mips-riscos${UNAME_RELEASE}
-+ exit 0 ;;
-+ Motorola:PowerMAX_OS:*:*)
-+ echo powerpc-motorola-powermax
-+ exit 0 ;;
-+ Motorola:*:4.3:PL8-*)
-+ echo powerpc-harris-powermax
-+ exit 0 ;;
-+ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-+ echo powerpc-harris-powermax
-+ exit 0 ;;
-+ Night_Hawk:Power_UNIX:*:*)
-+ echo powerpc-harris-powerunix
-+ exit 0 ;;
-+ m88k:CX/UX:7*:*)
-+ echo m88k-harris-cxux7
-+ exit 0 ;;
-+ m88k:*:4*:R4*)
-+ echo m88k-motorola-sysv4
-+ exit 0 ;;
-+ m88k:*:3*:R3*)
-+ echo m88k-motorola-sysv3
-+ exit 0 ;;
-+ AViiON:dgux:*:*)
-+ # DG/UX returns AViiON for all architectures
-+ UNAME_PROCESSOR=`/usr/bin/uname -p`
-+ if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-+ then
-+ if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-+ [ ${TARGET_BINARY_INTERFACE}x = x ]
-+ then
-+ echo m88k-dg-dgux${UNAME_RELEASE}
-+ else
-+ echo m88k-dg-dguxbcs${UNAME_RELEASE}
-+ fi
-+ else
-+ echo i586-dg-dgux${UNAME_RELEASE}
-+ fi
-+ exit 0 ;;
-+ M88*:DolphinOS:*:*) # DolphinOS (SVR3)
-+ echo m88k-dolphin-sysv3
-+ exit 0 ;;
-+ M88*:*:R3*:*)
-+ # Delta 88k system running SVR3
-+ echo m88k-motorola-sysv3
-+ exit 0 ;;
-+ XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-+ echo m88k-tektronix-sysv3
-+ exit 0 ;;
-+ Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-+ echo m68k-tektronix-bsd
-+ exit 0 ;;
-+ *:IRIX*:*:*)
-+ echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-+ exit 0 ;;
-+ ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
-+ exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
-+ i*86:AIX:*:*)
-+ echo i386-ibm-aix
-+ exit 0 ;;
-+ ia64:AIX:*:*)
-+ if [ -x /usr/bin/oslevel ] ; then
-+ IBM_REV=`/usr/bin/oslevel`
-+ else
-+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-+ fi
-+ echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-+ exit 0 ;;
-+ *:AIX:2:3)
-+ if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+ #include <sys/systemcfg.h>
-+
-+ main()
-+ {
-+ if (!__power_pc())
-+ exit(1);
-+ puts("powerpc-ibm-aix3.2.5");
-+ exit(0);
-+ }
-+EOF
-+ $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-+ echo rs6000-ibm-aix3.2.5
-+ elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-+ echo rs6000-ibm-aix3.2.4
-+ else
-+ echo rs6000-ibm-aix3.2
-+ fi
-+ exit 0 ;;
-+ *:AIX:*:[45])
-+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-+ if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-+ IBM_ARCH=rs6000
-+ else
-+ IBM_ARCH=powerpc
-+ fi
-+ if [ -x /usr/bin/oslevel ] ; then
-+ IBM_REV=`/usr/bin/oslevel`
-+ else
-+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-+ fi
-+ echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-+ exit 0 ;;
-+ *:AIX:*:*)
-+ echo rs6000-ibm-aix
-+ exit 0 ;;
-+ ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-+ echo romp-ibm-bsd4.4
-+ exit 0 ;;
-+ ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
-+ echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
-+ exit 0 ;; # report: romp-ibm BSD 4.3
-+ *:BOSX:*:*)
-+ echo rs6000-bull-bosx
-+ exit 0 ;;
-+ DPX/2?00:B.O.S.:*:*)
-+ echo m68k-bull-sysv3
-+ exit 0 ;;
-+ 9000/[34]??:4.3bsd:1.*:*)
-+ echo m68k-hp-bsd
-+ exit 0 ;;
-+ hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-+ echo m68k-hp-bsd4.4
-+ exit 0 ;;
-+ 9000/[34678]??:HP-UX:*:*)
-+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-+ case "${UNAME_MACHINE}" in
-+ 9000/31? ) HP_ARCH=m68000 ;;
-+ 9000/[34]?? ) HP_ARCH=m68k ;;
-+ 9000/[678][0-9][0-9])
-+ if [ -x /usr/bin/getconf ]; then
-+ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-+ case "${sc_cpu_version}" in
-+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-+ 532) # CPU_PA_RISC2_0
-+ case "${sc_kernel_bits}" in
-+ 32) HP_ARCH="hppa2.0n" ;;
-+ 64) HP_ARCH="hppa2.0w" ;;
-+ '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
-+ esac ;;
-+ esac
-+ fi
-+ if [ "${HP_ARCH}" = "" ]; then
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+
-+ #define _HPUX_SOURCE
-+ #include <stdlib.h>
-+ #include <unistd.h>
-+
-+ int main ()
-+ {
-+ #if defined(_SC_KERNEL_BITS)
-+ long bits = sysconf(_SC_KERNEL_BITS);
-+ #endif
-+ long cpu = sysconf (_SC_CPU_VERSION);
-+
-+ switch (cpu)
-+ {
-+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-+ case CPU_PA_RISC2_0:
-+ #if defined(_SC_KERNEL_BITS)
-+ switch (bits)
-+ {
-+ case 64: puts ("hppa2.0w"); break;
-+ case 32: puts ("hppa2.0n"); break;
-+ default: puts ("hppa2.0"); break;
-+ } break;
-+ #else /* !defined(_SC_KERNEL_BITS) */
-+ puts ("hppa2.0"); break;
-+ #endif
-+ default: puts ("hppa1.0"); break;
-+ }
-+ exit (0);
-+ }
-+EOF
-+ (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-+ test -z "$HP_ARCH" && HP_ARCH=hppa
-+ fi ;;
-+ esac
-+ if [ ${HP_ARCH} = "hppa2.0w" ]
-+ then
-+ # avoid double evaluation of $set_cc_for_build
-+ test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
-+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
-+ then
-+ HP_ARCH="hppa2.0w"
-+ else
-+ HP_ARCH="hppa64"
-+ fi
-+ fi
-+ echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-+ exit 0 ;;
-+ ia64:HP-UX:*:*)
-+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-+ echo ia64-hp-hpux${HPUX_REV}
-+ exit 0 ;;
-+ 3050*:HI-UX:*:*)
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+ #include <unistd.h>
-+ int
-+ main ()
-+ {
-+ long cpu = sysconf (_SC_CPU_VERSION);
-+ /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-+ true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct
-+ results, however. */
-+ if (CPU_IS_PA_RISC (cpu))
-+ {
-+ switch (cpu)
-+ {
-+ case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-+ case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-+ case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-+ default: puts ("hppa-hitachi-hiuxwe2"); break;
-+ }
-+ }
-+ else if (CPU_IS_HP_MC68K (cpu))
-+ puts ("m68k-hitachi-hiuxwe2");
-+ else puts ("unknown-hitachi-hiuxwe2");
-+ exit (0);
-+ }
-+EOF
-+ $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-+ echo unknown-hitachi-hiuxwe2
-+ exit 0 ;;
-+ 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-+ echo hppa1.1-hp-bsd
-+ exit 0 ;;
-+ 9000/8??:4.3bsd:*:*)
-+ echo hppa1.0-hp-bsd
-+ exit 0 ;;
-+ *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-+ echo hppa1.0-hp-mpeix
-+ exit 0 ;;
-+ hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-+ echo hppa1.1-hp-osf
-+ exit 0 ;;
-+ hp8??:OSF1:*:*)
-+ echo hppa1.0-hp-osf
-+ exit 0 ;;
-+ i*86:OSF1:*:*)
-+ if [ -x /usr/sbin/sysversion ] ; then
-+ echo ${UNAME_MACHINE}-unknown-osf1mk
-+ else
-+ echo ${UNAME_MACHINE}-unknown-osf1
-+ fi
-+ exit 0 ;;
-+ parisc*:Lites*:*:*)
-+ echo hppa1.1-hp-lites
-+ exit 0 ;;
-+ C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-+ echo c1-convex-bsd
-+ exit 0 ;;
-+ C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-+ if getsysinfo -f scalar_acc
-+ then echo c32-convex-bsd
-+ else echo c2-convex-bsd
-+ fi
-+ exit 0 ;;
-+ C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-+ echo c34-convex-bsd
-+ exit 0 ;;
-+ C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-+ echo c38-convex-bsd
-+ exit 0 ;;
-+ C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-+ echo c4-convex-bsd
-+ exit 0 ;;
-+ CRAY*Y-MP:*:*:*)
-+ echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+ exit 0 ;;
-+ CRAY*[A-Z]90:*:*:*)
-+ echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-+ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-+ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-+ -e 's/\.[^.]*$/.X/'
-+ exit 0 ;;
-+ CRAY*TS:*:*:*)
-+ echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+ exit 0 ;;
-+ CRAY*T3E:*:*:*)
-+ echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+ exit 0 ;;
-+ CRAY*SV1:*:*:*)
-+ echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+ exit 0 ;;
-+ *:UNICOS/mp:*:*)
-+ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+ exit 0 ;;
-+ F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-+ FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+ exit 0 ;;
-+ 5000:UNIX_System_V:4.*:*)
-+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+ exit 0 ;;
-+ i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-+ echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-+ exit 0 ;;
-+ sparc*:BSD/OS:*:*)
-+ echo sparc-unknown-bsdi${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:BSD/OS:*:*)
-+ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:FreeBSD:*:*)
-+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-+ exit 0 ;;
-+ i*:CYGWIN*:*)
-+ echo ${UNAME_MACHINE}-pc-cygwin
-+ exit 0 ;;
-+ i*:MINGW*:*)
-+ echo ${UNAME_MACHINE}-pc-mingw32
-+ exit 0 ;;
-+ i*:PW*:*)
-+ echo ${UNAME_MACHINE}-pc-pw32
-+ exit 0 ;;
-+ x86:Interix*:[34]*)
-+ echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-+ exit 0 ;;
-+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-+ echo i${UNAME_MACHINE}-pc-mks
-+ exit 0 ;;
-+ i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-+ # How do we know it's Interix rather than the generic POSIX subsystem?
-+ # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-+ # UNAME_MACHINE based on the output of uname instead of i386?
-+ echo i586-pc-interix
-+ exit 0 ;;
-+ i*:UWIN*:*)
-+ echo ${UNAME_MACHINE}-pc-uwin
-+ exit 0 ;;
-+ p*:CYGWIN*:*)
-+ echo powerpcle-unknown-cygwin
-+ exit 0 ;;
-+ prep*:SunOS:5.*:*)
-+ echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+ exit 0 ;;
-+ *:GNU:*:*)
-+ # the GNU system
-+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-+ exit 0 ;;
-+ *:GNU/*:*:*)
-+ # other systems with GNU libc and userland
-+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-+ exit 0 ;;
-+ i*86:Minix:*:*)
-+ echo ${UNAME_MACHINE}-pc-minix
-+ exit 0 ;;
-+ arm*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit 0 ;;
-+ cris:Linux:*:*)
-+ echo cris-axis-linux-gnu
-+ exit 0 ;;
-+ ia64:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit 0 ;;
-+ m32r*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit 0 ;;
-+ m68*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit 0 ;;
-+ mips:Linux:*:*)
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+ #undef CPU
-+ #undef mips
-+ #undef mipsel
-+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-+ CPU=mipsel
-+ #else
-+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-+ CPU=mips
-+ #else
-+ CPU=
-+ #endif
-+ #endif
-+EOF
-+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-+ test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-+ ;;
-+ mips64:Linux:*:*)
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+ #undef CPU
-+ #undef mips64
-+ #undef mips64el
-+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-+ CPU=mips64el
-+ #else
-+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-+ CPU=mips64
-+ #else
-+ CPU=
-+ #endif
-+ #endif
-+EOF
-+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-+ test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-+ ;;
-+ ppc:Linux:*:*)
-+ echo powerpc-unknown-linux-gnu
-+ exit 0 ;;
-+ ppc64:Linux:*:*)
-+ echo powerpc64-unknown-linux-gnu
-+ exit 0 ;;
-+ alpha:Linux:*:*)
-+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-+ EV5) UNAME_MACHINE=alphaev5 ;;
-+ EV56) UNAME_MACHINE=alphaev56 ;;
-+ PCA56) UNAME_MACHINE=alphapca56 ;;
-+ PCA57) UNAME_MACHINE=alphapca56 ;;
-+ EV6) UNAME_MACHINE=alphaev6 ;;
-+ EV67) UNAME_MACHINE=alphaev67 ;;
-+ EV68*) UNAME_MACHINE=alphaev68 ;;
-+ esac
-+ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-+ exit 0 ;;
-+ parisc:Linux:*:* | hppa:Linux:*:*)
-+ # Look for CPU level
-+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-+ PA7*) echo hppa1.1-unknown-linux-gnu ;;
-+ PA8*) echo hppa2.0-unknown-linux-gnu ;;
-+ *) echo hppa-unknown-linux-gnu ;;
-+ esac
-+ exit 0 ;;
-+ parisc64:Linux:*:* | hppa64:Linux:*:*)
-+ echo hppa64-unknown-linux-gnu
-+ exit 0 ;;
-+ s390:Linux:*:* | s390x:Linux:*:*)
-+ echo ${UNAME_MACHINE}-ibm-linux
-+ exit 0 ;;
-+ sh64*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit 0 ;;
-+ sh*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit 0 ;;
-+ sparc:Linux:*:* | sparc64:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit 0 ;;
-+ x86_64:Linux:*:*)
-+ echo x86_64-unknown-linux-gnu
-+ exit 0 ;;
-+ i*86:Linux:*:*)
-+ # The BFD linker knows what the default object file format is, so
-+ # first see if it will tell us. cd to the root directory to prevent
-+ # problems with other programs or directories called `ld' in the path.
-+ # Set LC_ALL=C to ensure ld outputs messages in English.
-+ ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-+ | sed -ne '/supported targets:/!d
-+ s/[ ][ ]*/ /g
-+ s/.*supported targets: *//
-+ s/ .*//
-+ p'`
-+ case "$ld_supported_targets" in
-+ elf32-i386)
-+ TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-+ ;;
-+ a.out-i386-linux)
-+ echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-+ exit 0 ;;
-+ coff-i386)
-+ echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-+ exit 0 ;;
-+ "")
-+ # Either a pre-BFD a.out linker (linux-gnuoldld) or
-+ # one that does not give us useful --help.
-+ echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-+ exit 0 ;;
-+ esac
-+ # Determine whether the default compiler is a.out or elf
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+ #include <features.h>
-+ #ifdef __ELF__
-+ # ifdef __GLIBC__
-+ # if __GLIBC__ >= 2
-+ LIBC=gnu
-+ # else
-+ LIBC=gnulibc1
-+ # endif
-+ # else
-+ LIBC=gnulibc1
-+ # endif
-+ #else
-+ #ifdef __INTEL_COMPILER
-+ LIBC=gnu
-+ #else
-+ LIBC=gnuaout
-+ #endif
-+ #endif
-+ #ifdef __dietlibc__
-+ LIBC=dietlibc
-+ #endif
-+EOF
-+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-+ test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
-+ test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-+ ;;
-+ i*86:DYNIX/ptx:4*:*)
-+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-+ # earlier versions are messed up and put the nodename in both
-+ # sysname and nodename.
-+ echo i386-sequent-sysv4
-+ exit 0 ;;
-+ i*86:UNIX_SV:4.2MP:2.*)
-+ # Unixware is an offshoot of SVR4, but it has its own version
-+ # number series starting with 2...
-+ # I am not positive that other SVR4 systems won't match this,
-+ # I just have to hope. -- rms.
-+ # Use sysv4.2uw... so that sysv4* matches it.
-+ echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-+ exit 0 ;;
-+ i*86:OS/2:*:*)
-+ # If we were able to find `uname', then EMX Unix compatibility
-+ # is probably installed.
-+ echo ${UNAME_MACHINE}-pc-os2-emx
-+ exit 0 ;;
-+ i*86:XTS-300:*:STOP)
-+ echo ${UNAME_MACHINE}-unknown-stop
-+ exit 0 ;;
-+ i*86:atheos:*:*)
-+ echo ${UNAME_MACHINE}-unknown-atheos
-+ exit 0 ;;
-+ i*86:syllable:*:*)
-+ echo ${UNAME_MACHINE}-pc-syllable
-+ exit 0 ;;
-+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-+ echo i386-unknown-lynxos${UNAME_RELEASE}
-+ exit 0 ;;
-+ i*86:*DOS:*:*)
-+ echo ${UNAME_MACHINE}-pc-msdosdjgpp
-+ exit 0 ;;
-+ i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-+ UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-+ if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-+ echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-+ else
-+ echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-+ fi
-+ exit 0 ;;
-+ i*86:*:5:[78]*)
-+ case `/bin/uname -X | grep "^Machine"` in
-+ *486*) UNAME_MACHINE=i486 ;;
-+ *Pentium) UNAME_MACHINE=i586 ;;
-+ *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-+ esac
-+ echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-+ exit 0 ;;
-+ i*86:*:3.2:*)
-+ if test -f /usr/options/cb.name; then
-+ UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-+ echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-+ elif /bin/uname -X 2>/dev/null >/dev/null ; then
-+ UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-+ (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-+ (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-+ && UNAME_MACHINE=i586
-+ (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-+ && UNAME_MACHINE=i686
-+ (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-+ && UNAME_MACHINE=i686
-+ echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-+ else
-+ echo ${UNAME_MACHINE}-pc-sysv32
-+ fi
-+ exit 0 ;;
-+ pc:*:*:*)
-+ # Left here for compatibility:
-+ # uname -m prints for DJGPP always 'pc', but it prints nothing about
-+ # the processor, so we play safe by assuming i386.
-+ echo i386-pc-msdosdjgpp
-+ exit 0 ;;
-+ Intel:Mach:3*:*)
-+ echo i386-pc-mach3
-+ exit 0 ;;
-+ paragon:*:*:*)
-+ echo i860-intel-osf1
-+ exit 0 ;;
-+ i860:*:4.*:*) # i860-SVR4
-+ if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-+ echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-+ else # Add other i860-SVR4 vendors below as they are discovered.
-+ echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
-+ fi
-+ exit 0 ;;
-+ mini*:CTIX:SYS*5:*)
-+ # "miniframe"
-+ echo m68010-convergent-sysv
-+ exit 0 ;;
-+ mc68k:UNIX:SYSTEM5:3.51m)
-+ echo m68k-convergent-sysv
-+ exit 0 ;;
-+ M680?0:D-NIX:5.3:*)
-+ echo m68k-diab-dnix
-+ exit 0 ;;
-+ M68*:*:R3V[5678]*:*)
-+ test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-+ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
-+ OS_REL=''
-+ test -r /etc/.relid \
-+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+ && echo i486-ncr-sysv4.3${OS_REL} && exit 0
-+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-+ && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
-+ 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+ && echo i486-ncr-sysv4 && exit 0 ;;
-+ m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-+ echo m68k-unknown-lynxos${UNAME_RELEASE}
-+ exit 0 ;;
-+ mc68030:UNIX_System_V:4.*:*)
-+ echo m68k-atari-sysv4
-+ exit 0 ;;
-+ TSUNAMI:LynxOS:2.*:*)
-+ echo sparc-unknown-lynxos${UNAME_RELEASE}
-+ exit 0 ;;
-+ rs6000:LynxOS:2.*:*)
-+ echo rs6000-unknown-lynxos${UNAME_RELEASE}
-+ exit 0 ;;
-+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-+ echo powerpc-unknown-lynxos${UNAME_RELEASE}
-+ exit 0 ;;
-+ SM[BE]S:UNIX_SV:*:*)
-+ echo mips-dde-sysv${UNAME_RELEASE}
-+ exit 0 ;;
-+ RM*:ReliantUNIX-*:*:*)
-+ echo mips-sni-sysv4
-+ exit 0 ;;
-+ RM*:SINIX-*:*:*)
-+ echo mips-sni-sysv4
-+ exit 0 ;;
-+ *:SINIX-*:*:*)
-+ if uname -p 2>/dev/null >/dev/null ; then
-+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
-+ echo ${UNAME_MACHINE}-sni-sysv4
-+ else
-+ echo ns32k-sni-sysv
-+ fi
-+ exit 0 ;;
-+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-+ # says <Richard.M.Bartel@ccMail.Census.GOV>
-+ echo i586-unisys-sysv4
-+ exit 0 ;;
-+ *:UNIX_System_V:4*:FTX*)
-+ # From Gerald Hewes <hewes@openmarket.com>.
-+ # How about differentiating between stratus architectures? -djm
-+ echo hppa1.1-stratus-sysv4
-+ exit 0 ;;
-+ *:*:*:FTX*)
-+ # From seanf@swdc.stratus.com.
-+ echo i860-stratus-sysv4
-+ exit 0 ;;
-+ *:VOS:*:*)
-+ # From Paul.Green@stratus.com.
-+ echo hppa1.1-stratus-vos
-+ exit 0 ;;
-+ mc68*:A/UX:*:*)
-+ echo m68k-apple-aux${UNAME_RELEASE}
-+ exit 0 ;;
-+ news*:NEWS-OS:6*:*)
-+ echo mips-sony-newsos6
-+ exit 0 ;;
-+ R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-+ if [ -d /usr/nec ]; then
-+ echo mips-nec-sysv${UNAME_RELEASE}
-+ else
-+ echo mips-unknown-sysv${UNAME_RELEASE}
-+ fi
-+ exit 0 ;;
-+ BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
-+ echo powerpc-be-beos
-+ exit 0 ;;
-+ BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
-+ echo powerpc-apple-beos
-+ exit 0 ;;
-+ BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
-+ echo i586-pc-beos
-+ exit 0 ;;
-+ SX-4:SUPER-UX:*:*)
-+ echo sx4-nec-superux${UNAME_RELEASE}
-+ exit 0 ;;
-+ SX-5:SUPER-UX:*:*)
-+ echo sx5-nec-superux${UNAME_RELEASE}
-+ exit 0 ;;
-+ SX-6:SUPER-UX:*:*)
-+ echo sx6-nec-superux${UNAME_RELEASE}
-+ exit 0 ;;
-+ Power*:Rhapsody:*:*)
-+ echo powerpc-apple-rhapsody${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:Rhapsody:*:*)
-+ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:Darwin:*:*)
-+ case `uname -p` in
-+ *86) UNAME_PROCESSOR=i686 ;;
-+ powerpc) UNAME_PROCESSOR=powerpc ;;
-+ esac
-+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:procnto*:*:* | *:QNX:[0123456789]*:*)
-+ UNAME_PROCESSOR=`uname -p`
-+ if test "$UNAME_PROCESSOR" = "x86"; then
-+ UNAME_PROCESSOR=i386
-+ UNAME_MACHINE=pc
-+ fi
-+ echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:QNX:*:4*)
-+ echo i386-pc-qnx
-+ exit 0 ;;
-+ NSR-?:NONSTOP_KERNEL:*:*)
-+ echo nsr-tandem-nsk${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:NonStop-UX:*:*)
-+ echo mips-compaq-nonstopux
-+ exit 0 ;;
-+ BS2000:POSIX*:*:*)
-+ echo bs2000-siemens-sysv
-+ exit 0 ;;
-+ DS/*:UNIX_System_V:*:*)
-+ echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:Plan9:*:*)
-+ # "uname -m" is not consistent, so use $cputype instead. 386
-+ # is converted to i386 for consistency with other x86
-+ # operating systems.
-+ if test "$cputype" = "386"; then
-+ UNAME_MACHINE=i386
-+ else
-+ UNAME_MACHINE="$cputype"
-+ fi
-+ echo ${UNAME_MACHINE}-unknown-plan9
-+ exit 0 ;;
-+ *:TOPS-10:*:*)
-+ echo pdp10-unknown-tops10
-+ exit 0 ;;
-+ *:TENEX:*:*)
-+ echo pdp10-unknown-tenex
-+ exit 0 ;;
-+ KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-+ echo pdp10-dec-tops20
-+ exit 0 ;;
-+ XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-+ echo pdp10-xkl-tops20
-+ exit 0 ;;
-+ *:TOPS-20:*:*)
-+ echo pdp10-unknown-tops20
-+ exit 0 ;;
-+ *:ITS:*:*)
-+ echo pdp10-unknown-its
-+ exit 0 ;;
-+ SEI:*:*:SEIUX)
-+ echo mips-sei-seiux${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:DragonFly:*:*)
-+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-+ exit 0 ;;
-+ *:*VMS:*:*)
-+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
-+ case "${UNAME_MACHINE}" in
-+ A*) echo alpha-dec-vms && exit 0 ;;
-+ I*) echo ia64-dec-vms && exit 0 ;;
-+ V*) echo vax-dec-vms && exit 0 ;;
-+ esac
-+esac
-+
-+#echo '(No uname command or uname output not recognized.)' 1>&2
-+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-+
-+eval $set_cc_for_build
-+cat >$dummy.c <<EOF
-+#ifdef _SEQUENT_
-+# include <sys/types.h>
-+# include <sys/utsname.h>
-+#endif
-+main ()
-+{
-+#if defined (sony)
-+#if defined (MIPSEB)
-+ /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
-+ I don't know.... */
-+ printf ("mips-sony-bsd\n"); exit (0);
-+#else
-+#include <sys/param.h>
-+ printf ("m68k-sony-newsos%s\n",
-+#ifdef NEWSOS4
-+ "4"
-+#else
-+ ""
-+#endif
-+ ); exit (0);
-+#endif
-+#endif
-+
-+#if defined (__arm) && defined (__acorn) && defined (__unix)
-+ printf ("arm-acorn-riscix"); exit (0);
-+#endif
-+
-+#if defined (hp300) && !defined (hpux)
-+ printf ("m68k-hp-bsd\n"); exit (0);
-+#endif
-+
-+#if defined (NeXT)
-+#if !defined (__ARCHITECTURE__)
-+#define __ARCHITECTURE__ "m68k"
-+#endif
-+ int version;
-+ version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-+ if (version < 4)
-+ printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-+ else
-+ printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-+ exit (0);
-+#endif
-+
-+#if defined (MULTIMAX) || defined (n16)
-+#if defined (UMAXV)
-+ printf ("ns32k-encore-sysv\n"); exit (0);
-+#else
-+#if defined (CMU)
-+ printf ("ns32k-encore-mach\n"); exit (0);
-+#else
-+ printf ("ns32k-encore-bsd\n"); exit (0);
-+#endif
-+#endif
-+#endif
-+
-+#if defined (__386BSD__)
-+ printf ("i386-pc-bsd\n"); exit (0);
-+#endif
-+
-+#if defined (sequent)
-+#if defined (i386)
-+ printf ("i386-sequent-dynix\n"); exit (0);
-+#endif
-+#if defined (ns32000)
-+ printf ("ns32k-sequent-dynix\n"); exit (0);
-+#endif
-+#endif
-+
-+#if defined (_SEQUENT_)
-+ struct utsname un;
-+
-+ uname(&un);
-+
-+ if (strncmp(un.version, "V2", 2) == 0) {
-+ printf ("i386-sequent-ptx2\n"); exit (0);
-+ }
-+ if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-+ printf ("i386-sequent-ptx1\n"); exit (0);
-+ }
-+ printf ("i386-sequent-ptx\n"); exit (0);
-+
-+#endif
-+
-+#if defined (vax)
-+# if !defined (ultrix)
-+# include <sys/param.h>
-+# if defined (BSD)
-+# if BSD == 43
-+ printf ("vax-dec-bsd4.3\n"); exit (0);
-+# else
-+# if BSD == 199006
-+ printf ("vax-dec-bsd4.3reno\n"); exit (0);
-+# else
-+ printf ("vax-dec-bsd\n"); exit (0);
-+# endif
-+# endif
-+# else
-+ printf ("vax-dec-bsd\n"); exit (0);
-+# endif
-+# else
-+ printf ("vax-dec-ultrix\n"); exit (0);
-+# endif
-+#endif
-+
-+#if defined (alliant) && defined (i860)
-+ printf ("i860-alliant-bsd\n"); exit (0);
-+#endif
-+
-+ exit (1);
-+}
-+EOF
-+
-+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
-+
-+# Apollos put the system type in the environment.
-+
-+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-+
-+# Convex versions that predate uname can use getsysinfo(1)
-+
-+if [ -x /usr/convex/getsysinfo ]
-+then
-+ case `getsysinfo -f cpu_type` in
-+ c1*)
-+ echo c1-convex-bsd
-+ exit 0 ;;
-+ c2*)
-+ if getsysinfo -f scalar_acc
-+ then echo c32-convex-bsd
-+ else echo c2-convex-bsd
-+ fi
-+ exit 0 ;;
-+ c34*)
-+ echo c34-convex-bsd
-+ exit 0 ;;
-+ c38*)
-+ echo c38-convex-bsd
-+ exit 0 ;;
-+ c4*)
-+ echo c4-convex-bsd
-+ exit 0 ;;
-+ esac
-+fi
-+
-+cat >&2 <<EOF
-+$0: unable to guess system type
-+
-+This script, last modified $timestamp, has failed to recognize
-+the operating system you are using. It is advised that you
-+download the most up to date version of the config scripts from
-+
-+ ftp://ftp.gnu.org/pub/gnu/config/
-+
-+If the version you run ($0) is already up to date, please
-+send the following data and any information you think might be
-+pertinent to <config-patches@gnu.org> in order to provide the needed
-+information to handle your system.
-+
-+config.guess timestamp = $timestamp
-+
-+uname -m = `(uname -m) 2>/dev/null || echo unknown`
-+uname -r = `(uname -r) 2>/dev/null || echo unknown`
-+uname -s = `(uname -s) 2>/dev/null || echo unknown`
-+uname -v = `(uname -v) 2>/dev/null || echo unknown`
-+
-+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-+/bin/uname -X = `(/bin/uname -X) 2>/dev/null`
-+
-+hostinfo = `(hostinfo) 2>/dev/null`
-+/bin/universe = `(/bin/universe) 2>/dev/null`
-+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null`
-+/bin/arch = `(/bin/arch) 2>/dev/null`
-+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
-+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-+
-+UNAME_MACHINE = ${UNAME_MACHINE}
-+UNAME_RELEASE = ${UNAME_RELEASE}
-+UNAME_SYSTEM = ${UNAME_SYSTEM}
-+UNAME_VERSION = ${UNAME_VERSION}
-+EOF
-+
-+exit 1
-+
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "timestamp='"
-+# time-stamp-format: "%:y-%02m-%02d"
-+# time-stamp-end: "'"
-+# End:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/admin/config.sub kdegraphics-3.4.0/admin/config.sub
---- kdegraphics-3.4.0.orig/admin/config.sub 2004-08-02 16:17:40.000000000 +0200
-+++ kdegraphics-3.4.0/admin/config.sub 2005-03-05 02:52:00.716167850 +0100
-@@ -3,7 +3,7 @@
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+ # Check to see how 'make' treats includes. -*- Autoconf -*-
--timestamp='2004-06-24'
-+timestamp='2004-11-30'
-
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -267,7 +267,7 @@
- | tahoe | thumb | tic4x | tic80 | tron \
- | v850 | v850e \
- | we32k \
-- | x86 | xscale | xstormy16 | xtensa \
-+ | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
- | z8k)
- basic_machine=$basic_machine-unknown
- ;;
-@@ -343,8 +343,8 @@
- | tron-* \
- | v850-* | v850e-* | vax-* \
- | we32k-* \
-- | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-- | xtensa-* \
-+ | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-+ | xstormy16-* | xtensa-* \
- | ymp-* \
- | z8k-*)
- ;;
-@@ -457,6 +457,9 @@
- crds | unos)
- basic_machine=m68k-crds
- ;;
-+ crisv32 | crisv32-* | etraxfs*)
-+ basic_machine=crisv32-axis
-+ ;;
- cris | cris-* | etrax*)
- basic_machine=cris-axis
- ;;
-@@ -486,6 +489,10 @@
- basic_machine=m88k-motorola
- os=-sysv3
- ;;
-+ djgpp)
-+ basic_machine=i586-pc
-+ os=-msdosdjgpp
-+ ;;
- dpx20 | dpx20-*)
- basic_machine=rs6000-bull
- os=-bosx
-@@ -1026,6 +1033,10 @@
- basic_machine=hppa1.1-winbond
- os=-proelf
- ;;
-+ xbox)
-+ basic_machine=i686-pc
-+ os=-mingw32
-+ ;;
- xps | xps100)
- basic_machine=xps100-honeywell
- ;;
-@@ -1294,6 +1305,9 @@
- -kaos*)
- os=-kaos
- ;;
-+ -zvmoe)
-+ os=-zvmoe
-+ ;;
- -none)
- ;;
- *)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/admin/config.sub.cdbs-orig kdegraphics-3.4.0/admin/config.sub.cdbs-orig
---- kdegraphics-3.4.0.orig/admin/config.sub.cdbs-orig 1970-01-01 01:00:00.000000000 +0100
-+++ kdegraphics-3.4.0/admin/config.sub.cdbs-orig 2004-08-02 16:17:40.000000000 +0200
-@@ -0,0 +1,1552 @@
-+#! /bin/sh
-+# Configuration validation subroutine script.
-+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-+# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+
-+timestamp='2004-06-24'
-+
-+# This file is (in principle) common to ALL GNU software.
-+# The presence of a machine in this file suggests that SOME GNU software
-+# can handle that machine. It does not imply ALL GNU software can.
-+#
-+# This file is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330,
-+# Boston, MA 02111-1307, USA.
-+
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# Please send patches to <config-patches@gnu.org>. Submit a context
-+# diff and a properly formatted ChangeLog entry.
-+#
-+# Configuration subroutine to validate and canonicalize a configuration type.
-+# Supply the specified configuration type as an argument.
-+# If it is invalid, we print an error message on stderr and exit with code 1.
-+# Otherwise, we print the canonical config type on stdout and succeed.
-+
-+# This file is supposed to be the same for all GNU packages
-+# and recognize all the CPU types, system types and aliases
-+# that are meaningful with *any* GNU software.
-+# Each package is responsible for reporting which valid configurations
-+# it does not support. The user should be able to distinguish
-+# a failure to support a valid configuration from a meaningless
-+# configuration.
-+
-+# The goal of this file is to map all the various variations of a given
-+# machine specification into a single specification in the form:
-+# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-+# or in some cases, the newer four-part form:
-+# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-+# It is wrong to echo any other type of specification.
-+
-+me=`echo "$0" | sed -e 's,.*/,,'`
-+
-+usage="\
-+Usage: $0 [OPTION] CPU-MFR-OPSYS
-+ $0 [OPTION] ALIAS
-+
-+Canonicalize a configuration name.
-+
-+Operation modes:
-+ -h, --help print this help, then exit
-+ -t, --time-stamp print date of last modification, then exit
-+ -v, --version print version number, then exit
-+
-+Report bugs and patches to <config-patches@gnu.org>."
-+
-+version="\
-+GNU config.sub ($timestamp)
-+
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-+Free Software Foundation, Inc.
-+
-+This is free software; see the source for copying conditions. There is NO
-+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-+
-+help="
-+Try \`$me --help' for more information."
-+
-+# Parse command line
-+while test $# -gt 0 ; do
-+ case $1 in
-+ --time-stamp | --time* | -t )
-+ echo "$timestamp" ; exit 0 ;;
-+ --version | -v )
-+ echo "$version" ; exit 0 ;;
-+ --help | --h* | -h )
-+ echo "$usage"; exit 0 ;;
-+ -- ) # Stop option processing
-+ shift; break ;;
-+ - ) # Use stdin as input.
-+ break ;;
-+ -* )
-+ echo "$me: invalid option $1$help"
-+ exit 1 ;;
-+
-+ *local*)
-+ # First pass through any local machine types.
-+ echo $1
-+ exit 0;;
-+
-+ * )
-+ break ;;
-+ esac
-+done
-+
-+case $# in
-+ 0) echo "$me: missing argument$help" >&2
-+ exit 1;;
-+ 1) ;;
-+ *) echo "$me: too many arguments$help" >&2
-+ exit 1;;
-+esac
-+
-+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-+# Here we must recognize all the valid KERNEL-OS combinations.
-+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-+case $maybe_os in
-+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-+ kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
-+ os=-$maybe_os
-+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-+ ;;
-+ *)
-+ basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-+ if [ $basic_machine != $1 ]
-+ then os=`echo $1 | sed 's/.*-/-/'`
-+ else os=; fi
-+ ;;
-+esac
-+
-+### Let's recognize common machines as not being operating systems so
-+### that things like config.sub decstation-3100 work. We also
-+### recognize some manufacturers as not being operating systems, so we
-+### can provide default operating systems below.
-+case $os in
-+ -sun*os*)
-+ # Prevent following clause from handling this invalid input.
-+ ;;
-+ -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-+ -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-+ -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-+ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-+ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-+ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-+ -apple | -axis | -knuth | -cray)
-+ os=
-+ basic_machine=$1
-+ ;;
-+ -sim | -cisco | -oki | -wec | -winbond)
-+ os=
-+ basic_machine=$1
-+ ;;
-+ -scout)
-+ ;;
-+ -wrs)
-+ os=-vxworks
-+ basic_machine=$1
-+ ;;
-+ -chorusos*)
-+ os=-chorusos
-+ basic_machine=$1
-+ ;;
-+ -chorusrdb)
-+ os=-chorusrdb
-+ basic_machine=$1
-+ ;;
-+ -hiux*)
-+ os=-hiuxwe2
-+ ;;
-+ -sco5)
-+ os=-sco3.2v5
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ ;;
-+ -sco4)
-+ os=-sco3.2v4
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ ;;
-+ -sco3.2.[4-9]*)
-+ os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ ;;
-+ -sco3.2v[4-9]*)
-+ # Don't forget version if it is 3.2v4 or newer.
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ ;;
-+ -sco*)
-+ os=-sco3.2v2
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ ;;
-+ -udk*)
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ ;;
-+ -isc)
-+ os=-isc2.2
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ ;;
-+ -clix*)
-+ basic_machine=clipper-intergraph
-+ ;;
-+ -isc*)
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ ;;
-+ -lynx*)
-+ os=-lynxos
-+ ;;
-+ -ptx*)
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-+ ;;
-+ -windowsnt*)
-+ os=`echo $os | sed -e 's/windowsnt/winnt/'`
-+ ;;
-+ -psos*)
-+ os=-psos
-+ ;;
-+ -mint | -mint[0-9]*)
-+ basic_machine=m68k-atari
-+ os=-mint
-+ ;;
-+esac
-+
-+# Decode aliases for certain CPU-COMPANY combinations.
-+case $basic_machine in
-+ # Recognize the basic CPU types without company name.
-+ # Some are omitted here because they have special meanings below.
-+ 1750a | 580 \
-+ | a29k \
-+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-+ | am33_2.0 \
-+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-+ | c4x | clipper \
-+ | d10v | d30v | dlx | dsp16xx \
-+ | fr30 | frv \
-+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-+ | i370 | i860 | i960 | ia64 \
-+ | ip2k | iq2000 \
-+ | m32r | m32rle | m68000 | m68k | m88k | mcore \
-+ | mips | mipsbe | mipseb | mipsel | mipsle \
-+ | mips16 \
-+ | mips64 | mips64el \
-+ | mips64vr | mips64vrel \
-+ | mips64orion | mips64orionel \
-+ | mips64vr4100 | mips64vr4100el \
-+ | mips64vr4300 | mips64vr4300el \
-+ | mips64vr5000 | mips64vr5000el \
-+ | mipsisa32 | mipsisa32el \
-+ | mipsisa32r2 | mipsisa32r2el \
-+ | mipsisa64 | mipsisa64el \
-+ | mipsisa64r2 | mipsisa64r2el \
-+ | mipsisa64sb1 | mipsisa64sb1el \
-+ | mipsisa64sr71k | mipsisa64sr71kel \
-+ | mipstx39 | mipstx39el \
-+ | mn10200 | mn10300 \
-+ | msp430 \
-+ | ns16k | ns32k \
-+ | openrisc | or32 \
-+ | pdp10 | pdp11 | pj | pjl \
-+ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-+ | pyramid \
-+ | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-+ | sh64 | sh64le \
-+ | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
-+ | strongarm \
-+ | tahoe | thumb | tic4x | tic80 | tron \
-+ | v850 | v850e \
-+ | we32k \
-+ | x86 | xscale | xstormy16 | xtensa \
-+ | z8k)
-+ basic_machine=$basic_machine-unknown
-+ ;;
-+ m6811 | m68hc11 | m6812 | m68hc12)
-+ # Motorola 68HC11/12.
-+ basic_machine=$basic_machine-unknown
-+ os=-none
-+ ;;
-+ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-+ ;;
-+
-+ # We use `pc' rather than `unknown'
-+ # because (1) that's what they normally are, and
-+ # (2) the word "unknown" tends to confuse beginning users.
-+ i*86 | x86_64)
-+ basic_machine=$basic_machine-pc
-+ ;;
-+ # Object if more than one company name word.
-+ *-*-*)
-+ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-+ exit 1
-+ ;;
-+ # Recognize the basic CPU types with company name.
-+ 580-* \
-+ | a29k-* \
-+ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-+ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
-+ | avr-* \
-+ | bs2000-* \
-+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-+ | clipper-* | craynv-* | cydra-* \
-+ | d10v-* | d30v-* | dlx-* \
-+ | elxsi-* \
-+ | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-+ | h8300-* | h8500-* \
-+ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-+ | i*86-* | i860-* | i960-* | ia64-* \
-+ | ip2k-* | iq2000-* \
-+ | m32r-* | m32rle-* \
-+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-+ | m88110-* | m88k-* | mcore-* \
-+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-+ | mips16-* \
-+ | mips64-* | mips64el-* \
-+ | mips64vr-* | mips64vrel-* \
-+ | mips64orion-* | mips64orionel-* \
-+ | mips64vr4100-* | mips64vr4100el-* \
-+ | mips64vr4300-* | mips64vr4300el-* \
-+ | mips64vr5000-* | mips64vr5000el-* \
-+ | mipsisa32-* | mipsisa32el-* \
-+ | mipsisa32r2-* | mipsisa32r2el-* \
-+ | mipsisa64-* | mipsisa64el-* \
-+ | mipsisa64r2-* | mipsisa64r2el-* \
-+ | mipsisa64sb1-* | mipsisa64sb1el-* \
-+ | mipsisa64sr71k-* | mipsisa64sr71kel-* \
-+ | mipstx39-* | mipstx39el-* \
-+ | mmix-* \
-+ | msp430-* \
-+ | none-* | np1-* | ns16k-* | ns32k-* \
-+ | orion-* \
-+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-+ | pyramid-* \
-+ | romp-* | rs6000-* \
-+ | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-+ | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-+ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-+ | tahoe-* | thumb-* \
-+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-+ | tron-* \
-+ | v850-* | v850e-* | vax-* \
-+ | we32k-* \
-+ | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-+ | xtensa-* \
-+ | ymp-* \
-+ | z8k-*)
-+ ;;
-+ # Recognize the various machine names and aliases which stand
-+ # for a CPU type and a company and sometimes even an OS.
-+ 386bsd)
-+ basic_machine=i386-unknown
-+ os=-bsd
-+ ;;
-+ 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-+ basic_machine=m68000-att
-+ ;;
-+ 3b*)
-+ basic_machine=we32k-att
-+ ;;
-+ a29khif)
-+ basic_machine=a29k-amd
-+ os=-udi
-+ ;;
-+ abacus)
-+ basic_machine=abacus-unknown
-+ ;;
-+ adobe68k)
-+ basic_machine=m68010-adobe
-+ os=-scout
-+ ;;
-+ alliant | fx80)
-+ basic_machine=fx80-alliant
-+ ;;
-+ altos | altos3068)
-+ basic_machine=m68k-altos
-+ ;;
-+ am29k)
-+ basic_machine=a29k-none
-+ os=-bsd
-+ ;;
-+ amd64)
-+ basic_machine=x86_64-pc
-+ ;;
-+ amd64-*)
-+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
-+ amdahl)
-+ basic_machine=580-amdahl
-+ os=-sysv
-+ ;;
-+ amiga | amiga-*)
-+ basic_machine=m68k-unknown
-+ ;;
-+ amigaos | amigados)
-+ basic_machine=m68k-unknown
-+ os=-amigaos
-+ ;;
-+ amigaunix | amix)
-+ basic_machine=m68k-unknown
-+ os=-sysv4
-+ ;;
-+ apollo68)
-+ basic_machine=m68k-apollo
-+ os=-sysv
-+ ;;
-+ apollo68bsd)
-+ basic_machine=m68k-apollo
-+ os=-bsd
-+ ;;
-+ aux)
-+ basic_machine=m68k-apple
-+ os=-aux
-+ ;;
-+ balance)
-+ basic_machine=ns32k-sequent
-+ os=-dynix
-+ ;;
-+ c90)
-+ basic_machine=c90-cray
-+ os=-unicos
-+ ;;
-+ convex-c1)
-+ basic_machine=c1-convex
-+ os=-bsd
-+ ;;
-+ convex-c2)
-+ basic_machine=c2-convex
-+ os=-bsd
-+ ;;
-+ convex-c32)
-+ basic_machine=c32-convex
-+ os=-bsd
-+ ;;
-+ convex-c34)
-+ basic_machine=c34-convex
-+ os=-bsd
-+ ;;
-+ convex-c38)
-+ basic_machine=c38-convex
-+ os=-bsd
-+ ;;
-+ cray | j90)
-+ basic_machine=j90-cray
-+ os=-unicos
-+ ;;
-+ craynv)
-+ basic_machine=craynv-cray
-+ os=-unicosmp
-+ ;;
-+ cr16c)
-+ basic_machine=cr16c-unknown
-+ os=-elf
-+ ;;
-+ crds | unos)
-+ basic_machine=m68k-crds
-+ ;;
-+ cris | cris-* | etrax*)
-+ basic_machine=cris-axis
-+ ;;
-+ crx)
-+ basic_machine=crx-unknown
-+ os=-elf
-+ ;;
-+ da30 | da30-*)
-+ basic_machine=m68k-da30
-+ ;;
-+ decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-+ basic_machine=mips-dec
-+ ;;
-+ decsystem10* | dec10*)
-+ basic_machine=pdp10-dec
-+ os=-tops10
-+ ;;
-+ decsystem20* | dec20*)
-+ basic_machine=pdp10-dec
-+ os=-tops20
-+ ;;
-+ delta | 3300 | motorola-3300 | motorola-delta \
-+ | 3300-motorola | delta-motorola)
-+ basic_machine=m68k-motorola
-+ ;;
-+ delta88)
-+ basic_machine=m88k-motorola
-+ os=-sysv3
-+ ;;
-+ dpx20 | dpx20-*)
-+ basic_machine=rs6000-bull
-+ os=-bosx
-+ ;;
-+ dpx2* | dpx2*-bull)
-+ basic_machine=m68k-bull
-+ os=-sysv3
-+ ;;
-+ ebmon29k)
-+ basic_machine=a29k-amd
-+ os=-ebmon
-+ ;;
-+ elxsi)
-+ basic_machine=elxsi-elxsi
-+ os=-bsd
-+ ;;
-+ encore | umax | mmax)
-+ basic_machine=ns32k-encore
-+ ;;
-+ es1800 | OSE68k | ose68k | ose | OSE)
-+ basic_machine=m68k-ericsson
-+ os=-ose
-+ ;;
-+ fx2800)
-+ basic_machine=i860-alliant
-+ ;;
-+ genix)
-+ basic_machine=ns32k-ns
-+ ;;
-+ gmicro)
-+ basic_machine=tron-gmicro
-+ os=-sysv
-+ ;;
-+ go32)
-+ basic_machine=i386-pc
-+ os=-go32
-+ ;;
-+ h3050r* | hiux*)
-+ basic_machine=hppa1.1-hitachi
-+ os=-hiuxwe2
-+ ;;
-+ h8300hms)
-+ basic_machine=h8300-hitachi
-+ os=-hms
-+ ;;
-+ h8300xray)
-+ basic_machine=h8300-hitachi
-+ os=-xray
-+ ;;
-+ h8500hms)
-+ basic_machine=h8500-hitachi
-+ os=-hms
-+ ;;
-+ harris)
-+ basic_machine=m88k-harris
-+ os=-sysv3
-+ ;;
-+ hp300-*)
-+ basic_machine=m68k-hp
-+ ;;
-+ hp300bsd)
-+ basic_machine=m68k-hp
-+ os=-bsd
-+ ;;
-+ hp300hpux)
-+ basic_machine=m68k-hp
-+ os=-hpux
-+ ;;
-+ hp3k9[0-9][0-9] | hp9[0-9][0-9])
-+ basic_machine=hppa1.0-hp
-+ ;;
-+ hp9k2[0-9][0-9] | hp9k31[0-9])
-+ basic_machine=m68000-hp
-+ ;;
-+ hp9k3[2-9][0-9])
-+ basic_machine=m68k-hp
-+ ;;
-+ hp9k6[0-9][0-9] | hp6[0-9][0-9])
-+ basic_machine=hppa1.0-hp
-+ ;;
-+ hp9k7[0-79][0-9] | hp7[0-79][0-9])
-+ basic_machine=hppa1.1-hp
-+ ;;
-+ hp9k78[0-9] | hp78[0-9])
-+ # FIXME: really hppa2.0-hp
-+ basic_machine=hppa1.1-hp
-+ ;;
-+ hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-+ # FIXME: really hppa2.0-hp
-+ basic_machine=hppa1.1-hp
-+ ;;
-+ hp9k8[0-9][13679] | hp8[0-9][13679])
-+ basic_machine=hppa1.1-hp
-+ ;;
-+ hp9k8[0-9][0-9] | hp8[0-9][0-9])
-+ basic_machine=hppa1.0-hp
-+ ;;
-+ hppa-next)
-+ os=-nextstep3
-+ ;;
-+ hppaosf)
-+ basic_machine=hppa1.1-hp
-+ os=-osf
-+ ;;
-+ hppro)
-+ basic_machine=hppa1.1-hp
-+ os=-proelf
-+ ;;
-+ i370-ibm* | ibm*)
-+ basic_machine=i370-ibm
-+ ;;
-+# I'm not sure what "Sysv32" means. Should this be sysv3.2?
-+ i*86v32)
-+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+ os=-sysv32
-+ ;;
-+ i*86v4*)
-+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+ os=-sysv4
-+ ;;
-+ i*86v)
-+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+ os=-sysv
-+ ;;
-+ i*86sol2)
-+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+ os=-solaris2
-+ ;;
-+ i386mach)
-+ basic_machine=i386-mach
-+ os=-mach
-+ ;;
-+ i386-vsta | vsta)
-+ basic_machine=i386-unknown
-+ os=-vsta
-+ ;;
-+ iris | iris4d)
-+ basic_machine=mips-sgi
-+ case $os in
-+ -irix*)
-+ ;;
-+ *)
-+ os=-irix4
-+ ;;
-+ esac
-+ ;;
-+ isi68 | isi)
-+ basic_machine=m68k-isi
-+ os=-sysv
-+ ;;
-+ m88k-omron*)
-+ basic_machine=m88k-omron
-+ ;;
-+ magnum | m3230)
-+ basic_machine=mips-mips
-+ os=-sysv
-+ ;;
-+ merlin)
-+ basic_machine=ns32k-utek
-+ os=-sysv
-+ ;;
-+ mingw32)
-+ basic_machine=i386-pc
-+ os=-mingw32
-+ ;;
-+ miniframe)
-+ basic_machine=m68000-convergent
-+ ;;
-+ *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-+ basic_machine=m68k-atari
-+ os=-mint
-+ ;;
-+ mips3*-*)
-+ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-+ ;;
-+ mips3*)
-+ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-+ ;;
-+ monitor)
-+ basic_machine=m68k-rom68k
-+ os=-coff
-+ ;;
-+ morphos)
-+ basic_machine=powerpc-unknown
-+ os=-morphos
-+ ;;
-+ msdos)
-+ basic_machine=i386-pc
-+ os=-msdos
-+ ;;
-+ mvs)
-+ basic_machine=i370-ibm
-+ os=-mvs
-+ ;;
-+ ncr3000)
-+ basic_machine=i486-ncr
-+ os=-sysv4
-+ ;;
-+ netbsd386)
-+ basic_machine=i386-unknown
-+ os=-netbsd
-+ ;;
-+ netwinder)
-+ basic_machine=armv4l-rebel
-+ os=-linux
-+ ;;
-+ news | news700 | news800 | news900)
-+ basic_machine=m68k-sony
-+ os=-newsos
-+ ;;
-+ news1000)
-+ basic_machine=m68030-sony
-+ os=-newsos
-+ ;;
-+ news-3600 | risc-news)
-+ basic_machine=mips-sony
-+ os=-newsos
-+ ;;
-+ necv70)
-+ basic_machine=v70-nec
-+ os=-sysv
-+ ;;
-+ next | m*-next )
-+ basic_machine=m68k-next
-+ case $os in
-+ -nextstep* )
-+ ;;
-+ -ns2*)
-+ os=-nextstep2
-+ ;;
-+ *)
-+ os=-nextstep3
-+ ;;
-+ esac
-+ ;;
-+ nh3000)
-+ basic_machine=m68k-harris
-+ os=-cxux
-+ ;;
-+ nh[45]000)
-+ basic_machine=m88k-harris
-+ os=-cxux
-+ ;;
-+ nindy960)
-+ basic_machine=i960-intel
-+ os=-nindy
-+ ;;
-+ mon960)
-+ basic_machine=i960-intel
-+ os=-mon960
-+ ;;
-+ nonstopux)
-+ basic_machine=mips-compaq
-+ os=-nonstopux
-+ ;;
-+ np1)
-+ basic_machine=np1-gould
-+ ;;
-+ nsr-tandem)
-+ basic_machine=nsr-tandem
-+ ;;
-+ op50n-* | op60c-*)
-+ basic_machine=hppa1.1-oki
-+ os=-proelf
-+ ;;
-+ or32 | or32-*)
-+ basic_machine=or32-unknown
-+ os=-coff
-+ ;;
-+ os400)
-+ basic_machine=powerpc-ibm
-+ os=-os400
-+ ;;
-+ OSE68000 | ose68000)
-+ basic_machine=m68000-ericsson
-+ os=-ose
-+ ;;
-+ os68k)
-+ basic_machine=m68k-none
-+ os=-os68k
-+ ;;
-+ pa-hitachi)
-+ basic_machine=hppa1.1-hitachi
-+ os=-hiuxwe2
-+ ;;
-+ paragon)
-+ basic_machine=i860-intel
-+ os=-osf
-+ ;;
-+ pbd)
-+ basic_machine=sparc-tti
-+ ;;
-+ pbb)
-+ basic_machine=m68k-tti
-+ ;;
-+ pc532 | pc532-*)
-+ basic_machine=ns32k-pc532
-+ ;;
-+ pentium | p5 | k5 | k6 | nexgen | viac3)
-+ basic_machine=i586-pc
-+ ;;
-+ pentiumpro | p6 | 6x86 | athlon | athlon_*)
-+ basic_machine=i686-pc
-+ ;;
-+ pentiumii | pentium2 | pentiumiii | pentium3)
-+ basic_machine=i686-pc
-+ ;;
-+ pentium4)
-+ basic_machine=i786-pc
-+ ;;
-+ pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-+ basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
-+ pentiumpro-* | p6-* | 6x86-* | athlon-*)
-+ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
-+ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-+ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
-+ pentium4-*)
-+ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
-+ pn)
-+ basic_machine=pn-gould
-+ ;;
-+ power) basic_machine=power-ibm
-+ ;;
-+ ppc) basic_machine=powerpc-unknown
-+ ;;
-+ ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
-+ ppcle | powerpclittle | ppc-le | powerpc-little)
-+ basic_machine=powerpcle-unknown
-+ ;;
-+ ppcle-* | powerpclittle-*)
-+ basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
-+ ppc64) basic_machine=powerpc64-unknown
-+ ;;
-+ ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
-+ ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-+ basic_machine=powerpc64le-unknown
-+ ;;
-+ ppc64le-* | powerpc64little-*)
-+ basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
-+ ps2)
-+ basic_machine=i386-ibm
-+ ;;
-+ pw32)
-+ basic_machine=i586-unknown
-+ os=-pw32
-+ ;;
-+ rom68k)
-+ basic_machine=m68k-rom68k
-+ os=-coff
-+ ;;
-+ rm[46]00)
-+ basic_machine=mips-siemens
-+ ;;
-+ rtpc | rtpc-*)
-+ basic_machine=romp-ibm
-+ ;;
-+ s390 | s390-*)
-+ basic_machine=s390-ibm
-+ ;;
-+ s390x | s390x-*)
-+ basic_machine=s390x-ibm
-+ ;;
-+ sa29200)
-+ basic_machine=a29k-amd
-+ os=-udi
-+ ;;
-+ sb1)
-+ basic_machine=mipsisa64sb1-unknown
-+ ;;
-+ sb1el)
-+ basic_machine=mipsisa64sb1el-unknown
-+ ;;
-+ sei)
-+ basic_machine=mips-sei
-+ os=-seiux
-+ ;;
-+ sequent)
-+ basic_machine=i386-sequent
-+ ;;
-+ sh)
-+ basic_machine=sh-hitachi
-+ os=-hms
-+ ;;
-+ sh64)
-+ basic_machine=sh64-unknown
-+ ;;
-+ sparclite-wrs | simso-wrs)
-+ basic_machine=sparclite-wrs
-+ os=-vxworks
-+ ;;
-+ sps7)
-+ basic_machine=m68k-bull
-+ os=-sysv2
-+ ;;
-+ spur)
-+ basic_machine=spur-unknown
-+ ;;
-+ st2000)
-+ basic_machine=m68k-tandem
-+ ;;
-+ stratus)
-+ basic_machine=i860-stratus
-+ os=-sysv4
-+ ;;
-+ sun2)
-+ basic_machine=m68000-sun
-+ ;;
-+ sun2os3)
-+ basic_machine=m68000-sun
-+ os=-sunos3
-+ ;;
-+ sun2os4)
-+ basic_machine=m68000-sun
-+ os=-sunos4
-+ ;;
-+ sun3os3)
-+ basic_machine=m68k-sun
-+ os=-sunos3
-+ ;;
-+ sun3os4)
-+ basic_machine=m68k-sun
-+ os=-sunos4
-+ ;;
-+ sun4os3)
-+ basic_machine=sparc-sun
-+ os=-sunos3
-+ ;;
-+ sun4os4)
-+ basic_machine=sparc-sun
-+ os=-sunos4
-+ ;;
-+ sun4sol2)
-+ basic_machine=sparc-sun
-+ os=-solaris2
-+ ;;
-+ sun3 | sun3-*)
-+ basic_machine=m68k-sun
-+ ;;
-+ sun4)
-+ basic_machine=sparc-sun
-+ ;;
-+ sun386 | sun386i | roadrunner)
-+ basic_machine=i386-sun
-+ ;;
-+ sv1)
-+ basic_machine=sv1-cray
-+ os=-unicos
-+ ;;
-+ symmetry)
-+ basic_machine=i386-sequent
-+ os=-dynix
-+ ;;
-+ t3e)
-+ basic_machine=alphaev5-cray
-+ os=-unicos
-+ ;;
-+ t90)
-+ basic_machine=t90-cray
-+ os=-unicos
-+ ;;
-+ tic54x | c54x*)
-+ basic_machine=tic54x-unknown
-+ os=-coff
-+ ;;
-+ tic55x | c55x*)
-+ basic_machine=tic55x-unknown
-+ os=-coff
-+ ;;
-+ tic6x | c6x*)
-+ basic_machine=tic6x-unknown
-+ os=-coff
-+ ;;
-+ tx39)
-+ basic_machine=mipstx39-unknown
-+ ;;
-+ tx39el)
-+ basic_machine=mipstx39el-unknown
-+ ;;
-+ toad1)
-+ basic_machine=pdp10-xkl
-+ os=-tops20
-+ ;;
-+ tower | tower-32)
-+ basic_machine=m68k-ncr
-+ ;;
-+ tpf)
-+ basic_machine=s390x-ibm
-+ os=-tpf
-+ ;;
-+ udi29k)
-+ basic_machine=a29k-amd
-+ os=-udi
-+ ;;
-+ ultra3)
-+ basic_machine=a29k-nyu
-+ os=-sym1
-+ ;;
-+ v810 | necv810)
-+ basic_machine=v810-nec
-+ os=-none
-+ ;;
-+ vaxv)
-+ basic_machine=vax-dec
-+ os=-sysv
-+ ;;
-+ vms)
-+ basic_machine=vax-dec
-+ os=-vms
-+ ;;
-+ vpp*|vx|vx-*)
-+ basic_machine=f301-fujitsu
-+ ;;
-+ vxworks960)
-+ basic_machine=i960-wrs
-+ os=-vxworks
-+ ;;
-+ vxworks68)
-+ basic_machine=m68k-wrs
-+ os=-vxworks
-+ ;;
-+ vxworks29k)
-+ basic_machine=a29k-wrs
-+ os=-vxworks
-+ ;;
-+ w65*)
-+ basic_machine=w65-wdc
-+ os=-none
-+ ;;
-+ w89k-*)
-+ basic_machine=hppa1.1-winbond
-+ os=-proelf
-+ ;;
-+ xps | xps100)
-+ basic_machine=xps100-honeywell
-+ ;;
-+ ymp)
-+ basic_machine=ymp-cray
-+ os=-unicos
-+ ;;
-+ z8k-*-coff)
-+ basic_machine=z8k-unknown
-+ os=-sim
-+ ;;
-+ none)
-+ basic_machine=none-none
-+ os=-none
-+ ;;
-+
-+# Here we handle the default manufacturer of certain CPU types. It is in
-+# some cases the only manufacturer, in others, it is the most popular.
-+ w89k)
-+ basic_machine=hppa1.1-winbond
-+ ;;
-+ op50n)
-+ basic_machine=hppa1.1-oki
-+ ;;
-+ op60c)
-+ basic_machine=hppa1.1-oki
-+ ;;
-+ romp)
-+ basic_machine=romp-ibm
-+ ;;
-+ mmix)
-+ basic_machine=mmix-knuth
-+ ;;
-+ rs6000)
-+ basic_machine=rs6000-ibm
-+ ;;
-+ vax)
-+ basic_machine=vax-dec
-+ ;;
-+ pdp10)
-+ # there are many clones, so DEC is not a safe bet
-+ basic_machine=pdp10-unknown
-+ ;;
-+ pdp11)
-+ basic_machine=pdp11-dec
-+ ;;
-+ we32k)
-+ basic_machine=we32k-att
-+ ;;
-+ sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
-+ basic_machine=sh-unknown
-+ ;;
-+ sh64)
-+ basic_machine=sh64-unknown
-+ ;;
-+ sparc | sparcv8 | sparcv9 | sparcv9b)
-+ basic_machine=sparc-sun
-+ ;;
-+ cydra)
-+ basic_machine=cydra-cydrome
-+ ;;
-+ orion)
-+ basic_machine=orion-highlevel
-+ ;;
-+ orion105)
-+ basic_machine=clipper-highlevel
-+ ;;
-+ mac | mpw | mac-mpw)
-+ basic_machine=m68k-apple
-+ ;;
-+ pmac | pmac-mpw)
-+ basic_machine=powerpc-apple
-+ ;;
-+ *-unknown)
-+ # Make sure to match an already-canonicalized machine name.
-+ ;;
-+ *)
-+ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-+ exit 1
-+ ;;
-+esac
-+
-+# Here we canonicalize certain aliases for manufacturers.
-+case $basic_machine in
-+ *-digital*)
-+ basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-+ ;;
-+ *-commodore*)
-+ basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-+ ;;
-+ *)
-+ ;;
-+esac
-+
-+# Decode manufacturer-specific aliases for certain operating systems.
-+
-+if [ x"$os" != x"" ]
-+then
-+case $os in
-+ # First match some system type aliases
-+ # that might get confused with valid system types.
-+ # -solaris* is a basic system type, with this one exception.
-+ -solaris1 | -solaris1.*)
-+ os=`echo $os | sed -e 's|solaris1|sunos4|'`
-+ ;;
-+ -solaris)
-+ os=-solaris2
-+ ;;
-+ -svr4*)
-+ os=-sysv4
-+ ;;
-+ -unixware*)
-+ os=-sysv4.2uw
-+ ;;
-+ -gnu/linux*)
-+ os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-+ ;;
-+ # First accept the basic system types.
-+ # The portable systems comes first.
-+ # Each alternative MUST END IN A *, to match a version number.
-+ # -sysv* is not here because it comes later, after sysvr4.
-+ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-+ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-+ | -aos* \
-+ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-+ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
-+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-+ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-+ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-+ | -chorusos* | -chorusrdb* \
-+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-+ | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
-+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-+ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-+ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-+ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
-+ # Remember, each alternative MUST END IN *, to match a version number.
-+ ;;
-+ -qnx*)
-+ case $basic_machine in
-+ x86-* | i*86-*)
-+ ;;
-+ *)
-+ os=-nto$os
-+ ;;
-+ esac
-+ ;;
-+ -nto-qnx*)
-+ ;;
-+ -nto*)
-+ os=`echo $os | sed -e 's|nto|nto-qnx|'`
-+ ;;
-+ -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-+ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-+ ;;
-+ -mac*)
-+ os=`echo $os | sed -e 's|mac|macos|'`
-+ ;;
-+ -linux-dietlibc)
-+ os=-linux-dietlibc
-+ ;;
-+ -linux*)
-+ os=`echo $os | sed -e 's|linux|linux-gnu|'`
-+ ;;
-+ -sunos5*)
-+ os=`echo $os | sed -e 's|sunos5|solaris2|'`
-+ ;;
-+ -sunos6*)
-+ os=`echo $os | sed -e 's|sunos6|solaris3|'`
-+ ;;
-+ -opened*)
-+ os=-openedition
-+ ;;
-+ -os400*)
-+ os=-os400
-+ ;;
-+ -wince*)
-+ os=-wince
-+ ;;
-+ -osfrose*)
-+ os=-osfrose
-+ ;;
-+ -osf*)
-+ os=-osf
-+ ;;
-+ -utek*)
-+ os=-bsd
-+ ;;
-+ -dynix*)
-+ os=-bsd
-+ ;;
-+ -acis*)
-+ os=-aos
-+ ;;
-+ -atheos*)
-+ os=-atheos
-+ ;;
-+ -syllable*)
-+ os=-syllable
-+ ;;
-+ -386bsd)
-+ os=-bsd
-+ ;;
-+ -ctix* | -uts*)
-+ os=-sysv
-+ ;;
-+ -nova*)
-+ os=-rtmk-nova
-+ ;;
-+ -ns2 )
-+ os=-nextstep2
-+ ;;
-+ -nsk*)
-+ os=-nsk
-+ ;;
-+ # Preserve the version number of sinix5.
-+ -sinix5.*)
-+ os=`echo $os | sed -e 's|sinix|sysv|'`
-+ ;;
-+ -sinix*)
-+ os=-sysv4
-+ ;;
-+ -tpf*)
-+ os=-tpf
-+ ;;
-+ -triton*)
-+ os=-sysv3
-+ ;;
-+ -oss*)
-+ os=-sysv3
-+ ;;
-+ -svr4)
-+ os=-sysv4
-+ ;;
-+ -svr3)
-+ os=-sysv3
-+ ;;
-+ -sysvr4)
-+ os=-sysv4
-+ ;;
-+ # This must come after -sysvr4.
-+ -sysv*)
-+ ;;
-+ -ose*)
-+ os=-ose
-+ ;;
-+ -es1800*)
-+ os=-ose
-+ ;;
-+ -xenix)
-+ os=-xenix
-+ ;;
-+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-+ os=-mint
-+ ;;
-+ -aros*)
-+ os=-aros
-+ ;;
-+ -kaos*)
-+ os=-kaos
-+ ;;
-+ -none)
-+ ;;
-+ *)
-+ # Get rid of the `-' at the beginning of $os.
-+ os=`echo $os | sed 's/[^-]*-//'`
-+ echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-+ exit 1
-+ ;;
-+esac
-+else
-+
-+# Here we handle the default operating systems that come with various machines.
-+# The value should be what the vendor currently ships out the door with their
-+# machine or put another way, the most popular os provided with the machine.
-+
-+# Note that if you're going to try to match "-MANUFACTURER" here (say,
-+# "-sun"), then you have to tell the case statement up towards the top
-+# that MANUFACTURER isn't an operating system. Otherwise, code above
-+# will signal an error saying that MANUFACTURER isn't an operating
-+# system, and we'll never get to this point.
-+
-+case $basic_machine in
-+ *-acorn)
-+ os=-riscix1.2
-+ ;;
-+ arm*-rebel)
-+ os=-linux
-+ ;;
-+ arm*-semi)
-+ os=-aout
-+ ;;
-+ c4x-* | tic4x-*)
-+ os=-coff
-+ ;;
-+ # This must come before the *-dec entry.
-+ pdp10-*)
-+ os=-tops20
-+ ;;
-+ pdp11-*)
-+ os=-none
-+ ;;
-+ *-dec | vax-*)
-+ os=-ultrix4.2
-+ ;;
-+ m68*-apollo)
-+ os=-domain
-+ ;;
-+ i386-sun)
-+ os=-sunos4.0.2
-+ ;;
-+ m68000-sun)
-+ os=-sunos3
-+ # This also exists in the configure program, but was not the
-+ # default.
-+ # os=-sunos4
-+ ;;
-+ m68*-cisco)
-+ os=-aout
-+ ;;
-+ mips*-cisco)
-+ os=-elf
-+ ;;
-+ mips*-*)
-+ os=-elf
-+ ;;
-+ or32-*)
-+ os=-coff
-+ ;;
-+ *-tti) # must be before sparc entry or we get the wrong os.
-+ os=-sysv3
-+ ;;
-+ sparc-* | *-sun)
-+ os=-sunos4.1.1
-+ ;;
-+ *-be)
-+ os=-beos
-+ ;;
-+ *-ibm)
-+ os=-aix
-+ ;;
-+ *-knuth)
-+ os=-mmixware
-+ ;;
-+ *-wec)
-+ os=-proelf
-+ ;;
-+ *-winbond)
-+ os=-proelf
-+ ;;
-+ *-oki)
-+ os=-proelf
-+ ;;
-+ *-hp)
-+ os=-hpux
-+ ;;
-+ *-hitachi)
-+ os=-hiux
-+ ;;
-+ i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-+ os=-sysv
-+ ;;
-+ *-cbm)
-+ os=-amigaos
-+ ;;
-+ *-dg)
-+ os=-dgux
-+ ;;
-+ *-dolphin)
-+ os=-sysv3
-+ ;;
-+ m68k-ccur)
-+ os=-rtu
-+ ;;
-+ m88k-omron*)
-+ os=-luna
-+ ;;
-+ *-next )
-+ os=-nextstep
-+ ;;
-+ *-sequent)
-+ os=-ptx
-+ ;;
-+ *-crds)
-+ os=-unos
-+ ;;
-+ *-ns)
-+ os=-genix
-+ ;;
-+ i370-*)
-+ os=-mvs
-+ ;;
-+ *-next)
-+ os=-nextstep3
-+ ;;
-+ *-gould)
-+ os=-sysv
-+ ;;
-+ *-highlevel)
-+ os=-bsd
-+ ;;
-+ *-encore)
-+ os=-bsd
-+ ;;
-+ *-sgi)
-+ os=-irix
-+ ;;
-+ *-siemens)
-+ os=-sysv4
-+ ;;
-+ *-masscomp)
-+ os=-rtu
-+ ;;
-+ f30[01]-fujitsu | f700-fujitsu)
-+ os=-uxpv
-+ ;;
-+ *-rom68k)
-+ os=-coff
-+ ;;
-+ *-*bug)
-+ os=-coff
-+ ;;
-+ *-apple)
-+ os=-macos
-+ ;;
-+ *-atari*)
-+ os=-mint
-+ ;;
-+ *)
-+ os=-none
-+ ;;
-+esac
-+fi
-+
-+# Here we handle the case where we know the os, and the CPU type, but not the
-+# manufacturer. We pick the logical manufacturer.
-+vendor=unknown
-+case $basic_machine in
-+ *-unknown)
-+ case $os in
-+ -riscix*)
-+ vendor=acorn
-+ ;;
-+ -sunos*)
-+ vendor=sun
-+ ;;
-+ -aix*)
-+ vendor=ibm
-+ ;;
-+ -beos*)
-+ vendor=be
-+ ;;
-+ -hpux*)
-+ vendor=hp
-+ ;;
-+ -mpeix*)
-+ vendor=hp
-+ ;;
-+ -hiux*)
-+ vendor=hitachi
-+ ;;
-+ -unos*)
-+ vendor=crds
-+ ;;
-+ -dgux*)
-+ vendor=dg
-+ ;;
-+ -luna*)
-+ vendor=omron
-+ ;;
-+ -genix*)
-+ vendor=ns
-+ ;;
-+ -mvs* | -opened*)
-+ vendor=ibm
-+ ;;
-+ -os400*)
-+ vendor=ibm
-+ ;;
-+ -ptx*)
-+ vendor=sequent
-+ ;;
-+ -tpf*)
-+ vendor=ibm
-+ ;;
-+ -vxsim* | -vxworks* | -windiss*)
-+ vendor=wrs
-+ ;;
-+ -aux*)
-+ vendor=apple
-+ ;;
-+ -hms*)
-+ vendor=hitachi
-+ ;;
-+ -mpw* | -macos*)
-+ vendor=apple
-+ ;;
-+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-+ vendor=atari
-+ ;;
-+ -vos*)
-+ vendor=stratus
-+ ;;
-+ esac
-+ basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-+ ;;
-+esac
-+
-+echo $basic_machine$os
-+exit 0
-+
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "timestamp='"
-+# time-stamp-format: "%:y-%02m-%02d"
-+# time-stamp-end: "'"
-+# End:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/configure kdegraphics-3.4.0/configure
---- kdegraphics-3.4.0.orig/configure 2005-03-04 13:27:38.000000000 +0100
-+++ kdegraphics-3.4.0/configure 2005-03-05 02:51:56.536884474 +0100
+ # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+diff -rua kdegraphics-3.4.1.orig/configure kdegraphics-3.4.1/configure
+--- kdegraphics-3.4.1.orig/configure 2005-05-23 18:01:28.000000000 +0200
++++ kdegraphics-3.4.1/configure 2005-05-25 08:29:56.196007786 +0200
@@ -464,7 +464,7 @@
# include <unistd.h>
#endif"
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KSYCOCA LIB_KFILE LIB_KFM gphoto_devel GPHOTO2_INCS GPHOTO2_LIBS LTLIBOBJS LIBFREETYPE_LIBS LIBFREETYPE_CFLAGS FREETYPE_RPATH LIBTIFF PDFINFO PKG_CONFIG LIB_EXR EXR_FLAGS include_EXR_MODULES_TRUE include_EXR_MODULES_FALSE include_TIFF_TRUE include_TIFF_FALSE LIBVM KADMOS_LIB KADMOS_INC LIBFREETYPE_RPATH XFT_LIBS LIBPAPER_LIBS GLINC GLLIB LIBART_LIBS LIBART_CFLAGS LIBART_RPATH FONTCONFIG_LIBS FONTCONFIG_CFLAGS FONTCONFIG_RPATH FREETYPE_LIBS FREETYPE_CFLAGS LCMS_LIBS FRIBIDI_LIBS FRIBIDI_CFLAGS FRIBIDI_RPATH GENERIC_API_VERSION GENERIC_LIBRARY_VERSION GENERIC_LIBRARY_NAME GENERIC_RELEASE GENERIC_VERSION LIB_IMLIB IMLIB_CFLAGS include_kooka_TRUE include_kooka_FALSE LIBSANE_LIBS LIBSANE_LDFLAGS LIBSANE_INCLUDES TOPSUBDIRS doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kamera_SUBDIR_included_TRUE kamera_SUBDIR_included_FALSE kcoloredit_SUBDIR_included_TRUE kcoloredit_SUBDIR_included_FALSE kfax_SUBDIR_included_TRUE kfax_SUBDIR_included_FALSE kgamma_SUBDIR_included_TRUE kgamma_SUBDIR_included_FALSE kghostview_SUBDIR_included_TRUE kghostview_SUBDIR_included_FALSE kiconedit_SUBDIR_included_TRUE kiconedit_SUBDIR_included_FALSE kmrml_SUBDIR_included_TRUE kmrml_SUBDIR_included_FALSE kolourpaint_SUBDIR_included_TRUE kolourpaint_SUBDIR_included_FALSE kpdf_SUBDIR_included_TRUE kpdf_SUBDIR_included_FALSE kpovmodeler_SUBDIR_included_TRUE kpovmodeler_SUBDIR_included_FALSE kruler_SUBDIR_included_TRUE kruler_SUBDIR_included_FALSE ksnapshot_SUBDIR_included_TRUE ksnapshot_SUBDIR_included_FALSE ksvg_SUBDIR_included_TRUE ksvg_SUBDIR_included_FALSE kuickshow_SUBDIR_included_TRUE kuickshow_SUBDIR_included_FALSE kview_SUBDIR_included_TRUE kview_SUBDIR_included_FALSE kviewshell_SUBDIR_included_TRUE kviewshell_SUBDIR_included_FALSE libkscan_SUBDIR_included_TRUE libkscan_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kfaxview_SUBDIR_included_TRUE kfaxview_SUBDIR_included_FALSE kdvi_SUBDIR_included_TRUE kdvi_SUBDIR_included_FALSE kooka_SUBDIR_included_TRUE kooka_SUBDIR_included_FALSE LIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KSYCOCA LIB_KFILE LIB_KFM gphoto_devel GPHOTO2_INCS GPHOTO2_LIBS LTLIBOBJS LIBFREETYPE_LIBS LIBFREETYPE_CFLAGS FREETYPE_RPATH LIBTIFF PDFINFO PKG_CONFIG LIB_EXR EXR_FLAGS include_EXR_MODULES_TRUE include_EXR_MODULES_FALSE include_TIFF_TRUE include_TIFF_FALSE LIBVM KADMOS_LIB KADMOS_INC LIBFREETYPE_RPATH XFT_LIBS LIBPAPER_LIBS GLINC GLLIB LIBART_LIBS LIBART_CFLAGS LIBART_RPATH FONTCONFIG_LIBS FONTCONFIG_CFLAGS FONTCONFIG_RPATH FREETYPE_LIBS FREETYPE_CFLAGS LCMS_LIBS FRIBIDI_LIBS FRIBIDI_CFLAGS FRIBIDI_RPATH GENERIC_API_VERSION GENERIC_LIBRARY_VERSION GENERIC_LIBRARY_NAME GENERIC_RELEASE GENERIC_VERSION LIB_IMLIB IMLIB_CFLAGS include_kooka_TRUE include_kooka_FALSE LIBSANE_LIBS LIBSANE_LDFLAGS LIBSANE_INCLUDES TOPSUBDIRS doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kamera_SUBDIR_included_TRUE kamera_SUBDIR_included_FALSE kcoloredit_SUBDIR_included_TRUE kcoloredit_SUBDIR_included_FALSE kfax_SUBDIR_included_TRUE kfax_SUBDIR_included_FALSE kgamma_SUBDIR_included_TRUE kgamma_SUBDIR_included_FALSE kghostview_SUBDIR_included_TRUE kghostview_SUBDIR_included_FALSE kiconedit_SUBDIR_included_TRUE kiconedit_SUBDIR_included_FALSE kmrml_SUBDIR_included_TRUE kmrml_SUBDIR_included_FALSE kolourpaint_SUBDIR_included_TRUE kolourpaint_SUBDIR_included_FALSE kpdf_SUBDIR_included_TRUE kpdf_SUBDIR_included_FALSE kpovmodeler_SUBDIR_included_TRUE kpovmodeler_SUBDIR_included_FALSE kruler_SUBDIR_included_TRUE kruler_SUBDIR_included_FALSE ksnapshot_SUBDIR_included_TRUE ksnapshot_SUBDIR_included_FALSE ksvg_SUBDIR_included_TRUE ksvg_SUBDIR_included_FALSE kuickshow_SUBDIR_included_TRUE kuickshow_SUBDIR_included_FALSE kview_SUBDIR_included_TRUE kview_SUBDIR_included_FALSE kviewshell_SUBDIR_included_TRUE kviewshell_SUBDIR_included_FALSE libkscan_SUBDIR_included_TRUE libkscan_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kfaxview_SUBDIR_included_TRUE kfaxview_SUBDIR_included_FALSE kdvi_SUBDIR_included_TRUE kdvi_SUBDIR_included_FALSE kooka_SUBDIR_included_TRUE kooka_SUBDIR_included_FALSE LIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KSYCOCA LIB_KFILE LIB_KFM gphoto_devel GPHOTO2_INCS GPHOTO2_LIBS LTLIBOBJS LIBFREETYPE_LIBS LIBFREETYPE_CFLAGS FREETYPE_RPATH LIBTIFF PDFINFO PKG_CONFIG LIB_EXR EXR_FLAGS include_EXR_MODULES_TRUE include_EXR_MODULES_FALSE include_TIFF_TRUE include_TIFF_FALSE LIBVM KADMOS_LIB KADMOS_INC LIBFREETYPE_RPATH XFT_CFLAGS XFT_LIBS LIBPAPER_LIBS GLINC GLLIB LIBART_LIBS LIBART_CFLAGS LIBART_RPATH FONTCONFIG_LIBS FONTCONFIG_CFLAGS FONTCONFIG_RPATH FREETYPE_LIBS FREETYPE_CFLAGS LCMS_LIBS FRIBIDI_LIBS FRIBIDI_CFLAGS FRIBIDI_RPATH GENERIC_API_VERSION GENERIC_LIBRARY_VERSION GENERIC_LIBRARY_NAME GENERIC_RELEASE GENERIC_VERSION LIB_IMLIB IMLIB_CFLAGS include_kooka_TRUE include_kooka_FALSE LIBSANE_LIBS LIBSANE_LDFLAGS LIBSANE_INCLUDES TOPSUBDIRS doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kamera_SUBDIR_included_TRUE kamera_SUBDIR_included_FALSE kcoloredit_SUBDIR_included_TRUE kcoloredit_SUBDIR_included_FALSE kfax_SUBDIR_included_TRUE kfax_SUBDIR_included_FALSE kgamma_SUBDIR_included_TRUE kgamma_SUBDIR_included_FALSE kghostview_SUBDIR_included_TRUE kghostview_SUBDIR_included_FALSE kiconedit_SUBDIR_included_TRUE kiconedit_SUBDIR_included_FALSE kmrml_SUBDIR_included_TRUE kmrml_SUBDIR_included_FALSE kolourpaint_SUBDIR_included_TRUE kolourpaint_SUBDIR_included_FALSE kpdf_SUBDIR_included_TRUE kpdf_SUBDIR_included_FALSE kpovmodeler_SUBDIR_included_TRUE kpovmodeler_SUBDIR_included_FALSE kruler_SUBDIR_included_TRUE kruler_SUBDIR_included_FALSE ksnapshot_SUBDIR_included_TRUE ksnapshot_SUBDIR_included_FALSE ksvg_SUBDIR_included_TRUE ksvg_SUBDIR_included_FALSE kuickshow_SUBDIR_included_TRUE kuickshow_SUBDIR_included_FALSE kview_SUBDIR_included_TRUE kview_SUBDIR_included_FALSE kviewshell_SUBDIR_included_TRUE kviewshell_SUBDIR_included_FALSE libkscan_SUBDIR_included_TRUE libkscan_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kfaxview_SUBDIR_included_TRUE kfaxview_SUBDIR_included_FALSE kdvi_SUBDIR_included_TRUE kdvi_SUBDIR_included_FALSE kooka_SUBDIR_included_TRUE kooka_SUBDIR_included_FALSE LIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KSYCOCA LIB_KFILE LIB_KFM gphoto_devel GPHOTO2_INCS GPHOTO2_LIBS LTLIBOBJS LIBFREETYPE_LIBS LIBFREETYPE_CFLAGS FREETYPE_RPATH LIBTIFF PDFINFO PKG_CONFIG LIB_EXR EXR_FLAGS include_EXR_MODULES_TRUE include_EXR_MODULES_FALSE include_TIFF_TRUE include_TIFF_FALSE LIBVM KADMOS_LIB KADMOS_INC LIBFREETYPE_RPATH XFT_CFLAGS XFT_LIBS LIBPAPER_LIBS GLINC GLLIB LIBART_LIBS LIBART_CFLAGS LIBART_RPATH FONTCONFIG_LIBS FONTCONFIG_CFLAGS FONTCONFIG_RPATH FREETYPE_LIBS FREETYPE_CFLAGS LCMS_LIBS FRIBIDI_LIBS FRIBIDI_CFLAGS FRIBIDI_RPATH GENERIC_API_VERSION GENERIC_LIBRARY_VERSION GENERIC_LIBRARY_NAME GENERIC_RELEASE GENERIC_VERSION LIB_IMLIB IMLIB_CFLAGS include_kooka_TRUE include_kooka_FALSE LIBSANE_LIBS LIBSANE_LDFLAGS LIBSANE_INCLUDES TOPSUBDIRS doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kamera_SUBDIR_included_TRUE kamera_SUBDIR_included_FALSE kcoloredit_SUBDIR_included_TRUE kcoloredit_SUBDIR_included_FALSE kfax_SUBDIR_included_TRUE kfax_SUBDIR_included_FALSE kgamma_SUBDIR_included_TRUE kgamma_SUBDIR_included_FALSE kghostview_SUBDIR_included_TRUE kghostview_SUBDIR_included_FALSE kiconedit_SUBDIR_included_TRUE kiconedit_SUBDIR_included_FALSE kmrml_SUBDIR_included_TRUE kmrml_SUBDIR_included_FALSE kolourpaint_SUBDIR_included_TRUE kolourpaint_SUBDIR_included_FALSE kpdf_SUBDIR_included_TRUE kpdf_SUBDIR_included_FALSE kpovmodeler_SUBDIR_included_TRUE kpovmodeler_SUBDIR_included_FALSE kruler_SUBDIR_included_TRUE kruler_SUBDIR_included_FALSE ksnapshot_SUBDIR_included_TRUE ksnapshot_SUBDIR_included_FALSE ksvg_SUBDIR_included_TRUE ksvg_SUBDIR_included_FALSE kuickshow_SUBDIR_included_TRUE kuickshow_SUBDIR_included_FALSE kview_SUBDIR_included_TRUE kview_SUBDIR_included_FALSE kviewshell_SUBDIR_included_TRUE kviewshell_SUBDIR_included_FALSE libkscan_SUBDIR_included_TRUE libkscan_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kfaxview_SUBDIR_included_TRUE kfaxview_SUBDIR_included_FALSE kdvi_SUBDIR_included_TRUE kdvi_SUBDIR_included_FALSE kooka_SUBDIR_included_TRUE kooka_SUBDIR_included_FALSE LIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -4912,17 +1644,27 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4289,8 +4306,7 @@
+@@ -4266,8 +4283,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4378,8 +4394,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4378,8 +4394,7 @@
+@@ -4467,8 +4482,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4932,7 +1674,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4481,8 +4496,7 @@
+@@ -4570,8 +4584,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4942,7 +1684,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4581,8 +4595,7 @@
+@@ -4670,8 +4683,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4952,7 +1694,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4666,8 +4679,7 @@
+@@ -4755,8 +4767,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4962,7 +1704,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4756,8 +4768,7 @@
+@@ -4845,8 +4856,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4972,7 +1714,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4844,8 +4855,7 @@
+@@ -4933,8 +4943,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4982,7 +1724,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4932,8 +4942,7 @@
+@@ -5021,8 +5030,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4992,7 +1734,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5039,8 +5048,7 @@
+@@ -5128,8 +5136,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5002,7 +1744,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5127,8 +5135,7 @@
+@@ -5216,8 +5223,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5012,7 +1754,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5215,8 +5222,7 @@
+@@ -5304,8 +5310,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5022,7 +1764,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5303,8 +5309,7 @@
+@@ -5392,8 +5397,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5032,7 +1774,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5435,8 +5440,7 @@
+@@ -5524,8 +5528,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5042,7 +1784,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5524,8 +5528,7 @@
+@@ -5613,8 +5616,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5052,7 +1794,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5612,8 +5615,7 @@
+@@ -5701,8 +5703,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5062,7 +1804,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5700,8 +5702,7 @@
+@@ -5789,8 +5790,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5072,7 +1814,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5788,8 +5789,7 @@
+@@ -5877,8 +5877,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5082,7 +1824,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5876,8 +5876,7 @@
+@@ -5965,8 +5964,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5092,7 +1834,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6300,8 +6299,7 @@
+@@ -6389,8 +6387,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5102,7 +1844,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6427,8 +6425,7 @@
+@@ -6516,8 +6513,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5112,7 +1854,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6516,8 +6513,7 @@
+@@ -6605,8 +6601,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5122,7 +1864,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6600,185 +6596,6 @@
+@@ -6689,185 +6684,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -5308,7 +2050,7 @@
fi
-@@ -6967,10 +6784,10 @@
+@@ -7056,10 +6872,10 @@
fi
done
done
@@ -5320,7 +2062,7 @@
echo "$as_me:$LINENO: result: $SED" >&5
echo "${ECHO_T}$SED" >&6
-@@ -7204,31 +7021,23 @@
+@@ -7293,31 +7109,23 @@
;;
cygwin*)
@@ -5360,7 +2102,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -7267,42 +7076,21 @@
+@@ -7356,42 +7164,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -5410,7 +2152,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -7331,9 +7119,6 @@
+@@ -7420,9 +7207,6 @@
;;
osf3* | osf4* | osf5*)
@@ -5420,7 +2162,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -7343,7 +7128,6 @@
+@@ -7432,7 +7216,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -5428,16 +2170,16 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -7420,7 +7204,7 @@
+@@ -7509,7 +7292,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 7423 "configure"' > conftest.$ac_ext
-+ echo '#line 7207 "configure"' > conftest.$ac_ext
+- echo '#line 7512 "configure"' > conftest.$ac_ext
++ echo '#line 7295 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7465,12 +7249,11 @@
+@@ -7554,12 +7337,11 @@
(exit $ac_status); }; then
case "`/usr/bin/file conftest.o`" in
*32-bit*)
@@ -5451,7 +2193,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7482,7 +7265,6 @@
+@@ -7571,7 +7353,6 @@
esac
;;
*64-bit*)
@@ -5459,7 +2201,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7542,8 +7324,7 @@
+@@ -7631,8 +7412,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5469,7 +2211,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7618,8 +7399,7 @@
+@@ -7707,8 +7487,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5479,7 +2221,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7789,8 +7569,7 @@
+@@ -7878,8 +7657,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5489,7 +2231,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7857,8 +7636,7 @@
+@@ -7946,8 +7724,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5499,16 +2241,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8065,7 +7843,7 @@
+@@ -8154,7 +7931,7 @@
# Provide some information about the compiler.
--echo "$as_me:8068:" \
-+echo "$as_me:7846:" \
+-echo "$as_me:8157:" \
++echo "$as_me:7934:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-@@ -8111,8 +7889,7 @@
+@@ -8200,8 +7977,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5518,7 +2260,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8161,8 +7938,7 @@
+@@ -8250,8 +8026,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5528,7 +2270,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8220,7 +7996,7 @@
+@@ -8309,7 +8084,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
i=0
@@ -5537,7 +2279,7 @@
case $build_os in
msdosdjgpp*)
-@@ -8249,20 +8025,26 @@
+@@ -8338,20 +8113,26 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -5569,7 +2311,7 @@
# Add a significant safety factor because C++ compilers can tack on massive
# amounts of additional arguments before passing them to the linker.
# It appears as though 1/2 is a usable value.
-@@ -8330,7 +8112,7 @@
+@@ -8419,7 +8200,7 @@
symcode='[BCDEGQRST]'
;;
solaris* | sysv5*)
@@ -5578,7 +2320,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8348,7 +8130,7 @@
+@@ -8437,7 +8218,7 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -5587,35 +2329,35 @@
esac
# Try without a prefix undercore, then with it.
-@@ -9097,11 +8879,11 @@
+@@ -9186,11 +8967,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9100: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8882: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9189: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8970: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9104: \$? = $ac_status" >&5
-+ echo "$as_me:8886: \$? = $ac_status" >&5
+- echo "$as_me:9193: \$? = $ac_status" >&5
++ echo "$as_me:8974: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -9330,11 +9112,11 @@
+@@ -9419,11 +9200,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9333: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9115: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9422: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9203: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9337: \$? = $ac_status" >&5
-+ echo "$as_me:9119: \$? = $ac_status" >&5
+- echo "$as_me:9426: \$? = $ac_status" >&5
++ echo "$as_me:9207: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -9381,13 +9163,6 @@
+@@ -9470,13 +9251,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -5629,21 +2371,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -9397,11 +9172,11 @@
+@@ -9486,11 +9260,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9400: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9175: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9489: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9263: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9404: \$? = $ac_status" >&5
-+ echo "$as_me:9179: \$? = $ac_status" >&5
+- echo "$as_me:9493: \$? = $ac_status" >&5
++ echo "$as_me:9267: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -9411,8 +9186,11 @@
+@@ -9500,8 +9274,11 @@
fi
fi
chmod u+w .
@@ -5657,7 +2399,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -9540,7 +9318,7 @@
+@@ -9629,7 +9406,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -5666,7 +2408,7 @@
else
ld_shlibs=no
fi
-@@ -9550,13 +9328,13 @@
+@@ -9639,13 +9416,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
@@ -5682,7 +2424,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -9565,19 +9343,19 @@
+@@ -9654,19 +9431,19 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -5706,7 +2448,7 @@
fi
;;
-@@ -9595,8 +9373,8 @@
+@@ -9684,8 +9461,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -5717,7 +2459,7 @@
else
ld_shlibs=no
fi
-@@ -9609,10 +9387,36 @@
+@@ -9698,10 +9475,36 @@
hardcode_shlibpath_var=no
;;
@@ -5756,7 +2498,7 @@
else
ld_shlibs=no
fi
-@@ -9662,9 +9466,20 @@
+@@ -9751,9 +9554,20 @@
else
export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -5779,7 +2521,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9710,21 +9525,22 @@
+@@ -9799,21 +9613,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -5807,7 +2549,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -9748,8 +9564,7 @@
+@@ -9837,8 +9652,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5817,7 +2559,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -9776,14 +9591,13 @@
+@@ -9865,14 +9679,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -5835,7 +2577,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -9810,8 +9624,7 @@
+@@ -9899,8 +9712,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5845,7 +2587,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -9849,7 +9662,7 @@
+@@ -9938,7 +9750,7 @@
whole_archive_flag_spec=' '
archive_cmds_need_lc=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -5854,7 +2596,7 @@
fi
fi
;;
-@@ -9872,13 +9685,13 @@
+@@ -9961,13 +9773,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -5871,7 +2613,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds='true'
# FIXME: Should let the user specify the lib program.
-@@ -9892,21 +9705,21 @@
+@@ -9981,21 +9793,21 @@
archive_cmds_need_lc=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -5906,7 +2648,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -9915,18 +9728,18 @@
+@@ -10004,18 +9816,18 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -5931,7 +2673,7 @@
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
-@@ -9967,8 +9780,8 @@
+@@ -10056,8 +9868,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -5942,7 +2684,7 @@
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -9976,7 +9789,7 @@
+@@ -10065,7 +9877,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -5951,7 +2693,7 @@
else
archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -9994,10 +9807,10 @@
+@@ -10083,10 +9895,10 @@
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case "$host_cpu" in
hppa*64*|ia64*)
@@ -5964,7 +2706,7 @@
;;
esac
else
-@@ -10044,7 +9857,7 @@
+@@ -10133,7 +9945,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -5973,7 +2715,7 @@
else
archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld='-rpath $libdir'
-@@ -10054,7 +9867,7 @@
+@@ -10143,7 +9955,7 @@
link_all_deplibs=yes
;;
@@ -5982,7 +2724,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10077,7 +9890,7 @@
+@@ -10166,7 +9978,7 @@
hardcode_direct=yes
hardcode_shlibpath_var=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -5991,7 +2733,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10087,7 +9900,7 @@
+@@ -10176,7 +9988,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -6000,7 +2742,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10098,14 +9911,14 @@
+@@ -10187,14 +9999,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -6017,7 +2759,7 @@
else
allow_undefined_flag=' -expect_unresolved \*'
archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -10117,7 +9930,7 @@
+@@ -10206,7 +10018,7 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -6026,7 +2768,7 @@
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag=' -expect_unresolved \*'
-@@ -10142,9 +9955,9 @@
+@@ -10231,9 +10043,9 @@
solaris*)
no_undefined_flag=' -z text'
if test "$GCC" = yes; then
@@ -6038,7 +2780,7 @@
else
archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -10164,7 +9977,7 @@
+@@ -10253,7 +10065,7 @@
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
@@ -6047,7 +2789,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10224,9 +10037,9 @@
+@@ -10313,9 +10125,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -6059,7 +2801,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var=no
-@@ -10332,7 +10145,7 @@
+@@ -10421,7 +10233,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -6068,7 +2810,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10342,7 +10155,20 @@
+@@ -10431,7 +10243,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -6090,7 +2832,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10407,7 +10233,7 @@
+@@ -10496,7 +10321,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -6099,7 +2841,7 @@
;;
beos*)
-@@ -10432,7 +10258,7 @@
+@@ -10521,7 +10346,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -6108,7 +2850,7 @@
need_version=no
need_lib_prefix=no
-@@ -10497,7 +10323,7 @@
+@@ -10586,7 +10411,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -6117,7 +2859,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -10520,7 +10346,7 @@
+@@ -10609,7 +10434,7 @@
dynamic_linker=no
;;
@@ -6126,7 +2868,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10580,7 +10406,7 @@
+@@ -10669,7 +10494,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -6135,7 +2877,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10595,7 +10421,7 @@
+@@ -10684,7 +10509,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -6144,7 +2886,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10606,7 +10432,7 @@
+@@ -10695,7 +10520,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -6153,7 +2895,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10668,22 +10494,19 @@
+@@ -10757,22 +10582,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -6182,7 +2924,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -10693,6 +10516,30 @@
+@@ -10782,6 +10604,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -6213,7 +2955,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10702,7 +10549,7 @@
+@@ -10791,7 +10637,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -6222,7 +2964,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -10731,7 +10578,7 @@
+@@ -10820,7 +10666,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -6231,7 +2973,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -10751,7 +10598,7 @@
+@@ -10840,7 +10686,7 @@
os2*)
libname_spec='$name'
@@ -6240,7 +2982,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -10980,8 +10827,7 @@
+@@ -11069,8 +10915,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6250,7 +2992,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11084,8 +10930,7 @@
+@@ -11173,8 +11018,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6260,7 +3002,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11150,8 +10995,7 @@
+@@ -11239,8 +11083,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6270,7 +3012,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11244,8 +11088,7 @@
+@@ -11333,8 +11176,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6280,7 +3022,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11310,8 +11153,7 @@
+@@ -11399,8 +11241,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6290,7 +3032,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11377,8 +11219,7 @@
+@@ -11466,8 +11307,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6300,7 +3042,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11444,8 +11285,7 @@
+@@ -11533,8 +11373,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6310,25 +3052,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11520,7 +11360,7 @@
+@@ -11609,7 +11448,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11523 "configure"
-+#line 11363 "configure"
+-#line 11612 "configure"
++#line 11451 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11618,7 +11458,7 @@
+@@ -11707,7 +11546,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11621 "configure"
-+#line 11461 "configure"
+-#line 11710 "configure"
++#line 11549 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11743,7 +11583,7 @@
+@@ -11832,7 +11671,7 @@
fi
;;
@@ -6337,7 +3079,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -11753,29 +11593,29 @@
+@@ -11842,29 +11681,29 @@
archive_cmds_need_lc=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -6381,7 +3123,7 @@
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
-@@ -11809,7 +11649,8 @@
+@@ -11898,7 +11737,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -6391,7 +3133,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -11987,7 +11828,7 @@
+@@ -12076,7 +11916,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -6400,7 +3142,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12018,7 +11859,7 @@
+@@ -12107,7 +11947,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -6409,7 +3151,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12260,7 +12101,10 @@
+@@ -12349,7 +12189,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -6421,7 +3163,7 @@
fi
-@@ -12528,8 +12372,8 @@
+@@ -12617,8 +12460,8 @@
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
if test "$with_gnu_ld" = yes; then
@@ -6432,7 +3174,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12555,7 +12399,7 @@
+@@ -12644,7 +12487,7 @@
# linker, instead of GNU ld. If possible, this setting should
# overridden to take advantage of the native linker features on
# the platform it is being used on.
@@ -6441,7 +3183,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12586,8 +12430,22 @@
+@@ -12675,8 +12518,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -6466,7 +3208,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12633,15 +12491,16 @@
+@@ -12722,15 +12579,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -6487,7 +3229,7 @@
if test "$aix_use_runtimelinking" = yes; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
-@@ -12671,8 +12530,7 @@
+@@ -12760,8 +12618,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6497,7 +3239,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -12701,13 +12559,12 @@
+@@ -12790,13 +12647,12 @@
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -6513,7 +3255,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -12734,8 +12591,7 @@
+@@ -12823,8 +12679,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6523,7 +3265,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -12773,7 +12629,7 @@
+@@ -12862,7 +12717,7 @@
whole_archive_flag_spec_CXX=' '
archive_cmds_need_lc_CXX=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -6532,7 +3274,7 @@
fi
fi
;;
-@@ -12790,12 +12646,12 @@
+@@ -12879,12 +12734,12 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_CXX='-L$libdir'
@@ -6547,7 +3289,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -12804,7 +12660,7 @@
+@@ -12893,7 +12748,7 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -6556,7 +3298,7 @@
else
ld_shlibs_CXX=no
fi
-@@ -12815,20 +12671,20 @@
+@@ -12904,20 +12759,20 @@
archive_cmds_need_lc_CXX=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -6587,7 +3329,7 @@
fi
;;
esac
-@@ -12838,19 +12694,19 @@
+@@ -12927,19 +12782,19 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -6613,7 +3355,7 @@
hardcode_direct_CXX=no
hardcode_automatic_CXX=yes
hardcode_shlibpath_var_CXX=unsupported
-@@ -12885,7 +12741,7 @@
+@@ -12974,7 +12829,7 @@
freebsd-elf*)
archive_cmds_need_lc_CXX=no
;;
@@ -6622,7 +3364,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -12907,7 +12763,7 @@
+@@ -12996,7 +12851,7 @@
ld_shlibs_CXX=no
;;
aCC)
@@ -6631,7 +3373,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -12916,11 +12772,11 @@
+@@ -13005,11 +12860,11 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -6645,7 +3387,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -12977,7 +12833,7 @@
+@@ -13066,7 +12921,7 @@
archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -6654,7 +3396,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -12998,7 +12854,7 @@
+@@ -13087,7 +12942,7 @@
archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -6663,7 +3405,7 @@
;;
esac
fi
-@@ -13013,7 +12869,7 @@
+@@ -13102,7 +12957,7 @@
case $cc_basename in
CC)
# SGI C++
@@ -6672,7 +3414,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13024,9 +12880,9 @@
+@@ -13113,9 +12968,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -6684,7 +3426,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13043,8 +12899,8 @@
+@@ -13132,8 +12987,8 @@
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -6695,7 +3437,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13066,16 +12922,16 @@
+@@ -13155,16 +13010,16 @@
# Intel C++
with_gnu_ld=yes
archive_cmds_need_lc_CXX=no
@@ -6716,7 +3458,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13113,7 +12969,7 @@
+@@ -13202,7 +13057,7 @@
;;
esac
;;
@@ -6725,7 +3467,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -13132,7 +12988,7 @@
+@@ -13221,7 +13076,7 @@
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -6734,7 +3476,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13149,7 +13005,7 @@
+@@ -13238,7 +13093,7 @@
;;
cxx)
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -6743,7 +3485,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13167,7 +13023,7 @@
+@@ -13256,7 +13111,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -6752,7 +3494,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13192,7 +13048,7 @@
+@@ -13281,7 +13136,7 @@
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -6761,7 +3503,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13208,10 +13064,10 @@
+@@ -13297,10 +13152,10 @@
;;
cxx)
allow_undefined_flag_CXX=' -expect_unresolved \*'
@@ -6774,7 +3516,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13230,7 +13086,7 @@
+@@ -13319,7 +13174,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -6783,7 +3525,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13287,9 +13143,9 @@
+@@ -13376,9 +13231,9 @@
CC)
# Sun C++ 4.2, 5.x and Centerline C++
no_undefined_flag_CXX=' -zdefs'
@@ -6795,7 +3537,7 @@
hardcode_libdir_flag_spec_CXX='-R$libdir'
hardcode_shlibpath_var_CXX=no
-@@ -13323,7 +13179,7 @@
+@@ -13412,7 +13267,7 @@
;;
gcx)
# Green Hills C++ Compiler
@@ -6804,7 +3546,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13333,9 +13189,9 @@
+@@ -13422,9 +13277,9 @@
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -6816,7 +3558,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13344,9 +13200,9 @@
+@@ -13433,9 +13288,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -6828,7 +3570,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13461,7 +13317,7 @@
+@@ -13550,7 +13405,7 @@
fi
;;
@@ -6837,7 +3579,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13596,7 +13452,7 @@
+@@ -13685,7 +13540,7 @@
;;
esac
;;
@@ -6846,7 +3588,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -13672,7 +13528,7 @@
+@@ -13761,7 +13616,7 @@
;;
esac
;;
@@ -6855,21 +3597,21 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -13783,11 +13639,11 @@
+@@ -13872,11 +13727,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13786: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13642: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13875: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13730: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:13790: \$? = $ac_status" >&5
-+ echo "$as_me:13646: \$? = $ac_status" >&5
+- echo "$as_me:13879: \$? = $ac_status" >&5
++ echo "$as_me:13734: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -13834,13 +13690,6 @@
+@@ -13923,13 +13778,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -6883,21 +3625,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -13850,11 +13699,11 @@
+@@ -13939,11 +13787,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13853: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13702: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13942: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13790: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:13857: \$? = $ac_status" >&5
-+ echo "$as_me:13706: \$? = $ac_status" >&5
+- echo "$as_me:13946: \$? = $ac_status" >&5
++ echo "$as_me:13794: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -13864,8 +13713,11 @@
+@@ -13953,8 +13801,11 @@
fi
fi
chmod u+w .
@@ -6911,7 +3653,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -13917,6 +13769,9 @@
+@@ -14006,6 +13857,9 @@
cygwin* | mingw*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -6921,7 +3663,7 @@
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -13998,7 +13853,7 @@
+@@ -14087,7 +13941,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -6930,7 +3672,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14008,7 +13863,20 @@
+@@ -14097,7 +13951,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -6952,7 +3694,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14073,7 +13941,7 @@
+@@ -14162,7 +14029,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -6961,7 +3703,7 @@
;;
beos*)
-@@ -14098,7 +13966,7 @@
+@@ -14187,7 +14054,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -6970,7 +3712,7 @@
need_version=no
need_lib_prefix=no
-@@ -14163,7 +14031,7 @@
+@@ -14252,7 +14119,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -6979,7 +3721,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -14186,7 +14054,7 @@
+@@ -14275,7 +14142,7 @@
dynamic_linker=no
;;
@@ -6988,7 +3730,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14246,7 +14114,7 @@
+@@ -14335,7 +14202,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -6997,7 +3739,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14261,7 +14129,7 @@
+@@ -14350,7 +14217,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -7006,7 +3748,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14272,7 +14140,7 @@
+@@ -14361,7 +14228,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -7015,7 +3757,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14334,22 +14202,19 @@
+@@ -14423,22 +14290,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -7044,7 +3786,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -14359,6 +14224,30 @@
+@@ -14448,6 +14312,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -7075,7 +3817,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14368,7 +14257,7 @@
+@@ -14457,7 +14345,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -7084,7 +3826,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14397,7 +14286,7 @@
+@@ -14486,7 +14374,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -7093,7 +3835,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -14417,7 +14306,7 @@
+@@ -14506,7 +14394,7 @@
os2*)
libname_spec='$name'
@@ -7102,7 +3844,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14646,8 +14535,7 @@
+@@ -14735,8 +14623,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7112,7 +3854,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14750,8 +14638,7 @@
+@@ -14839,8 +14726,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7122,7 +3864,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14816,8 +14703,7 @@
+@@ -14905,8 +14791,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7132,7 +3874,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14910,8 +14796,7 @@
+@@ -14999,8 +14884,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7142,7 +3884,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14976,8 +14861,7 @@
+@@ -15065,8 +14949,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7152,7 +3894,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15043,8 +14927,7 @@
+@@ -15132,8 +15015,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7162,7 +3904,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15110,8 +14993,7 @@
+@@ -15199,8 +15081,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7172,25 +3914,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15186,7 +15068,7 @@
+@@ -15275,7 +15156,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 15189 "configure"
-+#line 15071 "configure"
+-#line 15278 "configure"
++#line 15159 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15284,7 +15166,7 @@
+@@ -15373,7 +15254,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 15287 "configure"
-+#line 15169 "configure"
+-#line 15376 "configure"
++#line 15257 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15401,7 +15283,8 @@
+@@ -15490,7 +15371,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -7200,7 +3942,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -15531,7 +15414,7 @@
+@@ -15620,7 +15502,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -7209,7 +3951,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -15562,7 +15445,7 @@
+@@ -15651,7 +15533,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -7218,7 +3960,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -15779,7 +15662,10 @@
+@@ -15868,7 +15750,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -7230,7 +3972,7 @@
fi
-@@ -15881,7 +15767,7 @@
+@@ -15970,7 +15855,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -7239,21 +3981,21 @@
test "$enable_shared" = yes && enable_static=no
;;
esac
-@@ -16107,11 +15993,11 @@
+@@ -16196,11 +16081,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16110: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15996: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16199: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16084: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:16114: \$? = $ac_status" >&5
-+ echo "$as_me:16000: \$? = $ac_status" >&5
+- echo "$as_me:16203: \$? = $ac_status" >&5
++ echo "$as_me:16088: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -16158,13 +16044,6 @@
+@@ -16247,13 +16132,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -7267,21 +4009,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -16174,11 +16053,11 @@
+@@ -16263,11 +16141,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16177: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16056: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16266: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16144: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:16181: \$? = $ac_status" >&5
-+ echo "$as_me:16060: \$? = $ac_status" >&5
+- echo "$as_me:16270: \$? = $ac_status" >&5
++ echo "$as_me:16148: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -16188,8 +16067,11 @@
+@@ -16277,8 +16155,11 @@
fi
fi
chmod u+w .
@@ -7295,7 +4037,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -16317,7 +16199,7 @@
+@@ -16406,7 +16287,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -7304,7 +4046,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16327,13 +16209,13 @@
+@@ -16416,13 +16297,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_F77='-L$libdir'
@@ -7320,7 +4062,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -16342,19 +16224,19 @@
+@@ -16431,19 +16312,19 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -7344,7 +4086,7 @@
fi
;;
-@@ -16372,8 +16254,8 @@
+@@ -16461,8 +16342,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -7355,7 +4097,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16386,10 +16268,36 @@
+@@ -16475,10 +16356,36 @@
hardcode_shlibpath_var_F77=no
;;
@@ -7394,7 +4136,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16439,9 +16347,20 @@
+@@ -16528,9 +16435,20 @@
else
export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -7417,7 +4159,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16487,21 +16406,22 @@
+@@ -16576,21 +16494,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -7445,7 +4187,7 @@
program main
end
-@@ -16515,8 +16435,7 @@
+@@ -16604,8 +16523,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7455,7 +4197,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16543,14 +16462,13 @@
+@@ -16632,14 +16550,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -7473,7 +4215,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16567,8 +16485,7 @@
+@@ -16656,8 +16573,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7483,7 +4225,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16606,7 +16523,7 @@
+@@ -16695,7 +16611,7 @@
whole_archive_flag_spec_F77=' '
archive_cmds_need_lc_F77=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -7492,7 +4234,7 @@
fi
fi
;;
-@@ -16629,13 +16546,13 @@
+@@ -16718,13 +16634,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -7509,7 +4251,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds_F77='true'
# FIXME: Should let the user specify the lib program.
-@@ -16649,21 +16566,21 @@
+@@ -16738,21 +16654,21 @@
archive_cmds_need_lc_F77=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -7544,7 +4286,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -16672,18 +16589,18 @@
+@@ -16761,18 +16677,18 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -7569,7 +4311,7 @@
hardcode_direct_F77=no
hardcode_automatic_F77=yes
hardcode_shlibpath_var_F77=unsupported
-@@ -16724,8 +16641,8 @@
+@@ -16813,8 +16729,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -7580,7 +4322,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -16733,7 +16650,7 @@
+@@ -16822,7 +16738,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -7589,7 +4331,7 @@
else
archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -16751,10 +16668,10 @@
+@@ -16840,10 +16756,10 @@
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case "$host_cpu" in
hppa*64*|ia64*)
@@ -7602,7 +4344,7 @@
;;
esac
else
-@@ -16801,7 +16718,7 @@
+@@ -16890,7 +16806,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -7611,7 +4353,7 @@
else
archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
-@@ -16811,7 +16728,7 @@
+@@ -16900,7 +16816,7 @@
link_all_deplibs_F77=yes
;;
@@ -7620,7 +4362,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -16834,7 +16751,7 @@
+@@ -16923,7 +16839,7 @@
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -7629,7 +4371,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -16844,7 +16761,7 @@
+@@ -16933,7 +16849,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -7638,7 +4380,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -16855,14 +16772,14 @@
+@@ -16944,14 +16860,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -7655,7 +4397,7 @@
else
allow_undefined_flag_F77=' -expect_unresolved \*'
archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -16874,7 +16791,7 @@
+@@ -16963,7 +16879,7 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -7664,7 +4406,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag_F77=' -expect_unresolved \*'
-@@ -16899,9 +16816,9 @@
+@@ -16988,9 +16904,9 @@
solaris*)
no_undefined_flag_F77=' -z text'
if test "$GCC" = yes; then
@@ -7676,7 +4418,7 @@
else
archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -16921,7 +16838,7 @@
+@@ -17010,7 +16926,7 @@
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
@@ -7685,7 +4427,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -16981,9 +16898,9 @@
+@@ -17070,9 +16986,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_F77='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -7697,7 +4439,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_F77=no
-@@ -17089,7 +17006,7 @@
+@@ -17178,7 +17094,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -7706,7 +4448,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17099,7 +17016,20 @@
+@@ -17188,7 +17104,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -7728,7 +4470,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17164,7 +17094,7 @@
+@@ -17253,7 +17182,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -7737,7 +4479,7 @@
;;
beos*)
-@@ -17189,7 +17119,7 @@
+@@ -17278,7 +17207,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -7746,7 +4488,7 @@
need_version=no
need_lib_prefix=no
-@@ -17254,7 +17184,7 @@
+@@ -17343,7 +17272,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -7755,7 +4497,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -17277,7 +17207,7 @@
+@@ -17366,7 +17295,7 @@
dynamic_linker=no
;;
@@ -7764,7 +4506,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17337,7 +17267,7 @@
+@@ -17426,7 +17355,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -7773,7 +4515,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17352,7 +17282,7 @@
+@@ -17441,7 +17370,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -7782,7 +4524,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17363,7 +17293,7 @@
+@@ -17452,7 +17381,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -7791,7 +4533,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17425,22 +17355,19 @@
+@@ -17514,22 +17443,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -7820,7 +4562,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -17450,6 +17377,30 @@
+@@ -17539,6 +17465,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -7851,7 +4593,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17459,7 +17410,7 @@
+@@ -17548,7 +17498,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -7860,7 +4602,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17488,7 +17439,7 @@
+@@ -17577,7 +17527,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -7869,7 +4611,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -17508,7 +17459,7 @@
+@@ -17597,7 +17547,7 @@
os2*)
libname_spec='$name'
@@ -7878,7 +4620,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17687,7 +17638,8 @@
+@@ -17776,7 +17726,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -7888,7 +4630,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -17817,7 +17769,7 @@
+@@ -17906,7 +17857,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -7897,7 +4639,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -17848,7 +17800,7 @@
+@@ -17937,7 +17888,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -7906,7 +4648,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -18065,7 +18017,10 @@
+@@ -18154,7 +18105,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -7918,35 +4660,35 @@
fi
-@@ -18147,11 +18102,11 @@
+@@ -18236,11 +18190,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18150: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18105: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18239: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18193: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18154: \$? = $ac_status" >&5
-+ echo "$as_me:18109: \$? = $ac_status" >&5
+- echo "$as_me:18243: \$? = $ac_status" >&5
++ echo "$as_me:18197: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -18380,11 +18335,11 @@
+@@ -18469,11 +18423,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18383: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18338: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18472: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18426: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18387: \$? = $ac_status" >&5
-+ echo "$as_me:18342: \$? = $ac_status" >&5
+- echo "$as_me:18476: \$? = $ac_status" >&5
++ echo "$as_me:18430: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -18431,13 +18386,6 @@
+@@ -18520,13 +18474,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -7960,21 +4702,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -18447,11 +18395,11 @@
+@@ -18536,11 +18483,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18450: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18398: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18539: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18486: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:18454: \$? = $ac_status" >&5
-+ echo "$as_me:18402: \$? = $ac_status" >&5
+- echo "$as_me:18543: \$? = $ac_status" >&5
++ echo "$as_me:18490: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -18461,8 +18409,11 @@
+@@ -18550,8 +18497,11 @@
fi
fi
chmod u+w .
@@ -7988,7 +4730,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -18590,7 +18541,7 @@
+@@ -18679,7 +18629,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -7997,7 +4739,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18600,13 +18551,13 @@
+@@ -18689,13 +18639,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_GCJ='-L$libdir'
@@ -8013,7 +4755,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -18615,19 +18566,19 @@
+@@ -18704,19 +18654,19 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -8037,7 +4779,7 @@
fi
;;
-@@ -18645,8 +18596,8 @@
+@@ -18734,8 +18684,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -8048,7 +4790,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18659,10 +18610,36 @@
+@@ -18748,10 +18698,36 @@
hardcode_shlibpath_var_GCJ=no
;;
@@ -8087,7 +4829,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18712,9 +18689,20 @@
+@@ -18801,9 +18777,20 @@
else
export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -8110,7 +4852,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -18760,21 +18748,22 @@
+@@ -18849,21 +18836,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -8138,7 +4880,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -18798,8 +18787,7 @@
+@@ -18887,8 +18875,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8148,7 +4890,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -18826,14 +18814,13 @@
+@@ -18915,14 +18902,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -8166,7 +4908,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -18860,8 +18847,7 @@
+@@ -18949,8 +18935,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8176,7 +4918,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -18899,7 +18885,7 @@
+@@ -18988,7 +18973,7 @@
whole_archive_flag_spec_GCJ=' '
archive_cmds_need_lc_GCJ=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -8185,7 +4927,7 @@
fi
fi
;;
-@@ -18922,13 +18908,13 @@
+@@ -19011,13 +18996,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -8202,7 +4944,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds_GCJ='true'
# FIXME: Should let the user specify the lib program.
-@@ -18942,21 +18928,21 @@
+@@ -19031,21 +19016,21 @@
archive_cmds_need_lc_GCJ=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -8237,7 +4979,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -18965,18 +18951,18 @@
+@@ -19054,18 +19039,18 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -8262,7 +5004,7 @@
hardcode_direct_GCJ=no
hardcode_automatic_GCJ=yes
hardcode_shlibpath_var_GCJ=unsupported
-@@ -19017,8 +19003,8 @@
+@@ -19106,8 +19091,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -8273,7 +5015,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -19026,7 +19012,7 @@
+@@ -19115,7 +19100,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -8282,7 +5024,7 @@
else
archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -19044,10 +19030,10 @@
+@@ -19133,10 +19118,10 @@
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case "$host_cpu" in
hppa*64*|ia64*)
@@ -8295,7 +5037,7 @@
;;
esac
else
-@@ -19094,7 +19080,7 @@
+@@ -19183,7 +19168,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -8304,7 +5046,7 @@
else
archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
-@@ -19104,7 +19090,7 @@
+@@ -19193,7 +19178,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -8313,7 +5055,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -19127,7 +19113,7 @@
+@@ -19216,7 +19201,7 @@
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -8322,7 +5064,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19137,7 +19123,7 @@
+@@ -19226,7 +19211,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -8331,7 +5073,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19148,14 +19134,14 @@
+@@ -19237,14 +19222,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -8348,7 +5090,7 @@
else
allow_undefined_flag_GCJ=' -expect_unresolved \*'
archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -19167,7 +19153,7 @@
+@@ -19256,7 +19241,7 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -8357,7 +5099,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag_GCJ=' -expect_unresolved \*'
-@@ -19192,9 +19178,9 @@
+@@ -19281,9 +19266,9 @@
solaris*)
no_undefined_flag_GCJ=' -z text'
if test "$GCC" = yes; then
@@ -8369,7 +5111,7 @@
else
archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -19214,7 +19200,7 @@
+@@ -19303,7 +19288,7 @@
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
@@ -8378,7 +5120,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19274,9 +19260,9 @@
+@@ -19363,9 +19348,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_GCJ='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -8390,7 +5132,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_GCJ=no
-@@ -19382,7 +19368,7 @@
+@@ -19471,7 +19456,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -8399,7 +5141,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19392,7 +19378,20 @@
+@@ -19481,7 +19466,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -8421,7 +5163,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19457,7 +19456,7 @@
+@@ -19546,7 +19544,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -8430,7 +5172,7 @@
;;
beos*)
-@@ -19482,7 +19481,7 @@
+@@ -19571,7 +19569,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -8439,7 +5181,7 @@
need_version=no
need_lib_prefix=no
-@@ -19547,7 +19546,7 @@
+@@ -19636,7 +19634,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -8448,7 +5190,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -19570,7 +19569,7 @@
+@@ -19659,7 +19657,7 @@
dynamic_linker=no
;;
@@ -8457,7 +5199,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19630,7 +19629,7 @@
+@@ -19719,7 +19717,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -8466,7 +5208,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -19645,7 +19644,7 @@
+@@ -19734,7 +19732,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -8475,7 +5217,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19656,7 +19655,7 @@
+@@ -19745,7 +19743,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -8484,7 +5226,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19718,22 +19717,19 @@
+@@ -19807,22 +19805,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -8513,7 +5255,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -19743,6 +19739,30 @@
+@@ -19832,6 +19827,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -8544,7 +5286,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -19752,7 +19772,7 @@
+@@ -19841,7 +19860,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -8553,7 +5295,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -19781,7 +19801,7 @@
+@@ -19870,7 +19889,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -8562,7 +5304,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -19801,7 +19821,7 @@
+@@ -19890,7 +19909,7 @@
os2*)
libname_spec='$name'
@@ -8571,7 +5313,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -20030,8 +20050,7 @@
+@@ -20119,8 +20138,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8581,7 +5323,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20134,8 +20153,7 @@
+@@ -20223,8 +20241,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8591,7 +5333,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20200,8 +20218,7 @@
+@@ -20289,8 +20306,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8601,7 +5343,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20294,8 +20311,7 @@
+@@ -20383,8 +20399,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8611,7 +5353,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20360,8 +20376,7 @@
+@@ -20449,8 +20464,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8621,7 +5363,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20427,8 +20442,7 @@
+@@ -20516,8 +20530,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8631,7 +5373,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20494,8 +20508,7 @@
+@@ -20583,8 +20596,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8641,25 +5383,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20570,7 +20583,7 @@
+@@ -20659,7 +20671,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 20573 "configure"
-+#line 20586 "configure"
+-#line 20662 "configure"
++#line 20674 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20668,7 +20681,7 @@
+@@ -20757,7 +20769,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 20671 "configure"
-+#line 20684 "configure"
+-#line 20760 "configure"
++#line 20772 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20785,7 +20798,8 @@
+@@ -20874,7 +20886,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -8669,7 +5411,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -20915,7 +20929,7 @@
+@@ -21004,7 +21017,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -8678,7 +5420,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -20946,7 +20960,7 @@
+@@ -21035,7 +21048,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -8687,7 +5429,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21163,7 +21177,10 @@
+@@ -21252,7 +21265,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -8699,7 +5441,7 @@
fi
-@@ -21226,7 +21243,8 @@
+@@ -21315,7 +21331,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -8709,7 +5451,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -21356,7 +21374,7 @@
+@@ -21445,7 +21462,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -8718,7 +5460,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21387,7 +21405,7 @@
+@@ -21476,7 +21493,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -8727,7 +5469,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21604,7 +21622,10 @@
+@@ -21693,7 +21710,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -8739,7 +5481,7 @@
fi
-@@ -21651,7 +21672,7 @@
+@@ -21740,7 +21760,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -8748,7 +5490,7 @@
# Prevent multiple expansion
-@@ -21888,8 +21909,7 @@
+@@ -21977,8 +21997,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8758,7 +5500,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -21963,9 +21983,6 @@
+@@ -22052,9 +22071,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -8768,7 +5510,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -21999,8 +22016,7 @@
+@@ -22088,8 +22104,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8778,7 +5520,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22104,8 +22120,7 @@
+@@ -22193,8 +22208,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8788,7 +5530,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22184,9 +22199,6 @@
+@@ -22273,9 +22287,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -8798,7 +5540,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22219,8 +22231,7 @@
+@@ -22308,8 +22319,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8808,7 +5550,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22323,8 +22334,7 @@
+@@ -22412,8 +22422,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8818,7 +5560,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22414,8 +22424,7 @@
+@@ -22503,8 +22512,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8828,7 +5570,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22476,8 +22485,7 @@
+@@ -22565,8 +22573,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8838,7 +5580,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22545,8 +22553,7 @@
+@@ -22634,8 +22641,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8848,7 +5590,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22612,8 +22619,7 @@
+@@ -22701,8 +22707,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8858,7 +5600,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22706,8 +22712,7 @@
+@@ -22795,8 +22800,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8868,7 +5610,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22785,8 +22790,7 @@
+@@ -22874,8 +22878,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8878,7 +5620,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22870,8 +22874,7 @@
+@@ -22959,8 +22962,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8888,7 +5630,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22939,8 +22942,7 @@
+@@ -23028,8 +23030,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8898,7 +5640,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23035,8 +23037,7 @@
+@@ -23124,8 +23125,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8908,7 +5650,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23100,8 +23101,7 @@
+@@ -23189,8 +23189,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8918,7 +5660,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23196,8 +23196,7 @@
+@@ -23285,8 +23284,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8928,7 +5670,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23261,8 +23260,7 @@
+@@ -23350,8 +23348,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8938,7 +5680,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23358,8 +23356,7 @@
+@@ -23447,8 +23444,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8948,7 +5690,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23423,8 +23420,7 @@
+@@ -23512,8 +23508,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8958,7 +5700,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23521,8 +23517,7 @@
+@@ -23610,8 +23605,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8968,7 +5710,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23587,8 +23582,7 @@
+@@ -23676,8 +23670,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8978,7 +5720,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23656,8 +23650,7 @@
+@@ -23745,8 +23738,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8988,7 +5730,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23808,8 +23801,7 @@
+@@ -23897,8 +23889,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8998,7 +5740,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23964,8 +23956,7 @@
+@@ -24053,8 +24044,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9008,7 +5750,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24030,8 +24021,7 @@
+@@ -24119,8 +24109,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9018,7 +5760,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24178,8 +24168,7 @@
+@@ -24267,8 +24256,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9028,7 +5770,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24334,8 +24323,7 @@
+@@ -24423,8 +24411,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9038,7 +5780,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24391,9 +24379,6 @@
+@@ -24480,9 +24467,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -9048,7 +5790,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24427,8 +24412,7 @@
+@@ -24516,8 +24500,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9058,7 +5800,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24532,8 +24516,7 @@
+@@ -24621,8 +24604,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9068,7 +5810,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24633,8 +24616,7 @@
+@@ -24722,8 +24704,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9078,7 +5820,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24708,8 +24690,7 @@
+@@ -24797,8 +24778,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9088,7 +5830,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24772,8 +24753,7 @@
+@@ -24861,8 +24841,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9098,7 +5840,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24835,8 +24815,7 @@
+@@ -24924,8 +24903,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9108,7 +5850,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24876,8 +24855,7 @@
+@@ -24965,8 +24943,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9118,7 +5860,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24933,8 +24911,7 @@
+@@ -25022,8 +24999,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9128,7 +5870,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24974,8 +24951,7 @@
+@@ -25063,8 +25039,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9138,7 +5880,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25039,8 +25015,7 @@
+@@ -25128,8 +25103,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9148,7 +5890,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25071,10 +25046,8 @@
+@@ -25160,10 +25134,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -9161,7 +5903,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -25185,8 +25158,7 @@
+@@ -25274,8 +25246,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9171,7 +5913,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25248,8 +25220,7 @@
+@@ -25337,8 +25308,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9181,7 +5923,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25289,8 +25260,7 @@
+@@ -25378,8 +25348,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9191,7 +5933,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25346,8 +25316,7 @@
+@@ -25435,8 +25404,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9201,7 +5943,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25387,8 +25356,7 @@
+@@ -25476,8 +25444,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9211,7 +5953,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25452,8 +25420,7 @@
+@@ -25541,8 +25508,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9221,7 +5963,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25484,10 +25451,8 @@
+@@ -25573,10 +25539,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -9234,7 +5976,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -25598,8 +25563,7 @@
+@@ -25687,8 +25651,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9244,7 +5986,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25661,8 +25625,7 @@
+@@ -25750,8 +25713,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9254,7 +5996,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25702,8 +25665,7 @@
+@@ -25791,8 +25753,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9264,7 +6006,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25759,8 +25721,7 @@
+@@ -25848,8 +25809,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9274,7 +6016,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25800,8 +25761,7 @@
+@@ -25889,8 +25849,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9284,7 +6026,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25865,8 +25825,7 @@
+@@ -25954,8 +25913,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9294,7 +6036,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25897,10 +25856,8 @@
+@@ -25986,10 +25944,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -9307,7 +6049,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -26011,8 +25968,7 @@
+@@ -26100,8 +26056,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9317,7 +6059,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26074,8 +26030,7 @@
+@@ -26163,8 +26118,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9327,7 +6069,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26115,8 +26070,7 @@
+@@ -26204,8 +26158,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9337,7 +6079,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26172,8 +26126,7 @@
+@@ -26261,8 +26214,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9347,7 +6089,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26213,8 +26166,7 @@
+@@ -26302,8 +26254,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9357,7 +6099,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26278,8 +26230,7 @@
+@@ -26367,8 +26318,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9367,7 +6109,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26310,10 +26261,8 @@
+@@ -26399,10 +26349,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -9380,7 +6122,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -26432,8 +26381,7 @@
+@@ -26521,8 +26469,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9390,7 +6132,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26504,8 +26452,7 @@
+@@ -26593,8 +26540,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9400,7 +6142,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26575,8 +26522,7 @@
+@@ -26664,8 +26610,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9410,7 +6152,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26638,8 +26584,7 @@
+@@ -26727,8 +26672,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9420,7 +6162,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26679,8 +26624,7 @@
+@@ -26768,8 +26712,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9430,7 +6172,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26736,8 +26680,7 @@
+@@ -26825,8 +26768,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9440,7 +6182,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26777,8 +26720,7 @@
+@@ -26866,8 +26808,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9450,7 +6192,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26842,8 +26784,7 @@
+@@ -26931,8 +26872,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9460,7 +6202,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26874,10 +26815,8 @@
+@@ -26963,10 +26903,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -9473,7 +6215,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -26989,8 +26928,7 @@
+@@ -27078,8 +27016,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9483,7 +6225,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27052,8 +26990,7 @@
+@@ -27141,8 +27078,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9493,7 +6235,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27093,8 +27030,7 @@
+@@ -27182,8 +27118,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9503,7 +6245,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27150,8 +27086,7 @@
+@@ -27239,8 +27174,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9513,7 +6255,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27191,8 +27126,7 @@
+@@ -27280,8 +27214,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9523,7 +6265,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27256,8 +27190,7 @@
+@@ -27345,8 +27278,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9533,7 +6275,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27288,10 +27221,8 @@
+@@ -27377,10 +27309,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -9546,7 +6288,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -27402,8 +27333,7 @@
+@@ -27491,8 +27421,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9556,7 +6298,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27473,8 +27403,7 @@
+@@ -27562,8 +27491,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9566,7 +6308,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27654,8 +27583,7 @@
+@@ -27743,8 +27671,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9576,7 +6318,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27764,8 +27692,7 @@
+@@ -27853,8 +27780,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9586,7 +6328,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27989,8 +27916,7 @@
+@@ -28078,8 +28004,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9596,7 +6338,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28213,8 +28139,7 @@
+@@ -28302,8 +28227,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9606,7 +6348,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28290,8 +28215,7 @@
+@@ -28379,8 +28303,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9616,7 +6358,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28514,8 +28438,7 @@
+@@ -28603,8 +28526,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9626,7 +6368,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28590,8 +28513,7 @@
+@@ -28679,8 +28601,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9636,7 +6378,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28651,8 +28573,7 @@
+@@ -28740,8 +28661,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9646,7 +6388,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28735,8 +28656,7 @@
+@@ -28824,8 +28744,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9656,7 +6398,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28829,8 +28749,7 @@
+@@ -28918,8 +28837,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9666,7 +6408,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29004,8 +28923,7 @@
+@@ -29093,8 +29011,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9676,7 +6418,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29103,8 +29021,7 @@
+@@ -29192,8 +29109,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9686,7 +6428,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29197,8 +29114,7 @@
+@@ -29286,8 +29202,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9696,7 +6438,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29281,8 +29197,7 @@
+@@ -29370,8 +29285,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9706,25 +6448,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29335,7 +29250,7 @@
+@@ -29424,7 +29338,7 @@
do
for j in jpeglib.h;
do
-- echo "configure: 29338: $i/$j" >&5
-+ echo "configure: 29253: $i/$j" >&5
+- echo "configure: 29427: $i/$j" >&5
++ echo "configure: 29341: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -29643,7 +29558,7 @@
+@@ -29732,7 +29646,7 @@
do
for j in $kde_qt_header;
do
-- echo "configure: 29646: $i/$j" >&5
-+ echo "configure: 29561: $i/$j" >&5
+- echo "configure: 29735: $i/$j" >&5
++ echo "configure: 29649: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -30320,8 +30235,7 @@
+@@ -30409,8 +30323,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9734,43 +6476,43 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30480,7 +30394,7 @@
+@@ -30569,7 +30482,7 @@
do
for j in $kde_check_header;
do
-- echo "configure: 30483: $i/$j" >&5
-+ echo "configure: 30397: $i/$j" >&5
+- echo "configure: 30572: $i/$j" >&5
++ echo "configure: 30485: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -30510,7 +30424,7 @@
+@@ -30599,7 +30512,7 @@
do
for j in $kde_check_lib;
do
-- echo "configure: 30513: $i/$j" >&5
-+ echo "configure: 30427: $i/$j" >&5
+- echo "configure: 30602: $i/$j" >&5
++ echo "configure: 30515: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -30528,7 +30442,7 @@
+@@ -30617,7 +30530,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
-- echo "configure: 30531: $i/$j" >&5
-+ echo "configure: 30445: $i/$j" >&5
+- echo "configure: 30620: $i/$j" >&5
++ echo "configure: 30533: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -32030,7 +31944,7 @@
+@@ -32135,7 +32048,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
-- echo "configure: 32033: $i/$j" >&5
-+ echo "configure: 31947: $i/$j" >&5
+- echo "configure: 32138: $i/$j" >&5
++ echo "configure: 32051: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -32221,8 +32135,7 @@
+@@ -32326,8 +32239,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9780,7 +6522,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32294,8 +32207,7 @@
+@@ -32399,8 +32311,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9790,7 +6532,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32349,8 +32261,7 @@
+@@ -32454,8 +32365,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9800,7 +6542,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32421,8 +32332,7 @@
+@@ -32526,8 +32436,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9810,7 +6552,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32476,8 +32386,7 @@
+@@ -32581,8 +32490,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9820,7 +6562,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32544,8 +32453,7 @@
+@@ -32649,8 +32557,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9830,7 +6572,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32715,8 +32623,7 @@
+@@ -32820,8 +32727,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9840,7 +6582,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32853,9 +32760,6 @@
+@@ -32958,9 +32864,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -9850,7 +6592,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32886,8 +32790,7 @@
+@@ -32991,8 +32894,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9860,7 +6602,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32988,8 +32891,7 @@
+@@ -33093,8 +32995,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9870,7 +6612,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33068,9 +32970,6 @@
+@@ -33173,9 +33074,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -9880,7 +6622,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33101,8 +33000,7 @@
+@@ -33206,8 +33104,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9890,7 +6632,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33203,8 +33101,7 @@
+@@ -33308,8 +33205,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9900,7 +6642,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33283,9 +33180,6 @@
+@@ -33388,9 +33284,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -9910,7 +6652,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33318,8 +33212,7 @@
+@@ -33423,8 +33316,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9920,7 +6662,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33422,8 +33315,7 @@
+@@ -33527,8 +33419,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9930,7 +6672,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33502,9 +33394,6 @@
+@@ -33607,9 +33498,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -9940,7 +6682,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33538,8 +33427,7 @@
+@@ -33643,8 +33531,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9950,7 +6692,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33643,8 +33531,7 @@
+@@ -33748,8 +33635,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9960,7 +6702,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33734,8 +33621,7 @@
+@@ -33839,8 +33725,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9970,7 +6712,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33886,8 +33772,7 @@
+@@ -33991,8 +33876,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9980,7 +6722,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33963,8 +33848,7 @@
+@@ -34068,8 +33952,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9990,7 +6732,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34052,8 +33936,7 @@
+@@ -34157,8 +34040,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10000,7 +6742,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34117,8 +34000,7 @@
+@@ -34222,8 +34104,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10010,7 +6752,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34182,8 +34064,7 @@
+@@ -34287,8 +34168,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10020,7 +6762,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34357,8 +34238,7 @@
+@@ -34462,8 +34342,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10030,7 +6772,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34633,8 +34513,7 @@
+@@ -34738,8 +34617,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10040,7 +6782,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34730,8 +34609,7 @@
+@@ -34835,8 +34713,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10050,7 +6792,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34974,8 +34852,7 @@
+@@ -35079,8 +34956,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10060,7 +6802,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35100,8 +34977,7 @@
+@@ -35205,8 +35081,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10070,7 +6812,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35197,8 +35073,7 @@
+@@ -35302,8 +35177,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10080,7 +6822,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35296,7 +35171,7 @@
+@@ -35401,7 +35275,7 @@
ac_save_LIBS="$LIBS"
kgamma_save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $all_includes"
@@ -10089,7 +6831,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35325,8 +35200,7 @@
+@@ -35430,8 +35304,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10099,7 +6841,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35338,7 +35212,7 @@
+@@ -35443,7 +35316,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -10108,7 +6850,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -35370,7 +35244,7 @@
+@@ -35475,7 +35348,7 @@
ac_save_LIBS="$LIBS"
kgamma_save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $all_includes"
@@ -10117,7 +6859,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35395,8 +35269,7 @@
+@@ -35500,8 +35373,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10127,7 +6869,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35410,7 +35283,7 @@
+@@ -35515,7 +35387,7 @@
(exit $ac_status); }; }; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
@@ -10136,7 +6878,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -35478,8 +35351,7 @@
+@@ -35583,8 +35455,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10146,7 +6888,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35858,8 +35730,7 @@
+@@ -35965,8 +35836,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10156,7 +6898,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36066,8 +35937,7 @@
+@@ -36173,8 +36043,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10166,16 +6908,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36106,7 +35976,7 @@
+@@ -36213,7 +36082,7 @@
do
for j in xpdfrc;
do
-- echo "configure: 36109: $i/$j" >&5
-+ echo "configure: 35979: $i/$j" >&5
+- echo "configure: 36216: $i/$j" >&5
++ echo "configure: 36085: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
xpdfrc=$i
-@@ -36173,8 +36043,7 @@
+@@ -36280,8 +36149,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10185,7 +6927,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36203,8 +36072,7 @@
+@@ -36310,8 +36178,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10195,7 +6937,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36274,8 +36142,7 @@
+@@ -36381,8 +36248,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10205,7 +6947,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36327,8 +36194,7 @@
+@@ -36434,8 +36300,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10215,7 +6957,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36399,8 +36265,7 @@
+@@ -36506,8 +36371,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10225,7 +6967,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36452,8 +36317,7 @@
+@@ -36559,8 +36423,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10235,7 +6977,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36518,8 +36382,7 @@
+@@ -36625,8 +36488,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10245,7 +6987,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36563,8 +36426,7 @@
+@@ -36670,8 +36532,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10255,7 +6997,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36629,8 +36491,7 @@
+@@ -36736,8 +36597,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10265,7 +7007,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36731,8 +36592,7 @@
+@@ -36838,8 +36698,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10275,7 +7017,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36835,8 +36695,7 @@
+@@ -36942,8 +36801,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10285,7 +7027,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37017,8 +36876,7 @@
+@@ -37124,8 +36982,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10295,7 +7037,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37221,8 +37079,7 @@
+@@ -37328,8 +37185,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10305,7 +7047,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37442,8 +37299,7 @@
+@@ -37549,8 +37405,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10315,7 +7057,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37889,8 +37745,7 @@
+@@ -37996,8 +37851,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10325,7 +7067,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38063,8 +37918,7 @@
+@@ -38170,8 +38024,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10335,7 +7077,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38372,8 +38226,7 @@
+@@ -38479,8 +38332,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10345,7 +7087,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39327,6 +39180,13 @@
+@@ -39434,6 +39286,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -10359,7 +7101,7 @@
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -40247,6 +40107,9 @@
+@@ -40354,6 +40213,9 @@
s,@AMTAR@,$AMTAR,;t t
s,@am__tar@,$am__tar,;t t
s,@am__untar@,$am__untar,;t t
@@ -10369,7 +7111,7 @@
s,@KDECONFIG@,$KDECONFIG,;t t
s,@kde_libs_prefix@,$kde_libs_prefix,;t t
s,@kde_libs_htmldir@,$kde_libs_htmldir,;t t
-@@ -40674,11 +40537,6 @@
+@@ -40782,11 +40644,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
@@ -10381,7 +7123,7 @@
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
-@@ -40717,6 +40575,12 @@
+@@ -40825,6 +40682,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
@@ -10394,12 +7136,12 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/configure.in kdegraphics-3.4.0/configure.in
---- kdegraphics-3.4.0.orig/configure.in 2005-03-04 13:26:26.000000000 +0100
-+++ kdegraphics-3.4.0/configure.in 2005-03-05 02:50:17.587851090 +0100
+diff -rua kdegraphics-3.4.1.orig/configure.in kdegraphics-3.4.1/configure.in
+--- kdegraphics-3.4.1.orig/configure.in 2005-05-23 18:00:10.000000000 +0200
++++ kdegraphics-3.4.1/configure.in 2005-05-25 08:28:10.378604086 +0200
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdegraphics, "3.4.0") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdegraphics, "3.4.1") dnl searches for some needed programs
+AM_MAINTAINER_MODE
+
@@ -10437,22 +7179,10 @@
[AC_MSG_RESULT(no)
eval "ac_cv_lib_vm=no"])
LIBS="$ac_save_LIBS"
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/doc/Makefile.in kdegraphics-3.4.0/doc/Makefile.in
---- kdegraphics-3.4.0.orig/doc/Makefile.in 2005-03-04 13:27:31.000000000 +0100
-+++ kdegraphics-3.4.0/doc/Makefile.in 2005-03-05 02:51:43.543112517 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -212,6 +212,9 @@
+diff -rua kdegraphics-3.4.1.orig/doc/kamera/Makefile.in kdegraphics-3.4.1/doc/kamera/Makefile.in
+--- kdegraphics-3.4.1.orig/doc/kamera/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/doc/kamera/Makefile.in 2005-05-25 08:29:49.176644323 +0200
+@@ -196,6 +196,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10462,15 +7192,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -396,13 +399,13 @@
- KDE_DOCS = AUTO
- #>- SUBDIRS = $(AUTODIRS)
- #>+ 1
--SUBDIRS =. kamera kcoloredit kdvi kgamma kghostview kiconedit kolourpaint kooka kpdf kpovmodeler kruler ksnapshot kuickshow kview
-+SUBDIRS =. kdvi kpdf kooka kview kcoloredit ksnapshot kamera kgamma kruler kuickshow kolourpaint kiconedit kghostview kpovmodeler
- #>- all: all-recursive
- #>+ 1
- all: docs-am all-recursive
+@@ -384,7 +387,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -10478,7 +7201,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -440,9 +443,9 @@
+@@ -422,9 +425,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10490,69 +7213,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -462,7 +465,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -474,7 +483,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -482,7 +491,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -503,7 +518,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/doc/kamera/Makefile.in kdegraphics-3.4.0/doc/kamera/Makefile.in
---- kdegraphics-3.4.0.orig/doc/kamera/Makefile.in 2005-03-04 13:27:31.000000000 +0100
-+++ kdegraphics-3.4.0/doc/kamera/Makefile.in 2005-03-05 02:51:43.551111145 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdegraphics-3.4.1.orig/doc/kcoloredit/Makefile.in kdegraphics-3.4.1/doc/kcoloredit/Makefile.in
+--- kdegraphics-3.4.1.orig/doc/kcoloredit/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/doc/kcoloredit/Makefile.in 2005-05-25 08:29:49.187643326 +0200
@@ -196,6 +196,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -10563,7 +7226,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -383,7 +386,7 @@
+@@ -384,7 +387,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10572,7 +7235,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -421,9 +424,9 @@
+@@ -422,9 +425,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10584,21 +7247,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/doc/kcoloredit/Makefile.in kdegraphics-3.4.0/doc/kcoloredit/Makefile.in
---- kdegraphics-3.4.0.orig/doc/kcoloredit/Makefile.in 2005-03-04 13:27:31.000000000 +0100
-+++ kdegraphics-3.4.0/doc/kcoloredit/Makefile.in 2005-03-05 02:51:43.558109945 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdegraphics-3.4.1.orig/doc/kdvi/Makefile.in kdegraphics-3.4.1/doc/kdvi/Makefile.in
+--- kdegraphics-3.4.1.orig/doc/kdvi/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/doc/kdvi/Makefile.in 2005-05-25 08:29:49.198642328 +0200
@@ -196,6 +196,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -10609,7 +7260,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -383,7 +386,7 @@
+@@ -384,7 +387,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10618,7 +7269,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -421,9 +424,9 @@
+@@ -422,9 +425,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10630,21 +7281,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/doc/kdvi/Makefile.in kdegraphics-3.4.0/doc/kdvi/Makefile.in
---- kdegraphics-3.4.0.orig/doc/kdvi/Makefile.in 2005-03-04 13:27:31.000000000 +0100
-+++ kdegraphics-3.4.0/doc/kdvi/Makefile.in 2005-03-05 02:51:43.566108574 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdegraphics-3.4.1.orig/doc/kgamma/Makefile.in kdegraphics-3.4.1/doc/kgamma/Makefile.in
+--- kdegraphics-3.4.1.orig/doc/kgamma/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/doc/kgamma/Makefile.in 2005-05-25 08:29:49.210641240 +0200
@@ -196,6 +196,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -10655,7 +7294,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -383,7 +386,7 @@
+@@ -384,7 +387,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10664,7 +7303,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -421,9 +424,9 @@
+@@ -422,9 +425,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10676,54 +7315,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -571,7 +574,7 @@
- KDE_DIST=KDVI-features.tex Makefile.in KDVI-features.dvi srcltx.sty index.docbook srctex.sty optionrequester2.png aboutkde.ps optionrequester1.png Makefile.am kdvi-search.el index.cache.bz2
-
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) KDVI-features.dvi KDVI-features.tex aboutkde.ps index.docbook kdvi-search.el optionrequester1.png optionrequester2.png srcltx.sty srctex.sty
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) optionrequester1.png optionrequester2.png aboutkde.ps KDVI-features.dvi KDVI-features.tex kdvi-search.el srctex.sty srcltx.sty index.docbook
- @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
-
- docs-am: index.cache.bz2
-@@ -598,20 +601,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdvi
-- @for base in KDVI-features.dvi KDVI-features.tex aboutkde.ps index.docbook kdvi-search.el optionrequester1.png optionrequester2.png srcltx.sty srctex.sty ; do \
-+ @for base in optionrequester1.png optionrequester2.png aboutkde.ps KDVI-features.dvi KDVI-features.tex kdvi-search.el srctex.sty srcltx.sty index.docbook ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdvi/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdvi/$$base ;\
- done
-
- uninstall-nls:
-- for base in KDVI-features.dvi KDVI-features.tex aboutkde.ps index.docbook kdvi-search.el optionrequester1.png optionrequester2.png srcltx.sty srctex.sty ; do \
-+ for base in optionrequester1.png optionrequester2.png aboutkde.ps KDVI-features.dvi KDVI-features.tex kdvi-search.el srctex.sty srcltx.sty index.docbook ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdvi/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in KDVI-features.dvi KDVI-features.tex aboutkde.ps index.docbook kdvi-search.el optionrequester1.png optionrequester2.png srcltx.sty srctex.sty ; do \
-+ for file in optionrequester1.png optionrequester2.png aboutkde.ps KDVI-features.dvi KDVI-features.tex kdvi-search.el srctex.sty srcltx.sty index.docbook ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/doc/kgamma/Makefile.in kdegraphics-3.4.0/doc/kgamma/Makefile.in
---- kdegraphics-3.4.0.orig/doc/kgamma/Makefile.in 2005-03-04 13:27:31.000000000 +0100
-+++ kdegraphics-3.4.0/doc/kgamma/Makefile.in 2005-03-05 02:51:43.574107202 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdegraphics-3.4.1.orig/doc/kghostview/Makefile.in kdegraphics-3.4.1/doc/kghostview/Makefile.in
+--- kdegraphics-3.4.1.orig/doc/kghostview/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/doc/kghostview/Makefile.in 2005-05-25 08:29:49.221640243 +0200
@@ -196,6 +196,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -10734,7 +7328,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -383,7 +386,7 @@
+@@ -384,7 +387,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10743,7 +7337,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -421,9 +424,9 @@
+@@ -422,9 +425,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10755,21 +7349,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/doc/kghostview/Makefile.in kdegraphics-3.4.0/doc/kghostview/Makefile.in
---- kdegraphics-3.4.0.orig/doc/kghostview/Makefile.in 2005-03-04 13:27:31.000000000 +0100
-+++ kdegraphics-3.4.0/doc/kghostview/Makefile.in 2005-03-05 02:51:43.581106002 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdegraphics-3.4.1.orig/doc/kiconedit/Makefile.in kdegraphics-3.4.1/doc/kiconedit/Makefile.in
+--- kdegraphics-3.4.1.orig/doc/kiconedit/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/doc/kiconedit/Makefile.in 2005-05-25 08:29:49.231639336 +0200
@@ -196,6 +196,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -10780,7 +7362,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -383,7 +386,7 @@
+@@ -384,7 +387,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10789,7 +7371,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -421,9 +424,9 @@
+@@ -422,9 +425,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10801,21 +7383,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/doc/kiconedit/Makefile.in kdegraphics-3.4.0/doc/kiconedit/Makefile.in
---- kdegraphics-3.4.0.orig/doc/kiconedit/Makefile.in 2005-03-04 13:27:31.000000000 +0100
-+++ kdegraphics-3.4.0/doc/kiconedit/Makefile.in 2005-03-05 02:51:43.588104802 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdegraphics-3.4.1.orig/doc/kolourpaint/Makefile.in kdegraphics-3.4.1/doc/kolourpaint/Makefile.in
+--- kdegraphics-3.4.1.orig/doc/kolourpaint/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/doc/kolourpaint/Makefile.in 2005-05-25 08:29:49.246637976 +0200
@@ -196,6 +196,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -10826,7 +7396,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -383,7 +386,7 @@
+@@ -384,7 +387,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10835,7 +7405,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -421,9 +424,9 @@
+@@ -422,9 +425,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10847,21 +7417,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/doc/kolourpaint/Makefile.in kdegraphics-3.4.0/doc/kolourpaint/Makefile.in
---- kdegraphics-3.4.0.orig/doc/kolourpaint/Makefile.in 2005-03-04 13:27:31.000000000 +0100
-+++ kdegraphics-3.4.0/doc/kolourpaint/Makefile.in 2005-03-05 02:51:43.598103088 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdegraphics-3.4.1.orig/doc/kooka/Makefile.in kdegraphics-3.4.1/doc/kooka/Makefile.in
+--- kdegraphics-3.4.1.orig/doc/kooka/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/doc/kooka/Makefile.in 2005-05-25 08:29:49.257636979 +0200
@@ -196,6 +196,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -10872,7 +7430,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -383,7 +386,7 @@
+@@ -384,7 +387,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10881,7 +7439,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -421,9 +424,9 @@
+@@ -422,9 +425,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10893,58 +7451,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -568,10 +571,10 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=image_flatten.png tool_curve.png tool_polygon.png selections_opaque_transparent.png fcc_std_text.png image_skew.png tool_rectangles.png brush_shapes.png spraycan_patterns.png tool_free_form_selection.png lines_30_deg.png image_reduce_colors.png lines_45_deg.png line_width.png index.docbook image_invert.png image_emboss.png tool_color_picker.png eraser_shapes.png tool_rect_selection.png color_box.png image_resize_scale.png tool_elliptical_selection.png tool_polyline.png fill_style.png text_zoom_grid.png tool_line.png image_rotate.png tool_ellipse.png Makefile.in tool_selections.png tool_brush.png tool_polystar.png fcc_trans_text.png fill_color_similarity.png tool_text.png tool_rectangle.png image_flip.png rotate_selection_30.png tool_rounded_rectangle.png image_balance.png rotate_image_30.png tool_color_washer.png tool_pen.png image_soften_sharpen.png tool_spraycan.png tool_flood_fill.png tool_eraser.png Makefile.am lines_30_45_deg.png index.cache.bz2
-+KDE_DIST=image_flatten.png tool_curve.png tool_polygon.png fcc_std_text.png selections_opaque_transparent.png image_skew.png tool_rectangles.png brush_shapes.png spraycan_patterns.png tool_free_form_selection.png lines_30_deg.png image_reduce_colors.png lines_45_deg.png line_width.png index.docbook image_invert.png image_emboss.png tool_color_picker.png eraser_shapes.png image_resize_scale.png color_box.png tool_rect_selection.png tool_elliptical_selection.png fill_style.png tool_polyline.png image_rotate.png tool_ellipse.png tool_line.png text_zoom_grid.png Makefile.in tool_selections.png tool_brush.png fcc_trans_text.png tool_polystar.png fill_color_similarity.png image_flip.png tool_rectangle.png tool_text.png rotate_selection_30.png tool_rounded_rectangle.png image_balance.png rotate_image_30.png tool_color_washer.png tool_pen.png image_soften_sharpen.png tool_flood_fill.png tool_eraser.png tool_spraycan.png Makefile.am lines_30_45_deg.png index.cache.bz2
-
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) brush_shapes.png color_box.png eraser_shapes.png fcc_std_text.png fcc_trans_text.png fill_style.png image_balance.png image_emboss.png image_flatten.png image_flip.png image_invert.png image_reduce_colors.png image_resize_scale.png image_rotate.png image_skew.png image_soften_sharpen.png index.docbook line_width.png lines_30_45_deg.png lines_30_deg.png lines_45_deg.png rotate_image_30.png rotate_selection_30.png selections_opaque_transparent.png spraycan_patterns.png tool_brush.png tool_color_picker.png tool_color_washer.png tool_curve.png tool_ellipse.png tool_elliptical_selection.png tool_eraser.png tool_flood_fill.png tool_free_form_selection.png tool_line.png tool_pen.png tool_polygon.png tool_polyline.png tool_polystar.png tool_rect_selection.png tool_rectangle.png tool_rectangles.png tool_rounded_rectangle.png tool_selections.png tool_spraycan.png tool_text.png fill_color_similarity.png text_zoom_grid.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) image_rotate.png tool_ellipse.png tool_polygon.png rotate_selection_30.png tool_rectangle.png tool_eraser.png line_width.png selections_opaque_transparent.png tool_spraycan.png tool_color_washer.png fcc_trans_text.png tool_line.png lines_30_deg.png tool_polystar.png image_flatten.png lines_45_deg.png tool_pen.png tool_selections.png image_reduce_colors.png tool_curve.png image_balance.png text_zoom_grid.png tool_brush.png image_skew.png tool_polyline.png tool_rect_selection.png lines_30_45_deg.png tool_text.png eraser_shapes.png tool_rounded_rectangle.png fill_color_similarity.png tool_color_picker.png image_emboss.png tool_free_form_selection.png color_box.png spraycan_patterns.png tool_rectangles.png image_flip.png tool_flood_fill.png image_resize_scale.png index.docbook fcc_std_text.png image_invert.png fill_style.png tool_elliptical_selection.png rotate_image_30.png brush_shapes.png image_soften_sharpen.png
- @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
-
- docs-am: index.cache.bz2
-@@ -598,20 +601,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kolourpaint
-- @for base in brush_shapes.png color_box.png eraser_shapes.png fcc_std_text.png fcc_trans_text.png fill_style.png image_balance.png image_emboss.png image_flatten.png image_flip.png image_invert.png image_reduce_colors.png image_resize_scale.png image_rotate.png image_skew.png image_soften_sharpen.png index.docbook line_width.png lines_30_45_deg.png lines_30_deg.png lines_45_deg.png rotate_image_30.png rotate_selection_30.png selections_opaque_transparent.png spraycan_patterns.png tool_brush.png tool_color_picker.png tool_color_washer.png tool_curve.png tool_ellipse.png tool_elliptical_selection.png tool_eraser.png tool_flood_fill.png tool_free_form_selection.png tool_line.png tool_pen.png tool_polygon.png tool_polyline.png tool_polystar.png tool_rect_selection.png tool_rectangle.png tool_rectangles.png tool_rounded_rectangle.png tool_selections.png tool_spraycan.png tool_text.png fill_color_similarity.png text_zoom_grid.png ; do \
-+ @for base in image_rotate.png tool_ellipse.png tool_polygon.png rotate_selection_30.png tool_rectangle.png tool_eraser.png line_width.png selections_opaque_transparent.png tool_spraycan.png tool_color_washer.png fcc_trans_text.png tool_line.png lines_30_deg.png tool_polystar.png image_flatten.png lines_45_deg.png tool_pen.png tool_selections.png image_reduce_colors.png tool_curve.png image_balance.png text_zoom_grid.png tool_brush.png image_skew.png tool_polyline.png tool_rect_selection.png lines_30_45_deg.png tool_text.png eraser_shapes.png tool_rounded_rectangle.png fill_color_similarity.png tool_color_picker.png image_emboss.png tool_free_form_selection.png color_box.png spraycan_patterns.png tool_rectangles.png image_flip.png tool_flood_fill.png image_resize_scale.png index.docbook fcc_std_text.png image_invert.png fill_style.png tool_elliptical_selection.png rotate_image_30.png brush_shapes.png image_soften_sharpen.png ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kolourpaint/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kolourpaint/$$base ;\
- done
-
- uninstall-nls:
-- for base in brush_shapes.png color_box.png eraser_shapes.png fcc_std_text.png fcc_trans_text.png fill_style.png image_balance.png image_emboss.png image_flatten.png image_flip.png image_invert.png image_reduce_colors.png image_resize_scale.png image_rotate.png image_skew.png image_soften_sharpen.png index.docbook line_width.png lines_30_45_deg.png lines_30_deg.png lines_45_deg.png rotate_image_30.png rotate_selection_30.png selections_opaque_transparent.png spraycan_patterns.png tool_brush.png tool_color_picker.png tool_color_washer.png tool_curve.png tool_ellipse.png tool_elliptical_selection.png tool_eraser.png tool_flood_fill.png tool_free_form_selection.png tool_line.png tool_pen.png tool_polygon.png tool_polyline.png tool_polystar.png tool_rect_selection.png tool_rectangle.png tool_rectangles.png tool_rounded_rectangle.png tool_selections.png tool_spraycan.png tool_text.png fill_color_similarity.png text_zoom_grid.png ; do \
-+ for base in image_rotate.png tool_ellipse.png tool_polygon.png rotate_selection_30.png tool_rectangle.png tool_eraser.png line_width.png selections_opaque_transparent.png tool_spraycan.png tool_color_washer.png fcc_trans_text.png tool_line.png lines_30_deg.png tool_polystar.png image_flatten.png lines_45_deg.png tool_pen.png tool_selections.png image_reduce_colors.png tool_curve.png image_balance.png text_zoom_grid.png tool_brush.png image_skew.png tool_polyline.png tool_rect_selection.png lines_30_45_deg.png tool_text.png eraser_shapes.png tool_rounded_rectangle.png fill_color_similarity.png tool_color_picker.png image_emboss.png tool_free_form_selection.png color_box.png spraycan_patterns.png tool_rectangles.png image_flip.png tool_flood_fill.png image_resize_scale.png index.docbook fcc_std_text.png image_invert.png fill_style.png tool_elliptical_selection.png rotate_image_30.png brush_shapes.png image_soften_sharpen.png ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kolourpaint/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in brush_shapes.png color_box.png eraser_shapes.png fcc_std_text.png fcc_trans_text.png fill_style.png image_balance.png image_emboss.png image_flatten.png image_flip.png image_invert.png image_reduce_colors.png image_resize_scale.png image_rotate.png image_skew.png image_soften_sharpen.png index.docbook line_width.png lines_30_45_deg.png lines_30_deg.png lines_45_deg.png rotate_image_30.png rotate_selection_30.png selections_opaque_transparent.png spraycan_patterns.png tool_brush.png tool_color_picker.png tool_color_washer.png tool_curve.png tool_ellipse.png tool_elliptical_selection.png tool_eraser.png tool_flood_fill.png tool_free_form_selection.png tool_line.png tool_pen.png tool_polygon.png tool_polyline.png tool_polystar.png tool_rect_selection.png tool_rectangle.png tool_rectangles.png tool_rounded_rectangle.png tool_selections.png tool_spraycan.png tool_text.png fill_color_similarity.png text_zoom_grid.png ; do \
-+ for file in image_rotate.png tool_ellipse.png tool_polygon.png rotate_selection_30.png tool_rectangle.png tool_eraser.png line_width.png selections_opaque_transparent.png tool_spraycan.png tool_color_washer.png fcc_trans_text.png tool_line.png lines_30_deg.png tool_polystar.png image_flatten.png lines_45_deg.png tool_pen.png tool_selections.png image_reduce_colors.png tool_curve.png image_balance.png text_zoom_grid.png tool_brush.png image_skew.png tool_polyline.png tool_rect_selection.png lines_30_45_deg.png tool_text.png eraser_shapes.png tool_rounded_rectangle.png fill_color_similarity.png tool_color_picker.png image_emboss.png tool_free_form_selection.png color_box.png spraycan_patterns.png tool_rectangles.png image_flip.png tool_flood_fill.png image_resize_scale.png index.docbook fcc_std_text.png image_invert.png fill_style.png tool_elliptical_selection.png rotate_image_30.png brush_shapes.png image_soften_sharpen.png ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/doc/kooka/Makefile.in kdegraphics-3.4.0/doc/kooka/Makefile.in
---- kdegraphics-3.4.0.orig/doc/kooka/Makefile.in 2005-03-04 13:27:31.000000000 +0100
-+++ kdegraphics-3.4.0/doc/kooka/Makefile.in 2005-03-05 02:51:43.606101716 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdegraphics-3.4.1.orig/doc/kpdf/Makefile.in kdegraphics-3.4.1/doc/kpdf/Makefile.in
+--- kdegraphics-3.4.1.orig/doc/kpdf/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/doc/kpdf/Makefile.in 2005-05-25 08:29:49.268635981 +0200
@@ -196,6 +196,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -10955,7 +7464,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -383,7 +386,7 @@
+@@ -384,7 +387,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10964,7 +7473,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -421,9 +424,9 @@
+@@ -422,9 +425,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10976,58 +7485,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -568,10 +571,10 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=kooka_mainctrl.png toolbar2.png index.docbook kooka_gocr.png kooka_gocr_result.png shortcut1.png shortcut0.png ocr-select.png Makefile.in toolbar1.png toolbar.png Makefile.am index.cache.bz2
-+KDE_DIST=kooka_mainctrl.png toolbar2.png index.docbook kooka_gocr.png kooka_gocr_result.png shortcut1.png ocr-select.png shortcut0.png Makefile.in toolbar1.png toolbar.png Makefile.am index.cache.bz2
-
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook kooka_gocr.png kooka_gocr_result.png kooka_mainctrl.png ocr-select.png shortcut0.png shortcut1.png toolbar.png toolbar1.png toolbar2.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) toolbar.png toolbar1.png toolbar2.png kooka_gocr_result.png shortcut0.png shortcut1.png kooka_gocr.png ocr-select.png index.docbook kooka_mainctrl.png
- @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
-
- docs-am: index.cache.bz2
-@@ -598,20 +601,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kooka
-- @for base in index.docbook kooka_gocr.png kooka_gocr_result.png kooka_mainctrl.png ocr-select.png shortcut0.png shortcut1.png toolbar.png toolbar1.png toolbar2.png ; do \
-+ @for base in toolbar.png toolbar1.png toolbar2.png kooka_gocr_result.png shortcut0.png shortcut1.png kooka_gocr.png ocr-select.png index.docbook kooka_mainctrl.png ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kooka/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kooka/$$base ;\
- done
-
- uninstall-nls:
-- for base in index.docbook kooka_gocr.png kooka_gocr_result.png kooka_mainctrl.png ocr-select.png shortcut0.png shortcut1.png toolbar.png toolbar1.png toolbar2.png ; do \
-+ for base in toolbar.png toolbar1.png toolbar2.png kooka_gocr_result.png shortcut0.png shortcut1.png kooka_gocr.png ocr-select.png index.docbook kooka_mainctrl.png ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kooka/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in index.docbook kooka_gocr.png kooka_gocr_result.png kooka_mainctrl.png ocr-select.png shortcut0.png shortcut1.png toolbar.png toolbar1.png toolbar2.png ; do \
-+ for file in toolbar.png toolbar1.png toolbar2.png kooka_gocr_result.png shortcut0.png shortcut1.png kooka_gocr.png ocr-select.png index.docbook kooka_mainctrl.png ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/doc/kpdf/Makefile.in kdegraphics-3.4.0/doc/kpdf/Makefile.in
---- kdegraphics-3.4.0.orig/doc/kpdf/Makefile.in 2005-03-04 13:27:31.000000000 +0100
-+++ kdegraphics-3.4.0/doc/kpdf/Makefile.in 2005-03-05 02:51:43.613100516 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdegraphics-3.4.1.orig/doc/kpovmodeler/Makefile.in kdegraphics-3.4.1/doc/kpovmodeler/Makefile.in
+--- kdegraphics-3.4.1.orig/doc/kpovmodeler/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/doc/kpovmodeler/Makefile.in 2005-05-25 08:29:49.282634712 +0200
@@ -196,6 +196,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -11038,7 +7498,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -383,7 +386,7 @@
+@@ -384,7 +387,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11047,7 +7507,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -421,9 +424,9 @@
+@@ -422,9 +425,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11059,21 +7519,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/doc/kpovmodeler/Makefile.in kdegraphics-3.4.0/doc/kpovmodeler/Makefile.in
---- kdegraphics-3.4.0.orig/doc/kpovmodeler/Makefile.in 2005-03-04 13:27:31.000000000 +0100
-+++ kdegraphics-3.4.0/doc/kpovmodeler/Makefile.in 2005-03-05 02:51:43.623098802 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdegraphics-3.4.1.orig/doc/kruler/Makefile.in kdegraphics-3.4.1/doc/kruler/Makefile.in
+--- kdegraphics-3.4.1.orig/doc/kruler/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/doc/kruler/Makefile.in 2005-05-25 08:29:49.293633714 +0200
@@ -196,6 +196,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -11084,7 +7532,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -383,7 +386,7 @@
+@@ -384,7 +387,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11093,7 +7541,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -421,9 +424,9 @@
+@@ -422,9 +425,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11105,58 +7553,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -568,10 +571,10 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=tutorial01-sphere-render-nocolor.png cr22-action-pmrender.png cr22-action-pmfinish.png texturepreview.png defaultviewlayout.png tutorial01-plane-tree-translate.png cr22-action-pminterior.png tutorial01-ground-color-list.png cr22-action-pmcamera.png tutorial01-sphere-render-solidcolor.png tutorial01-light-dialog.png controlpoints.png dockwidget.png tutorial01-camera-dialog.png tutorial01-ground-wrong-colors-render.png rendermodesize.png tutorial01-ground-solid-color-2.png index.docbook cr22-action-pmsolidcolor.png tutorial01-light-graphic.png cr22-action-pmlight.png objectpropertiesview.png cameraview.png tutorial01-ground-render.png cr22-action-pmsphere.png tutorial01-sphere-dialog.png renderwindow.png rendermodesselection.png tutorial01-camera-graphic.png tutorial01-plane-graphic.png objecttree.png cr22-action-pmpigment.png cr22-action-pmplane.png cr22-action-pmcolorlist.png Makefile.in tutorial01-ground-pigment.png rendersettingsicon.png dockwidgettab.png tutorial01-sphere-finish-dialog.png insertaspopup.png tutorial01-sphere-render-finish.png tutorial01-sphere-solid-color.png tutorial01-plane-tree-expanded.png topview.png rendermodequality.png rendermodeoutput.png rendericon.png tutorial01-plane-dialog.png tutorial01-ground-solid-color-1.png Makefile.am tutorial01-final-render.png rendermodestoolbar.png index.cache.bz2
-+KDE_DIST=tutorial01-sphere-render-nocolor.png cr22-action-pmfinish.png cr22-action-pmrender.png texturepreview.png defaultviewlayout.png cr22-action-pminterior.png tutorial01-plane-tree-translate.png tutorial01-ground-color-list.png cr22-action-pmcamera.png tutorial01-sphere-render-solidcolor.png controlpoints.png tutorial01-light-dialog.png dockwidget.png tutorial01-camera-dialog.png rendermodesize.png tutorial01-ground-wrong-colors-render.png index.docbook tutorial01-ground-solid-color-2.png cr22-action-pmsolidcolor.png tutorial01-light-graphic.png cr22-action-pmlight.png objectpropertiesview.png cameraview.png cr22-action-pmsphere.png tutorial01-ground-render.png tutorial01-sphere-dialog.png rendermodesselection.png renderwindow.png tutorial01-camera-graphic.png tutorial01-plane-graphic.png objecttree.png cr22-action-pmpigment.png cr22-action-pmplane.png cr22-action-pmcolorlist.png Makefile.in rendersettingsicon.png tutorial01-ground-pigment.png dockwidgettab.png insertaspopup.png tutorial01-sphere-finish-dialog.png tutorial01-sphere-render-finish.png tutorial01-sphere-solid-color.png tutorial01-plane-tree-expanded.png topview.png rendermodequality.png rendermodeoutput.png rendericon.png tutorial01-plane-dialog.png Makefile.am tutorial01-ground-solid-color-1.png tutorial01-final-render.png rendermodestoolbar.png index.cache.bz2
-
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) cameraview.png controlpoints.png cr22-action-pmcamera.png cr22-action-pmcolorlist.png cr22-action-pmfinish.png cr22-action-pminterior.png cr22-action-pmlight.png cr22-action-pmpigment.png cr22-action-pmplane.png cr22-action-pmrender.png cr22-action-pmsolidcolor.png cr22-action-pmsphere.png defaultviewlayout.png dockwidget.png dockwidgettab.png index.docbook insertaspopup.png objectpropertiesview.png objecttree.png rendericon.png rendermodeoutput.png rendermodequality.png rendermodesize.png rendermodesselection.png rendermodestoolbar.png rendersettingsicon.png renderwindow.png texturepreview.png topview.png tutorial01-camera-dialog.png tutorial01-camera-graphic.png tutorial01-final-render.png tutorial01-ground-color-list.png tutorial01-ground-pigment.png tutorial01-ground-render.png tutorial01-ground-solid-color-1.png tutorial01-ground-solid-color-2.png tutorial01-ground-wrong-colors-render.png tutorial01-light-dialog.png tutorial01-light-graphic.png tutorial01-plane-dialog.png tutorial01-plane-graphic.png tutorial01-plane-tree-expanded.png tutorial01-plane-tree-translate.png tutorial01-sphere-dialog.png tutorial01-sphere-finish-dialog.png tutorial01-sphere-render-finish.png tutorial01-sphere-render-nocolor.png tutorial01-sphere-render-solidcolor.png tutorial01-sphere-solid-color.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) tutorial01-plane-graphic.png renderwindow.png rendericon.png cr22-action-pmcamera.png tutorial01-camera-dialog.png dockwidget.png cr22-action-pmsolidcolor.png tutorial01-ground-solid-color-1.png tutorial01-ground-solid-color-2.png tutorial01-sphere-finish-dialog.png rendermodesselection.png tutorial01-sphere-render-finish.png rendermodestoolbar.png rendermodeoutput.png tutorial01-plane-tree-translate.png defaultviewlayout.png tutorial01-plane-dialog.png texturepreview.png tutorial01-sphere-dialog.png tutorial01-ground-wrong-colors-render.png rendermodequality.png cr22-action-pmlight.png tutorial01-sphere-solid-color.png cr22-action-pmpigment.png cr22-action-pminterior.png cr22-action-pmrender.png tutorial01-plane-tree-expanded.png cr22-action-pmcolorlist.png tutorial01-sphere-render-solidcolor.png tutorial01-light-dialog.png cr22-action-pmfinish.png tutorial01-light-graphic.png tutorial01-camera-graphic.png tutorial01-ground-pigment.png objectpropertiesview.png cr22-action-pmplane.png tutorial01-ground-color-list.png tutorial01-ground-render.png cr22-action-pmsphere.png insertaspopup.png index.docbook rendermodesize.png topview.png rendersettingsicon.png tutorial01-final-render.png controlpoints.png tutorial01-sphere-render-nocolor.png dockwidgettab.png objecttree.png cameraview.png
- @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
-
- docs-am: index.cache.bz2
-@@ -598,20 +601,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpovmodeler
-- @for base in cameraview.png controlpoints.png cr22-action-pmcamera.png cr22-action-pmcolorlist.png cr22-action-pmfinish.png cr22-action-pminterior.png cr22-action-pmlight.png cr22-action-pmpigment.png cr22-action-pmplane.png cr22-action-pmrender.png cr22-action-pmsolidcolor.png cr22-action-pmsphere.png defaultviewlayout.png dockwidget.png dockwidgettab.png index.docbook insertaspopup.png objectpropertiesview.png objecttree.png rendericon.png rendermodeoutput.png rendermodequality.png rendermodesize.png rendermodesselection.png rendermodestoolbar.png rendersettingsicon.png renderwindow.png texturepreview.png topview.png tutorial01-camera-dialog.png tutorial01-camera-graphic.png tutorial01-final-render.png tutorial01-ground-color-list.png tutorial01-ground-pigment.png tutorial01-ground-render.png tutorial01-ground-solid-color-1.png tutorial01-ground-solid-color-2.png tutorial01-ground-wrong-colors-render.png tutorial01-light-dialog.png tutorial01-light-graphic.png tutorial01-plane-dialog.png tutorial01-plane-graphic.png tutorial01-plane-tree-expanded.png tutorial01-plane-tree-translate.png tutorial01-sphere-dialog.png tutorial01-sphere-finish-dialog.png tutorial01-sphere-render-finish.png tutorial01-sphere-render-nocolor.png tutorial01-sphere-render-solidcolor.png tutorial01-sphere-solid-color.png ; do \
-+ @for base in tutorial01-plane-graphic.png renderwindow.png rendericon.png cr22-action-pmcamera.png tutorial01-camera-dialog.png dockwidget.png cr22-action-pmsolidcolor.png tutorial01-ground-solid-color-1.png tutorial01-ground-solid-color-2.png tutorial01-sphere-finish-dialog.png rendermodesselection.png tutorial01-sphere-render-finish.png rendermodestoolbar.png rendermodeoutput.png tutorial01-plane-tree-translate.png defaultviewlayout.png tutorial01-plane-dialog.png texturepreview.png tutorial01-sphere-dialog.png tutorial01-ground-wrong-colors-render.png rendermodequality.png cr22-action-pmlight.png tutorial01-sphere-solid-color.png cr22-action-pmpigment.png cr22-action-pminterior.png cr22-action-pmrender.png tutorial01-plane-tree-expanded.png cr22-action-pmcolorlist.png tutorial01-sphere-render-solidcolor.png tutorial01-light-dialog.png cr22-action-pmfinish.png tutorial01-light-graphic.png tutorial01-camera-graphic.png tutorial01-ground-pigment.png objectpropertiesview.png cr22-action-pmplane.png tutorial01-ground-color-list.png tutorial01-ground-render.png cr22-action-pmsphere.png insertaspopup.png index.docbook rendermodesize.png topview.png rendersettingsicon.png tutorial01-final-render.png controlpoints.png tutorial01-sphere-render-nocolor.png dockwidgettab.png objecttree.png cameraview.png ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpovmodeler/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpovmodeler/$$base ;\
- done
-
- uninstall-nls:
-- for base in cameraview.png controlpoints.png cr22-action-pmcamera.png cr22-action-pmcolorlist.png cr22-action-pmfinish.png cr22-action-pminterior.png cr22-action-pmlight.png cr22-action-pmpigment.png cr22-action-pmplane.png cr22-action-pmrender.png cr22-action-pmsolidcolor.png cr22-action-pmsphere.png defaultviewlayout.png dockwidget.png dockwidgettab.png index.docbook insertaspopup.png objectpropertiesview.png objecttree.png rendericon.png rendermodeoutput.png rendermodequality.png rendermodesize.png rendermodesselection.png rendermodestoolbar.png rendersettingsicon.png renderwindow.png texturepreview.png topview.png tutorial01-camera-dialog.png tutorial01-camera-graphic.png tutorial01-final-render.png tutorial01-ground-color-list.png tutorial01-ground-pigment.png tutorial01-ground-render.png tutorial01-ground-solid-color-1.png tutorial01-ground-solid-color-2.png tutorial01-ground-wrong-colors-render.png tutorial01-light-dialog.png tutorial01-light-graphic.png tutorial01-plane-dialog.png tutorial01-plane-graphic.png tutorial01-plane-tree-expanded.png tutorial01-plane-tree-translate.png tutorial01-sphere-dialog.png tutorial01-sphere-finish-dialog.png tutorial01-sphere-render-finish.png tutorial01-sphere-render-nocolor.png tutorial01-sphere-render-solidcolor.png tutorial01-sphere-solid-color.png ; do \
-+ for base in tutorial01-plane-graphic.png renderwindow.png rendericon.png cr22-action-pmcamera.png tutorial01-camera-dialog.png dockwidget.png cr22-action-pmsolidcolor.png tutorial01-ground-solid-color-1.png tutorial01-ground-solid-color-2.png tutorial01-sphere-finish-dialog.png rendermodesselection.png tutorial01-sphere-render-finish.png rendermodestoolbar.png rendermodeoutput.png tutorial01-plane-tree-translate.png defaultviewlayout.png tutorial01-plane-dialog.png texturepreview.png tutorial01-sphere-dialog.png tutorial01-ground-wrong-colors-render.png rendermodequality.png cr22-action-pmlight.png tutorial01-sphere-solid-color.png cr22-action-pmpigment.png cr22-action-pminterior.png cr22-action-pmrender.png tutorial01-plane-tree-expanded.png cr22-action-pmcolorlist.png tutorial01-sphere-render-solidcolor.png tutorial01-light-dialog.png cr22-action-pmfinish.png tutorial01-light-graphic.png tutorial01-camera-graphic.png tutorial01-ground-pigment.png objectpropertiesview.png cr22-action-pmplane.png tutorial01-ground-color-list.png tutorial01-ground-render.png cr22-action-pmsphere.png insertaspopup.png index.docbook rendermodesize.png topview.png rendersettingsicon.png tutorial01-final-render.png controlpoints.png tutorial01-sphere-render-nocolor.png dockwidgettab.png objecttree.png cameraview.png ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpovmodeler/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in cameraview.png controlpoints.png cr22-action-pmcamera.png cr22-action-pmcolorlist.png cr22-action-pmfinish.png cr22-action-pminterior.png cr22-action-pmlight.png cr22-action-pmpigment.png cr22-action-pmplane.png cr22-action-pmrender.png cr22-action-pmsolidcolor.png cr22-action-pmsphere.png defaultviewlayout.png dockwidget.png dockwidgettab.png index.docbook insertaspopup.png objectpropertiesview.png objecttree.png rendericon.png rendermodeoutput.png rendermodequality.png rendermodesize.png rendermodesselection.png rendermodestoolbar.png rendersettingsicon.png renderwindow.png texturepreview.png topview.png tutorial01-camera-dialog.png tutorial01-camera-graphic.png tutorial01-final-render.png tutorial01-ground-color-list.png tutorial01-ground-pigment.png tutorial01-ground-render.png tutorial01-ground-solid-color-1.png tutorial01-ground-solid-color-2.png tutorial01-ground-wrong-colors-render.png tutorial01-light-dialog.png tutorial01-light-graphic.png tutorial01-plane-dialog.png tutorial01-plane-graphic.png tutorial01-plane-tree-expanded.png tutorial01-plane-tree-translate.png tutorial01-sphere-dialog.png tutorial01-sphere-finish-dialog.png tutorial01-sphere-render-finish.png tutorial01-sphere-render-nocolor.png tutorial01-sphere-render-solidcolor.png tutorial01-sphere-solid-color.png ; do \
-+ for file in tutorial01-plane-graphic.png renderwindow.png rendericon.png cr22-action-pmcamera.png tutorial01-camera-dialog.png dockwidget.png cr22-action-pmsolidcolor.png tutorial01-ground-solid-color-1.png tutorial01-ground-solid-color-2.png tutorial01-sphere-finish-dialog.png rendermodesselection.png tutorial01-sphere-render-finish.png rendermodestoolbar.png rendermodeoutput.png tutorial01-plane-tree-translate.png defaultviewlayout.png tutorial01-plane-dialog.png texturepreview.png tutorial01-sphere-dialog.png tutorial01-ground-wrong-colors-render.png rendermodequality.png cr22-action-pmlight.png tutorial01-sphere-solid-color.png cr22-action-pmpigment.png cr22-action-pminterior.png cr22-action-pmrender.png tutorial01-plane-tree-expanded.png cr22-action-pmcolorlist.png tutorial01-sphere-render-solidcolor.png tutorial01-light-dialog.png cr22-action-pmfinish.png tutorial01-light-graphic.png tutorial01-camera-graphic.png tutorial01-ground-pigment.png objectpropertiesview.png cr22-action-pmplane.png tutorial01-ground-color-list.png tutorial01-ground-render.png cr22-action-pmsphere.png insertaspopup.png index.docbook rendermodesize.png topview.png rendersettingsicon.png tutorial01-final-render.png controlpoints.png tutorial01-sphere-render-nocolor.png dockwidgettab.png objecttree.png cameraview.png ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/doc/kruler/Makefile.in kdegraphics-3.4.0/doc/kruler/Makefile.in
---- kdegraphics-3.4.0.orig/doc/kruler/Makefile.in 2005-03-04 13:27:31.000000000 +0100
-+++ kdegraphics-3.4.0/doc/kruler/Makefile.in 2005-03-05 02:51:43.633097087 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdegraphics-3.4.1.orig/doc/ksnapshot/Makefile.in kdegraphics-3.4.1/doc/ksnapshot/Makefile.in
+--- kdegraphics-3.4.1.orig/doc/ksnapshot/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/doc/ksnapshot/Makefile.in 2005-05-25 08:29:49.305632626 +0200
@@ -196,6 +196,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -11167,7 +7566,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -383,7 +386,7 @@
+@@ -384,7 +387,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11176,7 +7575,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -421,9 +424,9 @@
+@@ -422,9 +425,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11188,21 +7587,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/doc/ksnapshot/Makefile.in kdegraphics-3.4.0/doc/ksnapshot/Makefile.in
---- kdegraphics-3.4.0.orig/doc/ksnapshot/Makefile.in 2005-03-04 13:27:31.000000000 +0100
-+++ kdegraphics-3.4.0/doc/ksnapshot/Makefile.in 2005-03-05 02:51:43.640095887 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdegraphics-3.4.1.orig/doc/kuickshow/Makefile.in kdegraphics-3.4.1/doc/kuickshow/Makefile.in
+--- kdegraphics-3.4.1.orig/doc/kuickshow/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/doc/kuickshow/Makefile.in 2005-05-25 08:29:49.316631629 +0200
@@ -196,6 +196,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -11213,7 +7600,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -383,7 +386,7 @@
+@@ -384,7 +387,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11222,7 +7609,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -421,9 +424,9 @@
+@@ -422,9 +425,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11234,54 +7621,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -571,7 +574,7 @@
- KDE_DIST=preview.png index.docbook window.png Makefile.in Makefile.am index.cache.bz2
-
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook preview.png window.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) preview.png window.png index.docbook
- @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
-
- docs-am: index.cache.bz2
-@@ -598,20 +601,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/ksnapshot
-- @for base in index.docbook preview.png window.png ; do \
-+ @for base in preview.png window.png index.docbook ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/ksnapshot/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/ksnapshot/$$base ;\
- done
-
- uninstall-nls:
-- for base in index.docbook preview.png window.png ; do \
-+ for base in preview.png window.png index.docbook ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/ksnapshot/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in index.docbook preview.png window.png ; do \
-+ for file in preview.png window.png index.docbook ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/doc/kuickshow/Makefile.in kdegraphics-3.4.0/doc/kuickshow/Makefile.in
---- kdegraphics-3.4.0.orig/doc/kuickshow/Makefile.in 2005-03-04 13:27:31.000000000 +0100
-+++ kdegraphics-3.4.0/doc/kuickshow/Makefile.in 2005-03-05 02:51:43.651094001 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdegraphics-3.4.1.orig/doc/kview/Makefile.in kdegraphics-3.4.1/doc/kview/Makefile.in
+--- kdegraphics-3.4.1.orig/doc/kview/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/doc/kview/Makefile.in 2005-05-25 08:29:49.328630541 +0200
@@ -196,6 +196,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -11292,7 +7634,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -383,7 +386,7 @@
+@@ -384,7 +387,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11301,7 +7643,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -421,9 +424,9 @@
+@@ -422,9 +425,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11313,55 +7655,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -571,7 +574,7 @@
- KDE_DIST=screenshot.png index.docbook Makefile.in Makefile.am index.cache.bz2
-
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook screenshot.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) screenshot.png index.docbook
- @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
-
- docs-am: index.cache.bz2
-@@ -598,20 +601,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kuickshow
-- @for base in index.docbook screenshot.png ; do \
-+ @for base in screenshot.png index.docbook ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kuickshow/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kuickshow/$$base ;\
- done
-
- uninstall-nls:
-- for base in index.docbook screenshot.png ; do \
-+ for base in screenshot.png index.docbook ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kuickshow/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in index.docbook screenshot.png ; do \
-+ for file in screenshot.png index.docbook ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/doc/kview/Makefile.in kdegraphics-3.4.0/doc/kview/Makefile.in
---- kdegraphics-3.4.0.orig/doc/kview/Makefile.in 2005-03-04 13:27:31.000000000 +0100
-+++ kdegraphics-3.4.0/doc/kview/Makefile.in 2005-03-05 02:51:43.658092801 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -196,6 +196,9 @@
+diff -rua kdegraphics-3.4.1.orig/doc/Makefile.in kdegraphics-3.4.1/doc/Makefile.in
+--- kdegraphics-3.4.1.orig/doc/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/doc/Makefile.in 2005-05-25 08:29:49.165645321 +0200
+@@ -212,6 +212,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11371,8 +7668,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -383,7 +386,7 @@
- all: docs-am all-am
+@@ -403,7 +406,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -11380,7 +7677,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -421,9 +424,9 @@
+@@ -441,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11392,55 +7689,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -571,7 +574,7 @@
- KDE_DIST=snapshot1.png snapshot5.png snapshot7.png snapshot3.png snapshot2.png index.docbook snapshot9.png snapshot8.png Makefile.in snapshot4.png snapshot6.png Makefile.am index.cache.bz2
-
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook snapshot1.png snapshot2.png snapshot3.png snapshot4.png snapshot5.png snapshot6.png snapshot7.png snapshot8.png snapshot9.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) snapshot1.png snapshot2.png snapshot3.png snapshot4.png snapshot5.png snapshot6.png snapshot7.png snapshot8.png snapshot9.png index.docbook
- @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
-
- docs-am: index.cache.bz2
-@@ -598,20 +601,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kview
-- @for base in index.docbook snapshot1.png snapshot2.png snapshot3.png snapshot4.png snapshot5.png snapshot6.png snapshot7.png snapshot8.png snapshot9.png ; do \
-+ @for base in snapshot1.png snapshot2.png snapshot3.png snapshot4.png snapshot5.png snapshot6.png snapshot7.png snapshot8.png snapshot9.png index.docbook ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kview/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kview/$$base ;\
- done
-
- uninstall-nls:
-- for base in index.docbook snapshot1.png snapshot2.png snapshot3.png snapshot4.png snapshot5.png snapshot6.png snapshot7.png snapshot8.png snapshot9.png ; do \
-+ for base in snapshot1.png snapshot2.png snapshot3.png snapshot4.png snapshot5.png snapshot6.png snapshot7.png snapshot8.png snapshot9.png index.docbook ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kview/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in index.docbook snapshot1.png snapshot2.png snapshot3.png snapshot4.png snapshot5.png snapshot6.png snapshot7.png snapshot8.png snapshot9.png ; do \
-+ for file in snapshot1.png snapshot2.png snapshot3.png snapshot4.png snapshot5.png snapshot6.png snapshot7.png snapshot8.png snapshot9.png index.docbook ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kamera/Makefile.in kdegraphics-3.4.0/kamera/Makefile.in
---- kdegraphics-3.4.0.orig/kamera/Makefile.in 2005-03-04 13:27:31.000000000 +0100
-+++ kdegraphics-3.4.0/kamera/Makefile.in 2005-03-05 02:51:43.666091430 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -213,6 +213,9 @@
+diff -rua kdegraphics-3.4.1.orig/kamera/kcontrol/Makefile.in kdegraphics-3.4.1/kamera/kcontrol/Makefile.in
+--- kdegraphics-3.4.1.orig/kamera/kcontrol/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/kamera/kcontrol/Makefile.in 2005-05-25 08:29:49.359627730 +0200
+@@ -250,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11450,16 +7702,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -399,7 +402,7 @@
- all: docs-am all-recursive
+@@ -445,7 +448,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*) \
-@@ -437,9 +440,9 @@
+@@ -483,9 +486,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11469,95 +7721,12 @@
-$(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:
-@@ -459,7 +462,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -471,7 +480,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -479,7 +488,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -500,7 +515,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kamera/kcontrol/Makefile.in kdegraphics-3.4.0/kamera/kcontrol/Makefile.in
---- kdegraphics-3.4.0.orig/kamera/kcontrol/Makefile.in 2005-03-04 13:27:31.000000000 +0100
-+++ kdegraphics-3.4.0/kamera/kcontrol/Makefile.in 2005-03-05 02:51:43.715083029 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -83,18 +83,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_kamera_la_SOURCES)
- DIST_SOURCES = $(kcm_kamera_la_SOURCES)
-@@ -250,6 +250,9 @@
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+diff -rua kdegraphics-3.4.1.orig/kamera/kioslave/Makefile.in kdegraphics-3.4.1/kamera/kioslave/Makefile.in
+--- kdegraphics-3.4.1.orig/kamera/kioslave/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/kamera/kioslave/Makefile.in 2005-05-25 08:29:49.375626279 +0200
+@@ -247,6 +247,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11588,45 +7757,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kamera/kioslave/Makefile.in kdegraphics-3.4.0/kamera/kioslave/Makefile.in
---- kdegraphics-3.4.0.orig/kamera/kioslave/Makefile.in 2005-03-04 13:27:31.000000000 +0100
-+++ kdegraphics-3.4.0/kamera/kioslave/Makefile.in 2005-03-05 02:51:43.726081143 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -80,18 +80,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kio_kamera_la_SOURCES)
- DIST_SOURCES = $(kio_kamera_la_SOURCES)
-@@ -247,6 +247,9 @@
+diff -rua kdegraphics-3.4.1.orig/kamera/Makefile.in kdegraphics-3.4.1/kamera/Makefile.in
+--- kdegraphics-3.4.1.orig/kamera/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/kamera/Makefile.in 2005-05-25 08:29:49.339629543 +0200
+@@ -213,6 +213,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11636,16 +7770,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -443,7 +446,7 @@
+@@ -400,7 +403,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*) \
-@@ -481,9 +484,9 @@
+@@ -438,9 +441,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11655,23 +7789,11 @@
-$(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 -u -Nru -x debian kdegraphics-3.4.0.orig/kamera/pics/Makefile.in kdegraphics-3.4.0/kamera/pics/Makefile.in
---- kdegraphics-3.4.0.orig/kamera/pics/Makefile.in 2005-03-04 13:27:31.000000000 +0100
-+++ kdegraphics-3.4.0/kamera/pics/Makefile.in 2005-03-05 02:51:43.738079086 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+ mostlyclean-libtool:
+diff -rua kdegraphics-3.4.1.orig/kamera/pics/Makefile.in kdegraphics-3.4.1/kamera/pics/Makefile.in
+--- kdegraphics-3.4.1.orig/kamera/pics/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/kamera/pics/Makefile.in 2005-05-25 08:29:49.388625100 +0200
@@ -196,6 +196,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -11682,7 +7804,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -382,7 +385,7 @@
+@@ -383,7 +386,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11691,7 +7813,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -420,9 +423,9 @@
+@@ -421,9 +424,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11703,86 +7825,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -572,29 +575,29 @@
-
- #>+ 25
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
-- $(INSTALL_DATA) $(srcdir)/cr16-action-camera_test.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/camera_test.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-camera.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/camera.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices
-- $(INSTALL_DATA) $(srcdir)/cr16-device-camera.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/camera.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices
-- $(INSTALL_DATA) $(srcdir)/cr32-device-camera.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/camera.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems
- $(INSTALL_DATA) $(srcdir)/cr32-filesys-camera.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/camera.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices
- $(INSTALL_DATA) $(srcdir)/cr22-device-camera.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/camera.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices
-+ $(INSTALL_DATA) $(srcdir)/cr32-device-camera.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/camera.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems
- $(INSTALL_DATA) $(srcdir)/cr22-filesys-camera.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/camera.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-camera_test.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/camera_test.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-camera.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/camera.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices
-+ $(INSTALL_DATA) $(srcdir)/cr16-device-camera.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/camera.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/camera_test.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/camera.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/camera.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/camera.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/camera.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/camera.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/camera.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/camera.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/camera_test.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/camera.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/camera.png
-
- #>+ 15
- force-reedit:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kcoloredit/Makefile.in kdegraphics-3.4.0/kcoloredit/Makefile.in
---- kdegraphics-3.4.0.orig/kcoloredit/Makefile.in 2005-03-04 13:27:31.000000000 +0100
-+++ kdegraphics-3.4.0/kcoloredit/Makefile.in 2005-03-05 02:51:43.828063656 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -96,18 +96,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcolorchooser_SOURCES) $(kcoloredit_SOURCES)
- DIST_SOURCES = $(kcolorchooser_SOURCES) $(kcoloredit_SOURCES)
+diff -rua kdegraphics-3.4.1.orig/kcoloredit/Makefile.in kdegraphics-3.4.1/kcoloredit/Makefile.in
+--- kdegraphics-3.4.1.orig/kcoloredit/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/kcoloredit/Makefile.in 2005-05-25 08:29:49.433621020 +0200
@@ -270,6 +270,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -11793,7 +7838,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -480,7 +483,7 @@
+@@ -481,7 +484,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11802,7 +7847,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -518,9 +521,9 @@
+@@ -519,9 +522,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11814,95 +7859,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -921,7 +924,7 @@
- -rm -f texteditselection.moc paletteview.moc kcoloreditdoc.moc loadpalettedlg.moc paletteviewscrolledarea.moc colorselector.moc kxycolorselector.moc kcoloredit.moc gradientselection.moc kcoloreditview.moc kzcolorselector.moc imageselection.moc
-
- #>+ 2
--KDE_DIST=kcolorchooser.desktop lo32-app-kcoloredit.png kcoloreditui.rc paletteviewscrolledarea.h Makefile.in textselection.cpp cr16-app-kcolorchooser.png kcoloredit.desktop lo16-app-kcoloredit.png cr16-app-kcoloredit.png uninstall.desktop cr22-app-kcolorchooser.png Makefile.am cr32-app-kcoloredit.png
-+KDE_DIST=kcolorchooser.desktop lo32-app-kcoloredit.png kcoloreditui.rc paletteviewscrolledarea.h Makefile.in textselection.cpp cr16-app-kcolorchooser.png kcoloredit.desktop cr16-app-kcoloredit.png lo16-app-kcoloredit.png uninstall.desktop cr22-app-kcolorchooser.png Makefile.am cr32-app-kcoloredit.png
-
- #>+ 2
- docs-am:
-@@ -930,23 +933,23 @@
- install-kde-icons:
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-kcolorchooser.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcolorchooser.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kcoloredit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcoloredit.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
-- $(INSTALL_DATA) $(srcdir)/cr22-app-kcolorchooser.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcolorchooser.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-kcoloredit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcoloredit.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
- $(INSTALL_DATA) $(srcdir)/lo16-app-kcoloredit.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kcoloredit.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-kcolorchooser.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcolorchooser.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
- $(INSTALL_DATA) $(srcdir)/lo32-app-kcoloredit.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kcoloredit.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kcoloredit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcoloredit.png
-
- uninstall-kde-icons:
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcolorchooser.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcoloredit.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcolorchooser.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcoloredit.png
- -rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kcoloredit.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcolorchooser.png
- -rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kcoloredit.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcoloredit.png
-
- #>+ 15
- force-reedit:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kdvi/Makefile.in kdegraphics-3.4.0/kdvi/Makefile.in
---- kdegraphics-3.4.0.orig/kdvi/Makefile.in 2005-03-04 13:27:31.000000000 +0100
-+++ kdegraphics-3.4.0/kdvi/Makefile.in 2005-03-05 02:51:43.914048912 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -109,29 +109,29 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kdvipart_la_SOURCES) $(kdvi_SOURCES) $(squeeze_SOURCES)
- DIST_SOURCES = $(kdvipart_la_SOURCES) $(kdvi_SOURCES) \
+diff -rua kdegraphics-3.4.1.orig/kdvi/Makefile.in kdegraphics-3.4.1/kdvi/Makefile.in
+--- kdegraphics-3.4.1.orig/kdvi/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/kdvi/Makefile.in 2005-05-25 08:29:49.492615670 +0200
@@ -307,6 +307,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -11913,7 +7872,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -551,7 +554,7 @@
+@@ -552,7 +555,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -11922,7 +7881,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -589,9 +592,9 @@
+@@ -590,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11934,132 +7893,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -849,7 +852,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -861,7 +870,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -869,7 +878,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -890,7 +905,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1162,18 +1177,18 @@
- mocs: dviWidget.moc
-
- #>+ 3
--infodialog.moc: $(srcdir)/infodialog.h
-- $(MOC) $(srcdir)/infodialog.h -o infodialog.moc
-+fontprogress.moc: $(srcdir)/fontprogress.h
-+ $(MOC) $(srcdir)/fontprogress.h -o fontprogress.moc
-
- #>+ 2
--mocs: infodialog.moc
-+mocs: fontprogress.moc
-
- #>+ 3
--fontprogress.moc: $(srcdir)/fontprogress.h
-- $(MOC) $(srcdir)/fontprogress.h -o fontprogress.moc
-+infodialog.moc: $(srcdir)/infodialog.h
-+ $(MOC) $(srcdir)/infodialog.h -o infodialog.moc
-
- #>+ 2
--mocs: fontprogress.moc
-+mocs: infodialog.moc
-
- #>+ 3
- dviwin.moc: $(srcdir)/dviwin.h
-@@ -1190,18 +1205,18 @@
- mocs: fontpool.moc
-
- #>+ 3
--kdvi_multipage.moc: $(srcdir)/kdvi_multipage.h
-- $(MOC) $(srcdir)/kdvi_multipage.h -o kdvi_multipage.moc
-+optionDialogSpecialWidget.moc: $(srcdir)/optionDialogSpecialWidget.h
-+ $(MOC) $(srcdir)/optionDialogSpecialWidget.h -o optionDialogSpecialWidget.moc
-
- #>+ 2
--mocs: kdvi_multipage.moc
-+mocs: optionDialogSpecialWidget.moc
-
- #>+ 3
--optionDialogSpecialWidget.moc: $(srcdir)/optionDialogSpecialWidget.h
-- $(MOC) $(srcdir)/optionDialogSpecialWidget.h -o optionDialogSpecialWidget.moc
-+kdvi_multipage.moc: $(srcdir)/kdvi_multipage.h
-+ $(MOC) $(srcdir)/kdvi_multipage.h -o kdvi_multipage.moc
-
- #>+ 2
--mocs: optionDialogSpecialWidget.moc
-+mocs: kdvi_multipage.moc
-
- #>+ 3
- optionDialogFontsWidget.moc: $(srcdir)/optionDialogFontsWidget.h
-@@ -1212,10 +1227,10 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f psgs.moc dviWidget.moc infodialog.moc fontprogress.moc dviwin.moc fontpool.moc kdvi_multipage.moc optionDialogSpecialWidget.moc optionDialogFontsWidget.moc
-+ -rm -f psgs.moc dviWidget.moc fontprogress.moc infodialog.moc dviwin.moc fontpool.moc optionDialogSpecialWidget.moc kdvi_multipage.moc optionDialogFontsWidget.moc
-
- #>+ 2
--KDE_DIST=kdvi.kcfg kdvi_multipage.h fontEncodingPool.h psgs.h dviFile.h prefs.kcfgc TeXFont_TFM.h TeXFont_PFB.h TeXFontDefinition.h kdvi.h optionDialogSpecialWidget_base.ui performanceMeasurement.h TeXFont.h dviWidget.h bigEndianByteReader.h TeXFont_PK.h tips fontMap.h optionDialogFontsWidget_base.ui kdvimultipage.desktop fontEncoding.h kdvi.lsm glyph.h optionDialogFontsWidget.h kprinterwrapper.h psheader.txt infodialog.h configure.in.in fontprogress.h Makefile.in optionDialogSpecialWidget.h kdvi.desktop dvisourcesplitter.h fontpool.h Makefile.am kdvi_part.rc
-+KDE_DIST=kdvi.kcfg kdvi_multipage.h fontEncodingPool.h psgs.h dviFile.h TeXFont_TFM.h prefs.kcfgc TeXFont_PFB.h TeXFontDefinition.h kdvi.h optionDialogSpecialWidget_base.ui performanceMeasurement.h TeXFont.h dviWidget.h bigEndianByteReader.h TeXFont_PK.h tips fontMap.h optionDialogFontsWidget_base.ui kdvimultipage.desktop fontEncoding.h kdvi.lsm glyph.h optionDialogFontsWidget.h kprinterwrapper.h psheader.txt infodialog.h configure.in.in fontprogress.h Makefile.in optionDialogSpecialWidget.h kdvi.desktop dvisourcesplitter.h fontpool.h Makefile.am kdvi_part.rc
-
- #>+ 5
- clean-ui:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kdvi/pix/Makefile.in kdegraphics-3.4.0/kdvi/pix/Makefile.in
---- kdegraphics-3.4.0.orig/kdvi/pix/Makefile.in 2005-03-04 13:27:31.000000000 +0100
-+++ kdegraphics-3.4.0/kdvi/pix/Makefile.in 2005-03-05 02:51:43.922047541 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdegraphics-3.4.1.orig/kdvi/pix/Makefile.in kdegraphics-3.4.1/kdvi/pix/Makefile.in
+--- kdegraphics-3.4.1.orig/kdvi/pix/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/kdvi/pix/Makefile.in 2005-05-25 08:29:49.503614672 +0200
@@ -196,6 +196,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -12070,7 +7906,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -382,7 +385,7 @@
+@@ -383,7 +386,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12079,7 +7915,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -420,9 +423,9 @@
+@@ -421,9 +424,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12091,71 +7927,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -572,20 +575,20 @@
-
- #>+ 16
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kdvi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdvi.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-kdvi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdvi.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kdvi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdvi.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
- $(INSTALL_DATA) $(srcdir)/crsc-app-kdvi.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kdvi.svgz
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kdvi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdvi.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kdvi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdvi.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdvi.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdvi.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdvi.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kdvi.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdvi.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdvi.png
-
- #>+ 15
- force-reedit:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kfax/Makefile.in kdegraphics-3.4.0/kfax/Makefile.in
---- kdegraphics-3.4.0.orig/kfax/Makefile.in 2005-03-04 13:27:31.000000000 +0100
-+++ kdegraphics-3.4.0/kfax/Makefile.in 2005-03-05 02:51:44.008032797 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -80,18 +80,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kfax_SOURCES)
- DIST_SOURCES = $(kfax_SOURCES)
+diff -rua kdegraphics-3.4.1.orig/kfax/Makefile.in kdegraphics-3.4.1/kfax/Makefile.in
+--- kdegraphics-3.4.1.orig/kfax/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/kfax/Makefile.in 2005-05-25 08:29:49.548610592 +0200
@@ -255,6 +255,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -12166,7 +7940,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -458,7 +461,7 @@
+@@ -459,7 +462,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12175,7 +7949,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -496,9 +499,9 @@
+@@ -497,9 +500,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12187,78 +7961,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -850,17 +853,17 @@
-
- #>+ 13
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kfax.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfax.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-kfax.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfax.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-kfax.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfax.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kfax.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfax.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfax.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfax.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfax.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfax.png
-
- #>+ 15
- force-reedit:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kfaxview/Makefile.in kdegraphics-3.4.0/kfaxview/Makefile.in
---- kdegraphics-3.4.0.orig/kfaxview/Makefile.in 2005-03-04 13:27:31.000000000 +0100
-+++ kdegraphics-3.4.0/kfaxview/Makefile.in 2005-03-05 02:51:44.033028511 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -76,29 +76,29 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kfaxpart_la_SOURCES)
- DIST_SOURCES = $(kfaxpart_la_SOURCES)
+diff -rua kdegraphics-3.4.1.orig/kfaxview/Makefile.in kdegraphics-3.4.1/kfaxview/Makefile.in
+--- kdegraphics-3.4.1.orig/kfaxview/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/kfaxview/Makefile.in 2005-05-25 08:29:49.565609051 +0200
@@ -253,6 +253,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -12269,7 +7974,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -452,7 +455,7 @@
+@@ -453,7 +456,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -12278,7 +7983,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -490,9 +493,9 @@
+@@ -491,9 +494,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12290,22 +7995,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kfile-plugins/Makefile.in kdegraphics-3.4.0/kfile-plugins/Makefile.in
---- kdegraphics-3.4.0.orig/kfile-plugins/Makefile.in 2005-03-04 13:27:31.000000000 +0100
-+++ kdegraphics-3.4.0/kfile-plugins/Makefile.in 2005-03-05 02:51:44.041027140 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -213,6 +213,9 @@
+diff -rua kdegraphics-3.4.1.orig/kfile-plugins/bmp/Makefile.in kdegraphics-3.4.1/kfile-plugins/bmp/Makefile.in
+--- kdegraphics-3.4.1.orig/kfile-plugins/bmp/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/kfile-plugins/bmp/Makefile.in 2005-05-25 08:29:49.595606330 +0200
+@@ -244,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12315,16 +8008,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -403,7 +406,7 @@
- all: docs-am all-recursive
+@@ -446,7 +449,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 @@
+@@ -484,9 +487,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12334,94 +8027,11 @@
-$(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:
-@@ -463,7 +466,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -475,7 +484,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -483,7 +492,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -504,7 +519,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kfile-plugins/bmp/Makefile.in kdegraphics-3.4.0/kfile-plugins/bmp/Makefile.in
---- kdegraphics-3.4.0.orig/kfile-plugins/bmp/Makefile.in 2005-03-04 13:27:31.000000000 +0100
-+++ kdegraphics-3.4.0/kfile-plugins/bmp/Makefile.in 2005-03-05 02:51:44.065023025 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kfile_bmp_la_SOURCES)
- DIST_SOURCES = $(kfile_bmp_la_SOURCES)
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+diff -rua kdegraphics-3.4.1.orig/kfile-plugins/dds/Makefile.in kdegraphics-3.4.1/kfile-plugins/dds/Makefile.in
+--- kdegraphics-3.4.1.orig/kfile-plugins/dds/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/kfile-plugins/dds/Makefile.in 2005-05-25 08:29:49.614604608 +0200
@@ -244,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -12432,7 +8042,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -445,7 +448,7 @@
+@@ -446,7 +449,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12441,7 +8051,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -483,9 +486,9 @@
+@@ -484,9 +487,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12453,44 +8063,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kfile-plugins/dds/Makefile.in kdegraphics-3.4.0/kfile-plugins/dds/Makefile.in
---- kdegraphics-3.4.0.orig/kfile-plugins/dds/Makefile.in 2005-03-04 13:27:31.000000000 +0100
-+++ kdegraphics-3.4.0/kfile-plugins/dds/Makefile.in 2005-03-05 02:51:44.088019082 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kfile_dds_la_SOURCES)
- DIST_SOURCES = $(kfile_dds_la_SOURCES)
+diff -rua kdegraphics-3.4.1.orig/kfile-plugins/dvi/Makefile.in kdegraphics-3.4.1/kfile-plugins/dvi/Makefile.in
+--- kdegraphics-3.4.1.orig/kfile-plugins/dvi/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/kfile-plugins/dvi/Makefile.in 2005-05-25 08:29:49.631603066 +0200
@@ -244,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -12501,7 +8076,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -445,7 +448,7 @@
+@@ -446,7 +449,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12510,7 +8085,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -483,9 +486,9 @@
+@@ -484,9 +487,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12522,45 +8097,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kfile-plugins/dvi/Makefile.in kdegraphics-3.4.0/kfile-plugins/dvi/Makefile.in
---- kdegraphics-3.4.0.orig/kfile-plugins/dvi/Makefile.in 2005-03-04 13:27:31.000000000 +0100
-+++ kdegraphics-3.4.0/kfile-plugins/dvi/Makefile.in 2005-03-05 02:51:44.114014624 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kfile_dvi_la_SOURCES)
- DIST_SOURCES = $(kfile_dvi_la_SOURCES)
-@@ -244,6 +244,9 @@
+diff -rua kdegraphics-3.4.1.orig/kfile-plugins/exr/Makefile.in kdegraphics-3.4.1/kfile-plugins/exr/Makefile.in
+--- kdegraphics-3.4.1.orig/kfile-plugins/exr/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/kfile-plugins/exr/Makefile.in 2005-05-25 08:29:49.651601253 +0200
+@@ -245,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12570,7 +8110,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -445,7 +448,7 @@
+@@ -449,7 +452,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12579,7 +8119,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -483,9 +486,9 @@
+@@ -487,9 +490,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12591,45 +8131,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kfile-plugins/exr/Makefile.in kdegraphics-3.4.0/kfile-plugins/exr/Makefile.in
---- kdegraphics-3.4.0.orig/kfile-plugins/exr/Makefile.in 2005-03-04 13:27:31.000000000 +0100
-+++ kdegraphics-3.4.0/kfile-plugins/exr/Makefile.in 2005-03-05 02:51:44.144009481 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -78,18 +78,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kfile_exr_la_SOURCES)
- DIST_SOURCES = $(kfile_exr_la_SOURCES)
-@@ -245,6 +245,9 @@
+diff -rua kdegraphics-3.4.1.orig/kfile-plugins/gif/Makefile.in kdegraphics-3.4.1/kfile-plugins/gif/Makefile.in
+--- kdegraphics-3.4.1.orig/kfile-plugins/gif/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/kfile-plugins/gif/Makefile.in 2005-05-25 08:29:49.668599711 +0200
+@@ -244,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12639,7 +8144,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -448,7 +451,7 @@
+@@ -447,7 +450,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12648,7 +8153,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -486,9 +489,9 @@
+@@ -485,9 +488,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12660,44 +8165,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kfile-plugins/gif/Makefile.in kdegraphics-3.4.0/kfile-plugins/gif/Makefile.in
---- kdegraphics-3.4.0.orig/kfile-plugins/gif/Makefile.in 2005-03-04 13:27:31.000000000 +0100
-+++ kdegraphics-3.4.0/kfile-plugins/gif/Makefile.in 2005-03-05 02:51:44.164006052 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kfile_gif_la_SOURCES)
- DIST_SOURCES = $(kfile_gif_la_SOURCES)
+diff -rua kdegraphics-3.4.1.orig/kfile-plugins/ico/Makefile.in kdegraphics-3.4.1/kfile-plugins/ico/Makefile.in
+--- kdegraphics-3.4.1.orig/kfile-plugins/ico/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/kfile-plugins/ico/Makefile.in 2005-05-25 08:29:49.686598079 +0200
@@ -244,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -12729,45 +8199,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kfile-plugins/ico/Makefile.in kdegraphics-3.4.0/kfile-plugins/ico/Makefile.in
---- kdegraphics-3.4.0.orig/kfile-plugins/ico/Makefile.in 2005-03-04 13:27:31.000000000 +0100
-+++ kdegraphics-3.4.0/kfile-plugins/ico/Makefile.in 2005-03-05 02:51:44.195000738 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kfile_ico_la_SOURCES)
- DIST_SOURCES = $(kfile_ico_la_SOURCES)
-@@ -244,6 +244,9 @@
+diff -rua kdegraphics-3.4.1.orig/kfile-plugins/jpeg/Makefile.in kdegraphics-3.4.1/kfile-plugins/jpeg/Makefile.in
+--- kdegraphics-3.4.1.orig/kfile-plugins/jpeg/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/kfile-plugins/jpeg/Makefile.in 2005-05-25 08:29:49.708596084 +0200
+@@ -247,6 +247,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12777,7 +8212,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -445,7 +448,7 @@
+@@ -450,7 +453,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12786,7 +8221,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -483,9 +486,9 @@
+@@ -488,9 +491,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12798,45 +8233,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kfile-plugins/jpeg/Makefile.in kdegraphics-3.4.0/kfile-plugins/jpeg/Makefile.in
---- kdegraphics-3.4.0.orig/kfile-plugins/jpeg/Makefile.in 2005-03-04 13:27:31.000000000 +0100
-+++ kdegraphics-3.4.0/kfile-plugins/jpeg/Makefile.in 2005-03-05 02:51:44.223995766 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -80,18 +80,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kfile_jpeg_la_SOURCES)
- DIST_SOURCES = $(kfile_jpeg_la_SOURCES)
-@@ -247,6 +247,9 @@
+diff -rua kdegraphics-3.4.1.orig/kfile-plugins/Makefile.in kdegraphics-3.4.1/kfile-plugins/Makefile.in
+--- kdegraphics-3.4.1.orig/kfile-plugins/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/kfile-plugins/Makefile.in 2005-05-25 08:29:49.576608053 +0200
+@@ -213,6 +213,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12846,16 +8246,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -449,7 +452,7 @@
+@@ -404,7 +407,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*) \
-@@ -487,9 +490,9 @@
+@@ -442,9 +445,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12865,46 +8265,11 @@
-$(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 -u -Nru -x debian kdegraphics-3.4.0.orig/kfile-plugins/pcx/Makefile.in kdegraphics-3.4.0/kfile-plugins/pcx/Makefile.in
---- kdegraphics-3.4.0.orig/kfile-plugins/pcx/Makefile.in 2005-03-04 13:27:31.000000000 +0100
-+++ kdegraphics-3.4.0/kfile-plugins/pcx/Makefile.in 2005-03-05 02:51:44.235993709 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -78,18 +78,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kfile_pcx_la_SOURCES)
- DIST_SOURCES = $(kfile_pcx_la_SOURCES)
+ mostlyclean-libtool:
+diff -rua kdegraphics-3.4.1.orig/kfile-plugins/pcx/Makefile.in kdegraphics-3.4.1/kfile-plugins/pcx/Makefile.in
+--- kdegraphics-3.4.1.orig/kfile-plugins/pcx/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/kfile-plugins/pcx/Makefile.in 2005-05-25 08:29:49.725594543 +0200
@@ -245,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -12915,7 +8280,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,7 +447,7 @@
+@@ -445,7 +448,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12924,7 +8289,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -482,9 +485,9 @@
+@@ -483,9 +486,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12936,44 +8301,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kfile-plugins/pdf/Makefile.in kdegraphics-3.4.0/kfile-plugins/pdf/Makefile.in
---- kdegraphics-3.4.0.orig/kfile-plugins/pdf/Makefile.in 2005-03-04 13:27:31.000000000 +0100
-+++ kdegraphics-3.4.0/kfile-plugins/pdf/Makefile.in 2005-03-05 02:51:44.259989594 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kfile_pdf_la_SOURCES)
- DIST_SOURCES = $(kfile_pdf_la_SOURCES)
+diff -rua kdegraphics-3.4.1.orig/kfile-plugins/pdf/Makefile.in kdegraphics-3.4.1/kfile-plugins/pdf/Makefile.in
+--- kdegraphics-3.4.1.orig/kfile-plugins/pdf/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/kfile-plugins/pdf/Makefile.in 2005-05-25 08:29:49.743592910 +0200
@@ -244,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -12984,7 +8314,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -445,7 +448,7 @@
+@@ -446,7 +449,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12993,7 +8323,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -483,9 +486,9 @@
+@@ -484,9 +487,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13005,44 +8335,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kfile-plugins/png/Makefile.in kdegraphics-3.4.0/kfile-plugins/png/Makefile.in
---- kdegraphics-3.4.0.orig/kfile-plugins/png/Makefile.in 2005-03-04 13:27:31.000000000 +0100
-+++ kdegraphics-3.4.0/kfile-plugins/png/Makefile.in 2005-03-05 02:51:44.281985822 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kfile_png_la_SOURCES)
- DIST_SOURCES = $(kfile_png_la_SOURCES)
+diff -rua kdegraphics-3.4.1.orig/kfile-plugins/png/Makefile.in kdegraphics-3.4.1/kfile-plugins/png/Makefile.in
+--- kdegraphics-3.4.1.orig/kfile-plugins/png/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/kfile-plugins/png/Makefile.in 2005-05-25 08:29:49.761591278 +0200
@@ -244,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -13053,7 +8348,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -445,7 +448,7 @@
+@@ -446,7 +449,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13062,7 +8357,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -483,9 +486,9 @@
+@@ -484,9 +487,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13074,44 +8369,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kfile-plugins/pnm/Makefile.in kdegraphics-3.4.0/kfile-plugins/pnm/Makefile.in
---- kdegraphics-3.4.0.orig/kfile-plugins/pnm/Makefile.in 2005-03-04 13:27:31.000000000 +0100
-+++ kdegraphics-3.4.0/kfile-plugins/pnm/Makefile.in 2005-03-05 02:51:44.294983594 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kfile_pnm_la_SOURCES)
- DIST_SOURCES = $(kfile_pnm_la_SOURCES)
+diff -rua kdegraphics-3.4.1.orig/kfile-plugins/pnm/Makefile.in kdegraphics-3.4.1/kfile-plugins/pnm/Makefile.in
+--- kdegraphics-3.4.1.orig/kfile-plugins/pnm/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/kfile-plugins/pnm/Makefile.in 2005-05-25 08:29:49.779589646 +0200
@@ -244,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -13122,7 +8382,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -445,7 +448,7 @@
+@@ -446,7 +449,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13131,7 +8391,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -483,9 +486,9 @@
+@@ -484,9 +487,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13143,44 +8403,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kfile-plugins/ps/Makefile.in kdegraphics-3.4.0/kfile-plugins/ps/Makefile.in
---- kdegraphics-3.4.0.orig/kfile-plugins/ps/Makefile.in 2005-03-04 13:27:31.000000000 +0100
-+++ kdegraphics-3.4.0/kfile-plugins/ps/Makefile.in 2005-03-05 02:51:44.322978793 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -84,18 +84,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(gsthumbnail_la_SOURCES) $(kfile_ps_la_SOURCES)
- DIST_SOURCES = $(gsthumbnail_la_SOURCES) $(kfile_ps_la_SOURCES)
+diff -rua kdegraphics-3.4.1.orig/kfile-plugins/ps/Makefile.in kdegraphics-3.4.1/kfile-plugins/ps/Makefile.in
+--- kdegraphics-3.4.1.orig/kfile-plugins/ps/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/kfile-plugins/ps/Makefile.in 2005-05-25 08:29:49.799587833 +0200
@@ -251,6 +251,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -13191,7 +8416,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -455,7 +458,7 @@
+@@ -456,7 +459,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13200,7 +8425,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -493,9 +496,9 @@
+@@ -494,9 +497,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13212,44 +8437,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kfile-plugins/rgb/Makefile.in kdegraphics-3.4.0/kfile-plugins/rgb/Makefile.in
---- kdegraphics-3.4.0.orig/kfile-plugins/rgb/Makefile.in 2005-03-04 13:27:31.000000000 +0100
-+++ kdegraphics-3.4.0/kfile-plugins/rgb/Makefile.in 2005-03-05 02:51:44.346974679 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kfile_rgb_la_SOURCES)
- DIST_SOURCES = $(kfile_rgb_la_SOURCES)
+diff -rua kdegraphics-3.4.1.orig/kfile-plugins/rgb/Makefile.in kdegraphics-3.4.1/kfile-plugins/rgb/Makefile.in
+--- kdegraphics-3.4.1.orig/kfile-plugins/rgb/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/kfile-plugins/rgb/Makefile.in 2005-05-25 08:29:49.816586291 +0200
@@ -244,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -13260,7 +8450,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -445,7 +448,7 @@
+@@ -446,7 +449,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13269,7 +8459,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -483,9 +486,9 @@
+@@ -484,9 +487,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13281,44 +8471,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kfile-plugins/tga/Makefile.in kdegraphics-3.4.0/kfile-plugins/tga/Makefile.in
---- kdegraphics-3.4.0.orig/kfile-plugins/tga/Makefile.in 2005-03-04 13:27:31.000000000 +0100
-+++ kdegraphics-3.4.0/kfile-plugins/tga/Makefile.in 2005-03-05 02:51:44.369970736 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kfile_tga_la_SOURCES)
- DIST_SOURCES = $(kfile_tga_la_SOURCES)
+diff -rua kdegraphics-3.4.1.orig/kfile-plugins/tga/Makefile.in kdegraphics-3.4.1/kfile-plugins/tga/Makefile.in
+--- kdegraphics-3.4.1.orig/kfile-plugins/tga/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/kfile-plugins/tga/Makefile.in 2005-05-25 08:29:49.834584659 +0200
@@ -244,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -13329,7 +8484,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -445,7 +448,7 @@
+@@ -446,7 +449,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13338,7 +8493,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -483,9 +486,9 @@
+@@ -484,9 +487,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13350,44 +8505,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kfile-plugins/tiff/Makefile.in kdegraphics-3.4.0/kfile-plugins/tiff/Makefile.in
---- kdegraphics-3.4.0.orig/kfile-plugins/tiff/Makefile.in 2005-03-04 13:27:32.000000000 +0100
-+++ kdegraphics-3.4.0/kfile-plugins/tiff/Makefile.in 2005-03-05 02:51:44.407964221 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -78,18 +78,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kfile_tiff_la_SOURCES)
- DIST_SOURCES = $(kfile_tiff_la_SOURCES)
+diff -rua kdegraphics-3.4.1.orig/kfile-plugins/tiff/Makefile.in kdegraphics-3.4.1/kfile-plugins/tiff/Makefile.in
+--- kdegraphics-3.4.1.orig/kfile-plugins/tiff/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/kfile-plugins/tiff/Makefile.in 2005-05-25 08:29:49.852583027 +0200
@@ -245,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -13398,7 +8518,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,7 +447,7 @@
+@@ -445,7 +448,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13407,7 +8527,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -482,9 +485,9 @@
+@@ -483,9 +486,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13419,44 +8539,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kfile-plugins/xbm/Makefile.in kdegraphics-3.4.0/kfile-plugins/xbm/Makefile.in
---- kdegraphics-3.4.0.orig/kfile-plugins/xbm/Makefile.in 2005-03-04 13:27:32.000000000 +0100
-+++ kdegraphics-3.4.0/kfile-plugins/xbm/Makefile.in 2005-03-05 02:51:44.419962164 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kfile_xbm_la_SOURCES)
- DIST_SOURCES = $(kfile_xbm_la_SOURCES)
+diff -rua kdegraphics-3.4.1.orig/kfile-plugins/xbm/Makefile.in kdegraphics-3.4.1/kfile-plugins/xbm/Makefile.in
+--- kdegraphics-3.4.1.orig/kfile-plugins/xbm/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/kfile-plugins/xbm/Makefile.in 2005-05-25 08:29:49.870581395 +0200
@@ -244,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -13467,7 +8552,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -445,7 +448,7 @@
+@@ -446,7 +449,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13476,7 +8561,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -483,9 +486,9 @@
+@@ -484,9 +487,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13488,44 +8573,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kfile-plugins/xpm/Makefile.in kdegraphics-3.4.0/kfile-plugins/xpm/Makefile.in
---- kdegraphics-3.4.0.orig/kfile-plugins/xpm/Makefile.in 2005-03-04 13:27:32.000000000 +0100
-+++ kdegraphics-3.4.0/kfile-plugins/xpm/Makefile.in 2005-03-05 02:51:44.432959935 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kfile_xpm_la_SOURCES)
- DIST_SOURCES = $(kfile_xpm_la_SOURCES)
+diff -rua kdegraphics-3.4.1.orig/kfile-plugins/xpm/Makefile.in kdegraphics-3.4.1/kfile-plugins/xpm/Makefile.in
+--- kdegraphics-3.4.1.orig/kfile-plugins/xpm/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/kfile-plugins/xpm/Makefile.in 2005-05-25 08:29:49.888579763 +0200
@@ -244,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -13536,7 +8586,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -443,7 +446,7 @@
+@@ -444,7 +447,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13545,7 +8595,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -481,9 +484,9 @@
+@@ -482,9 +485,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13557,22 +8607,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kgamma/Makefile.in kdegraphics-3.4.0/kgamma/Makefile.in
---- kdegraphics-3.4.0.orig/kgamma/Makefile.in 2005-03-04 13:27:32.000000000 +0100
-+++ kdegraphics-3.4.0/kgamma/Makefile.in 2005-03-05 02:51:44.440958563 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -213,6 +213,9 @@
+diff -rua kdegraphics-3.4.1.orig/kgamma/kcmkgamma/Makefile.in kdegraphics-3.4.1/kgamma/kcmkgamma/Makefile.in
+--- kdegraphics-3.4.1.orig/kgamma/kcmkgamma/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/kgamma/kcmkgamma/Makefile.in 2005-05-25 08:29:49.919576952 +0200
+@@ -259,6 +259,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13582,16 +8620,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -399,7 +402,7 @@
- all: docs-am all-recursive
+@@ -457,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*) \
-@@ -437,9 +440,9 @@
+@@ -495,9 +498,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13601,95 +8639,12 @@
-$(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:
-@@ -459,7 +462,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -471,7 +480,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -479,7 +488,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -500,7 +515,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kgamma/kcmkgamma/Makefile.in kdegraphics-3.4.0/kgamma/kcmkgamma/Makefile.in
---- kdegraphics-3.4.0.orig/kgamma/kcmkgamma/Makefile.in 2005-03-04 13:27:32.000000000 +0100
-+++ kdegraphics-3.4.0/kgamma/kcmkgamma/Makefile.in 2005-03-05 02:51:44.497948791 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -79,18 +79,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_kgamma_la_SOURCES)
- DIST_SOURCES = $(kcm_kgamma_la_SOURCES)
-@@ -259,6 +259,9 @@
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+diff -rua kdegraphics-3.4.1.orig/kgamma/kcmkgamma/pics/Makefile.in kdegraphics-3.4.1/kgamma/kcmkgamma/pics/Makefile.in
+--- kdegraphics-3.4.1.orig/kgamma/kcmkgamma/pics/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/kgamma/kcmkgamma/pics/Makefile.in 2005-05-25 08:29:49.932575773 +0200
+@@ -206,6 +206,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13699,16 +8654,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -456,7 +459,7 @@
+@@ -397,7 +400,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*) \
-@@ -494,9 +497,9 @@
+@@ -435,9 +438,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13718,72 +8673,12 @@
-$(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)
-@@ -598,7 +601,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -610,7 +619,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -618,7 +627,13 @@
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -639,7 +654,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kgamma/kcmkgamma/pics/Makefile.in kdegraphics-3.4.0/kgamma/kcmkgamma/pics/Makefile.in
---- kdegraphics-3.4.0.orig/kgamma/kcmkgamma/pics/Makefile.in 2005-03-04 13:27:32.000000000 +0100
-+++ kdegraphics-3.4.0/kgamma/kcmkgamma/pics/Makefile.in 2005-03-05 02:51:44.506947248 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -206,6 +206,9 @@
+ mostlyclean-libtool:
+diff -rua kdegraphics-3.4.1.orig/kgamma/Makefile.in kdegraphics-3.4.1/kgamma/Makefile.in
+--- kdegraphics-3.4.1.orig/kgamma/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/kgamma/Makefile.in 2005-05-25 08:29:49.900578674 +0200
+@@ -213,6 +213,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13793,8 +8688,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
- all: docs-am all-am
+@@ -400,7 +403,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -13802,7 +8697,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -438,9 +441,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13814,64 +8709,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -606,16 +609,16 @@
-
- #>+ 13
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/hi16-app-kgamma.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kgamma.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
- $(INSTALL_DATA) $(srcdir)/hi32-app-kgamma.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kgamma.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/hi16-app-kgamma.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kgamma.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
- $(INSTALL_DATA) $(srcdir)/hi48-app-kgamma.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kgamma.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kgamma.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kgamma.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kgamma.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kgamma.png
-
- #>+ 15
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kgamma/xf86gammacfg/Makefile.in kdegraphics-3.4.0/kgamma/xf86gammacfg/Makefile.in
---- kdegraphics-3.4.0.orig/kgamma/xf86gammacfg/Makefile.in 2005-03-04 13:27:32.000000000 +0100
-+++ kdegraphics-3.4.0/kgamma/xf86gammacfg/Makefile.in 2005-03-05 02:51:44.516945534 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -69,18 +69,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(xf86gammacfg_SOURCES)
- DIST_SOURCES = $(xf86gammacfg_SOURCES)
+diff -rua kdegraphics-3.4.1.orig/kgamma/xf86gammacfg/Makefile.in kdegraphics-3.4.1/kgamma/xf86gammacfg/Makefile.in
+--- kdegraphics-3.4.1.orig/kgamma/xf86gammacfg/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/kgamma/xf86gammacfg/Makefile.in 2005-05-25 08:29:49.947574413 +0200
@@ -234,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -13882,7 +8722,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -426,7 +429,7 @@
+@@ -427,7 +430,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13891,7 +8731,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -464,9 +467,9 @@
+@@ -465,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13903,58 +8743,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kghostview/Makefile.in kdegraphics-3.4.0/kghostview/Makefile.in
---- kdegraphics-3.4.0.orig/kghostview/Makefile.in 2005-03-04 13:27:32.000000000 +0100
-+++ kdegraphics-3.4.0/kghostview/Makefile.in 2005-03-05 02:51:44.672918789 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -117,29 +117,29 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libdscparse_la_SOURCES) $(libkghostviewlib_la_SOURCES) \
- $(libkghostviewpart_la_SOURCES) $(kghostview_SOURCES)
-@@ -315,6 +315,9 @@
+diff -rua kdegraphics-3.4.1.orig/kghostview/data/Makefile.in kdegraphics-3.4.1/kghostview/data/Makefile.in
+--- kdegraphics-3.4.1.orig/kghostview/data/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/kghostview/data/Makefile.in 2005-05-25 08:29:50.038566161 +0200
+@@ -206,6 +206,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13964,16 +8756,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -394,7 +397,7 @@
+ all: docs-am all-am
.SUFFIXES:
- .SUFFIXES: .c .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*) \
-@@ -593,9 +596,9 @@
+@@ -432,9 +435,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13983,102 +8775,12 @@
-$(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)
-@@ -880,7 +883,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -892,7 +901,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -900,7 +909,13 @@
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -921,7 +936,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1332,23 +1347,23 @@
-
- #>+ 19
- install-kde-icons:
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kghostview.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kghostview.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
- $(INSTALL_DATA) $(srcdir)/cr128-app-kghostview.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kghostview.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-kghostview.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kghostview.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kghostview.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kghostview.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kghostview.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kghostview.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- $(INSTALL_DATA) $(srcdir)/cr64-app-kghostview.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kghostview.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kghostview.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kghostview.png
-
- uninstall-kde-icons:
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kghostview.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kghostview.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kghostview.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kghostview.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kghostview.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kghostview.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kghostview.png
-
- #>+ 15
- force-reedit:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kghostview/data/Makefile.in kdegraphics-3.4.0/kghostview/data/Makefile.in
---- kdegraphics-3.4.0.orig/kghostview/data/Makefile.in 2005-03-04 13:27:32.000000000 +0100
-+++ kdegraphics-3.4.0/kghostview/data/Makefile.in 2005-03-05 02:51:44.679917589 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -206,6 +206,9 @@
+ mostlyclean-libtool:
+diff -rua kdegraphics-3.4.1.orig/kghostview/Makefile.in kdegraphics-3.4.1/kghostview/Makefile.in
+--- kdegraphics-3.4.1.orig/kghostview/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/kghostview/Makefile.in 2005-05-25 08:29:50.027567159 +0200
+@@ -315,6 +315,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14088,16 +8790,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
- all: docs-am all-am
+@@ -556,7 +559,7 @@
.SUFFIXES:
+ .SUFFIXES: .c .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*) \
-@@ -431,9 +434,9 @@
+@@ -594,9 +597,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14107,46 +8809,11 @@
-$(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 -u -Nru -x debian kdegraphics-3.4.0.orig/kiconedit/Makefile.in kdegraphics-3.4.0/kiconedit/Makefile.in
---- kdegraphics-3.4.0.orig/kiconedit/Makefile.in 2005-03-04 13:27:32.000000000 +0100
-+++ kdegraphics-3.4.0/kiconedit/Makefile.in 2005-03-05 02:51:44.769902159 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -81,18 +81,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kiconedit_SOURCES)
- DIST_SOURCES = $(kiconedit_SOURCES)
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+diff -rua kdegraphics-3.4.1.orig/kiconedit/Makefile.in kdegraphics-3.4.1/kiconedit/Makefile.in
+--- kdegraphics-3.4.1.orig/kiconedit/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/kiconedit/Makefile.in 2005-05-25 08:29:50.196551835 +0200
@@ -268,6 +268,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -14157,7 +8824,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -470,7 +473,7 @@
+@@ -471,7 +474,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14166,7 +8833,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -508,9 +511,9 @@
+@@ -509,9 +512,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14178,109 +8845,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -636,7 +639,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -648,7 +657,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -656,7 +665,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -677,7 +692,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -955,22 +970,22 @@
- mocs: kiconcolors.moc
-
- #>+ 3
--kresize.moc: $(srcdir)/kresize.h
-- $(MOC) $(srcdir)/kresize.h -o kresize.moc
-+palettetoolbar.moc: $(srcdir)/palettetoolbar.h
-+ $(MOC) $(srcdir)/palettetoolbar.h -o palettetoolbar.moc
-
- #>+ 2
--mocs: kresize.moc
-+mocs: palettetoolbar.moc
-
- #>+ 3
--palettetoolbar.moc: $(srcdir)/palettetoolbar.h
-- $(MOC) $(srcdir)/palettetoolbar.h -o palettetoolbar.moc
-+kresize.moc: $(srcdir)/kresize.h
-+ $(MOC) $(srcdir)/kresize.h -o kresize.moc
-
- #>+ 2
--mocs: palettetoolbar.moc
-+mocs: kresize.moc
-
- #>+ 3
- clean-metasources:
-- -rm -f knew.moc kicongrid.moc kiconedit.moc kicon.moc kcolorgrid.moc kiconconfig.moc kiconcolors.moc kresize.moc palettetoolbar.moc
-+ -rm -f knew.moc kicongrid.moc kiconedit.moc kicon.moc kcolorgrid.moc kiconconfig.moc kiconcolors.moc palettetoolbar.moc kresize.moc
-
- #>+ 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
-@@ -1017,7 +1032,7 @@
-
-
- #>+ 11
--kiconedit.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/utils.cpp $(srcdir)/main.cpp $(srcdir)/kiconedit.cpp $(srcdir)/kicongrid.cpp $(srcdir)/kiconcolors.cpp $(srcdir)/kcolorgrid.cpp $(srcdir)/palettetoolbar.cpp $(srcdir)/kicon.cpp $(srcdir)/kresize.cpp $(srcdir)/knew.cpp $(srcdir)/properties.cpp $(srcdir)/kiconeditslots.cpp $(srcdir)/kiconconfig.cpp knew.moc kicon.moc kiconedit.moc kicongrid.moc kcolorgrid.moc kiconconfig.moc kiconcolors.moc kresize.moc palettetoolbar.moc
-+kiconedit.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/utils.cpp $(srcdir)/main.cpp $(srcdir)/kiconedit.cpp $(srcdir)/kicongrid.cpp $(srcdir)/kiconcolors.cpp $(srcdir)/kcolorgrid.cpp $(srcdir)/palettetoolbar.cpp $(srcdir)/kicon.cpp $(srcdir)/kresize.cpp $(srcdir)/knew.cpp $(srcdir)/properties.cpp $(srcdir)/kiconeditslots.cpp $(srcdir)/kiconconfig.cpp knew.moc kicon.moc kiconedit.moc kicongrid.moc kcolorgrid.moc kiconconfig.moc kiconcolors.moc palettetoolbar.moc kresize.moc
- @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; \
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kiconedit/pics/Makefile.in kdegraphics-3.4.0/kiconedit/pics/Makefile.in
---- kdegraphics-3.4.0.orig/kiconedit/pics/Makefile.in 2005-03-04 13:27:32.000000000 +0100
-+++ kdegraphics-3.4.0/kiconedit/pics/Makefile.in 2005-03-05 02:51:44.791898388 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -212,6 +212,9 @@
+diff -rua kdegraphics-3.4.1.orig/kiconedit/pics/icons/Makefile.in kdegraphics-3.4.1/kiconedit/pics/icons/Makefile.in
+--- kdegraphics-3.4.1.orig/kiconedit/pics/icons/Makefile.in 2005-05-23 18:01:23.000000000 +0200
++++ kdegraphics-3.4.1/kiconedit/pics/icons/Makefile.in 2005-05-25 08:29:50.220549658 +0200
+@@ -206,6 +206,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14290,8 +8858,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -399,7 +402,7 @@
- all: docs-am all-recursive
+@@ -397,7 +400,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -14299,7 +8867,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -437,9 +440,9 @@
+@@ -435,9 +438,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14311,89 +8879,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -459,7 +462,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -471,7 +480,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -479,7 +488,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -500,7 +515,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -727,15 +742,15 @@
- install-kde-icons:
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-kiconedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kiconedit.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kiconedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kiconedit.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-kiconedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kiconedit.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kiconedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kiconedit.png
-
- uninstall-kde-icons:
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kiconedit.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kiconedit.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kiconedit.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kiconedit.png
-
- #>+ 15
- force-reedit:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kiconedit/pics/icons/Makefile.in kdegraphics-3.4.0/kiconedit/pics/icons/Makefile.in
---- kdegraphics-3.4.0.orig/kiconedit/pics/icons/Makefile.in 2005-03-04 13:27:32.000000000 +0100
-+++ kdegraphics-3.4.0/kiconedit/pics/icons/Makefile.in 2005-03-05 02:51:44.797897359 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -206,6 +206,9 @@
+diff -rua kdegraphics-3.4.1.orig/kiconedit/pics/Makefile.in kdegraphics-3.4.1/kiconedit/pics/Makefile.in
+--- kdegraphics-3.4.1.orig/kiconedit/pics/Makefile.in 2005-05-23 18:01:23.000000000 +0200
++++ kdegraphics-3.4.1/kiconedit/pics/Makefile.in 2005-05-25 08:29:50.209550656 +0200
+@@ -212,6 +212,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14403,8 +8892,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
- all: docs-am all-am
+@@ -400,7 +403,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -14412,7 +8901,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -438,9 +441,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14424,21 +8913,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kiconedit/pics/toolbar/Makefile.in kdegraphics-3.4.0/kiconedit/pics/toolbar/Makefile.in
---- kdegraphics-3.4.0.orig/kiconedit/pics/toolbar/Makefile.in 2005-03-04 13:27:32.000000000 +0100
-+++ kdegraphics-3.4.0/kiconedit/pics/toolbar/Makefile.in 2005-03-05 02:51:44.805895988 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdegraphics-3.4.1.orig/kiconedit/pics/toolbar/Makefile.in kdegraphics-3.4.1/kiconedit/pics/toolbar/Makefile.in
+--- kdegraphics-3.4.1.orig/kiconedit/pics/toolbar/Makefile.in 2005-05-23 18:01:23.000000000 +0200
++++ kdegraphics-3.4.1/kiconedit/pics/toolbar/Makefile.in 2005-05-25 08:29:50.231548661 +0200
@@ -206,6 +206,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -14449,7 +8926,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -417,7 +420,7 @@
+@@ -418,7 +421,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -14458,7 +8935,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -455,9 +458,9 @@
+@@ -456,9 +459,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14470,31 +8947,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -616,7 +619,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:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kmrml/Makefile.in kdegraphics-3.4.0/kmrml/Makefile.in
---- kdegraphics-3.4.0.orig/kmrml/Makefile.in 2005-03-04 13:27:32.000000000 +0100
-+++ kdegraphics-3.4.0/kmrml/Makefile.in 2005-03-05 02:51:44.813894616 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -213,6 +213,9 @@
+diff -rua kdegraphics-3.4.1.orig/kmrml/kmrml/kcontrol/Makefile.in kdegraphics-3.4.1/kmrml/kmrml/kcontrol/Makefile.in
+--- kdegraphics-3.4.1.orig/kmrml/kmrml/kcontrol/Makefile.in 2005-05-23 18:01:23.000000000 +0200
++++ kdegraphics-3.4.1/kmrml/kmrml/kcontrol/Makefile.in 2005-05-25 08:29:50.316540954 +0200
+@@ -251,6 +251,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14504,16 +8960,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -399,7 +402,7 @@
- all: docs-am all-recursive
+@@ -451,7 +454,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*) \
-@@ -437,9 +440,9 @@
+@@ -489,9 +492,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14523,95 +8979,12 @@
-$(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:
-@@ -459,7 +462,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -471,7 +480,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -479,7 +488,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -500,7 +515,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kmrml/kmrml/Makefile.in kdegraphics-3.4.0/kmrml/kmrml/Makefile.in
---- kdegraphics-3.4.0.orig/kmrml/kmrml/Makefile.in 2005-03-04 13:27:32.000000000 +0100
-+++ kdegraphics-3.4.0/kmrml/kmrml/Makefile.in 2005-03-05 02:51:44.870884844 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -113,18 +113,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+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)
-@@ -300,6 +300,9 @@
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+diff -rua kdegraphics-3.4.1.orig/kmrml/kmrml/lib/Makefile.in kdegraphics-3.4.1/kmrml/kmrml/lib/Makefile.in
+--- kdegraphics-3.4.1.orig/kmrml/kmrml/lib/Makefile.in 2005-05-23 18:01:23.000000000 +0200
++++ kdegraphics-3.4.1/kmrml/kmrml/lib/Makefile.in 2005-05-25 08:29:50.333539412 +0200
+@@ -237,6 +237,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14621,7 +8994,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -517,7 +520,7 @@
+@@ -435,7 +438,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14630,7 +9003,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -555,9 +558,9 @@
+@@ -473,9 +476,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14640,142 +9013,12 @@
-$(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)
-@@ -789,7 +792,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -801,7 +810,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -809,7 +818,13 @@
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -830,7 +845,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1141,18 +1156,18 @@
- mocs: algorithmdialog.moc
-
- #>+ 3
--mrml_view.moc: $(srcdir)/mrml_view.h
-- $(MOC) $(srcdir)/mrml_view.h -o mrml_view.moc
-+algorithmcombo.moc: $(srcdir)/algorithmcombo.h
-+ $(MOC) $(srcdir)/algorithmcombo.h -o algorithmcombo.moc
-
- #>+ 2
--mocs: mrml_view.moc
-+mocs: algorithmcombo.moc
-
- #>+ 3
--algorithmcombo.moc: $(srcdir)/algorithmcombo.h
-- $(MOC) $(srcdir)/algorithmcombo.h -o algorithmcombo.moc
-+mrml_view.moc: $(srcdir)/mrml_view.h
-+ $(MOC) $(srcdir)/mrml_view.h -o mrml_view.moc
-
- #>+ 2
--mocs: algorithmcombo.moc
-+mocs: mrml_view.moc
-
- #>+ 3
- propertywidgets.moc: $(srcdir)/propertywidgets.h
-@@ -1181,10 +1196,10 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f mrml_part.moc collectioncombo.moc browser.moc loader.moc algorithmdialog.moc mrml_view.moc algorithmcombo.moc propertywidgets.moc
-+ -rm -f mrml_part.moc collectioncombo.moc browser.moc loader.moc algorithmdialog.moc algorithmcombo.moc mrml_view.moc propertywidgets.moc
-
- #>+ 2
--KDE_DIST=mrml_creator.h browser.h mrml.protocol mrml-servicemenu.desktop propertywidgets.h mrml_view.h mrml_part.desktop 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
-+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
-
- #>+ 3
- clean-closures:
-@@ -1232,7 +1247,7 @@
-
-
- #>+ 11
--libkmrmlpart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/mrml_part.cpp $(srcdir)/mrml_view.cpp $(srcdir)/loader.cpp $(srcdir)/mrml_elements.cpp $(srcdir)/mrml_creator.cpp $(srcdir)/browser.cpp $(srcdir)/algorithmdialog.cpp $(srcdir)/collectioncombo.cpp $(srcdir)/algorithmcombo.cpp $(srcdir)/propertysheet.cpp mrml_part.moc collectioncombo.moc browser.moc algorithmdialog.moc loader.moc algorithmcombo.moc mrml_view.moc
-+libkmrmlpart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/mrml_part.cpp $(srcdir)/mrml_view.cpp $(srcdir)/loader.cpp $(srcdir)/mrml_elements.cpp $(srcdir)/mrml_creator.cpp $(srcdir)/browser.cpp $(srcdir)/algorithmdialog.cpp $(srcdir)/collectioncombo.cpp $(srcdir)/algorithmcombo.cpp $(srcdir)/propertysheet.cpp mrml_part.moc collectioncombo.moc browser.moc algorithmdialog.moc loader.moc mrml_view.moc algorithmcombo.moc
- @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 -u -Nru -x debian kdegraphics-3.4.0.orig/kmrml/kmrml/kcontrol/Makefile.in kdegraphics-3.4.0/kmrml/kmrml/kcontrol/Makefile.in
---- kdegraphics-3.4.0.orig/kmrml/kmrml/kcontrol/Makefile.in 2005-03-04 13:27:32.000000000 +0100
-+++ kdegraphics-3.4.0/kmrml/kmrml/kcontrol/Makefile.in 2005-03-05 02:51:44.920876272 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -84,18 +84,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_kmrml_la_SOURCES)
- DIST_SOURCES = $(kcm_kmrml_la_SOURCES)
-@@ -251,6 +251,9 @@
+ clean-noinstLTLIBRARIES:
+diff -rua kdegraphics-3.4.1.orig/kmrml/kmrml/Makefile.in kdegraphics-3.4.1/kmrml/kmrml/Makefile.in
+--- kdegraphics-3.4.1.orig/kmrml/kmrml/Makefile.in 2005-05-23 18:01:23.000000000 +0200
++++ kdegraphics-3.4.1/kmrml/kmrml/Makefile.in 2005-05-25 08:29:50.291543221 +0200
+@@ -300,6 +300,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14785,7 +9028,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -450,7 +453,7 @@
+@@ -518,7 +521,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14794,7 +9037,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -488,9 +491,9 @@
+@@ -556,9 +559,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14806,45 +9049,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kmrml/kmrml/lib/Makefile.in kdegraphics-3.4.0/kmrml/kmrml/lib/Makefile.in
---- kdegraphics-3.4.0.orig/kmrml/kmrml/lib/Makefile.in 2005-03-04 13:27:32.000000000 +0100
-+++ kdegraphics-3.4.0/kmrml/kmrml/lib/Makefile.in 2005-03-05 02:51:44.938873186 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -72,18 +72,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkmrmlstuff_la_SOURCES)
- DIST_SOURCES = $(libkmrmlstuff_la_SOURCES)
-@@ -237,6 +237,9 @@
+diff -rua kdegraphics-3.4.1.orig/kmrml/kmrml/server/Makefile.in kdegraphics-3.4.1/kmrml/kmrml/server/Makefile.in
+--- kdegraphics-3.4.1.orig/kmrml/kmrml/server/Makefile.in 2005-05-23 18:01:23.000000000 +0200
++++ kdegraphics-3.4.1/kmrml/kmrml/server/Makefile.in 2005-05-25 08:29:50.351537780 +0200
+@@ -244,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14854,7 +9062,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -434,7 +437,7 @@
+@@ -442,7 +445,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14863,7 +9071,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -472,9 +475,9 @@
+@@ -480,9 +483,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14873,47 +9081,12 @@
-$(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 -u -Nru -x debian kdegraphics-3.4.0.orig/kmrml/kmrml/server/Makefile.in kdegraphics-3.4.0/kmrml/kmrml/server/Makefile.in
---- kdegraphics-3.4.0.orig/kmrml/kmrml/server/Makefile.in 2005-03-04 13:27:32.000000000 +0100
-+++ kdegraphics-3.4.0/kmrml/kmrml/server/Makefile.in 2005-03-05 02:51:44.961869243 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -78,18 +78,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kded_daemonwatcher_la_SOURCES)
- DIST_SOURCES = $(kded_daemonwatcher_la_SOURCES)
-@@ -244,6 +244,9 @@
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+diff -rua kdegraphics-3.4.1.orig/kmrml/Makefile.in kdegraphics-3.4.1/kmrml/Makefile.in
+--- kdegraphics-3.4.1.orig/kmrml/Makefile.in 2005-05-23 18:01:23.000000000 +0200
++++ kdegraphics-3.4.1/kmrml/Makefile.in 2005-05-25 08:29:50.243547573 +0200
+@@ -213,6 +213,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14923,16 +9096,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -441,7 +444,7 @@
+@@ -400,7 +403,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 @@
+@@ -438,9 +441,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14942,47 +9115,12 @@
-$(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 -u -Nru -x debian kdegraphics-3.4.0.orig/kolourpaint/Makefile.in kdegraphics-3.4.0/kolourpaint/Makefile.in
---- kdegraphics-3.4.0.orig/kolourpaint/Makefile.in 2005-03-04 13:27:32.000000000 +0100
-+++ kdegraphics-3.4.0/kolourpaint/Makefile.in 2005-03-05 02:51:45.153836326 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -106,18 +106,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kolourpaint_SOURCES)
- DIST_SOURCES = $(kolourpaint_SOURCES)
-@@ -293,6 +293,9 @@
+ mostlyclean-libtool:
+diff -rua kdegraphics-3.4.1.orig/kolourpaint/cursors/Makefile.in kdegraphics-3.4.1/kolourpaint/cursors/Makefile.in
+--- kdegraphics-3.4.1.orig/kolourpaint/cursors/Makefile.in 2005-05-23 18:01:23.000000000 +0200
++++ kdegraphics-3.4.1/kolourpaint/cursors/Makefile.in 2005-05-25 08:29:50.513523091 +0200
+@@ -234,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14992,7 +9130,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -520,7 +523,7 @@
+@@ -430,7 +433,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15001,7 +9139,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -558,9 +561,9 @@
+@@ -468,9 +471,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15011,145 +9149,12 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
- @$(NORMAL_INSTALL)
-@@ -701,7 +704,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -713,7 +722,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -721,7 +730,13 @@
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -742,7 +757,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1038,13 +1053,6 @@
- mocs: kpdocument.moc
-
- #>+ 3
--kpview.moc: $(srcdir)/kpview.h
-- $(MOC) $(srcdir)/kpview.h -o kpview.moc
--
--#>+ 2
--mocs: kpview.moc
--
--#>+ 3
- kpcommandhistory.moc: $(srcdir)/kpcommandhistory.h
- $(MOC) $(srcdir)/kpcommandhistory.h -o kpcommandhistory.moc
-
-@@ -1059,6 +1067,13 @@
- mocs: kpselection.moc
-
- #>+ 3
-+kpview.moc: $(srcdir)/kpview.h
-+ $(MOC) $(srcdir)/kpview.h -o kpview.moc
-+
-+#>+ 2
-+mocs: kpview.moc
-+
-+#>+ 3
- kpsinglekeytriggersaction.moc: $(srcdir)/kpsinglekeytriggersaction.h
- $(MOC) $(srcdir)/kpsinglekeytriggersaction.h -o kpsinglekeytriggersaction.moc
-
-@@ -1067,10 +1082,10 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f kpthumbnail.moc kpmainwindow.moc kpviewmanager.moc kpviewscrollablecontainer.moc kpdocumentsaveoptionswidget.moc kpselectiondrag.moc kpdocument.moc kpview.moc kpcommandhistory.moc kpselection.moc kpsinglekeytriggersaction.moc
-+ -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
--KDE_DIST=kpdefs.h kptextstyle.h kpcolor.h kpthumbnail.h kpviewscrollablecontainer.h kpselectiontransparency.h kpviewmanager.h kpdocumentsaveoptions.h kpdocumentmetainfo.h kpsinglekeytriggersaction.h kpmainwindow.h kolourpaint.desktop kpdocument.h kpselectiondrag.h kpview.h kpcommandhistory.h kpmainwindow_p.h kpwidgetmapper.h kptemppixmap.h Makefile.in BUGS kpselection.h kolourpaintui.rc kpdocumentsaveoptionswidget.h Makefile.am VERSION
-+KDE_DIST=kpdefs.h kptextstyle.h kpcolor.h kpthumbnail.h kpselectiontransparency.h kpviewscrollablecontainer.h kpviewmanager.h kpdocumentsaveoptions.h kpdocumentmetainfo.h kpsinglekeytriggersaction.h kpmainwindow.h kolourpaint.desktop kpdocument.h kpselectiondrag.h kpview.h kpcommandhistory.h kpmainwindow_p.h kptemppixmap.h kpwidgetmapper.h Makefile.in BUGS kpselection.h kolourpaintui.rc kpdocumentsaveoptionswidget.h Makefile.am VERSION
-
- #>+ 2
- docs-am:
-@@ -1114,7 +1129,7 @@
-
-
- #>+ 11
--kolourpaint.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kolourpaint.cpp kolourpaintlicense.h $(srcdir)/kpdocument.cpp $(srcdir)/kpdocumentmetainfo.cpp $(srcdir)/kpdocumentsaveoptions.cpp $(srcdir)/kpdocumentsaveoptionswidget.cpp $(srcdir)/kpview.cpp $(srcdir)/kpcolor.cpp $(srcdir)/kpcommandhistory.cpp $(srcdir)/kpmainwindow.cpp $(srcdir)/kpmainwindow_edit.cpp $(srcdir)/kpmainwindow_help.cpp $(srcdir)/kpmainwindow_image.cpp $(srcdir)/kpmainwindow_tools.cpp $(srcdir)/kpmainwindow_file.cpp $(srcdir)/kpmainwindow_settings.cpp $(srcdir)/kpmainwindow_statusbar.cpp $(srcdir)/kpmainwindow_text.cpp $(srcdir)/kpmainwindow_view.cpp $(srcdir)/kpselection.cpp $(srcdir)/kpselectiondrag.cpp $(srcdir)/kpselectiontransparency.cpp $(srcdir)/kpsinglekeytriggersaction.cpp $(srcdir)/kptemppixmap.cpp $(srcdir)/kptextstyle.cpp $(srcdir)/kpthumbnail.cpp $(srcdir)/kpviewmanager.cpp $(srcdir)/kpviewscrollablecontainer.cpp $(srcdir)/kpwidgetmapper.cpp kpmainwindow.moc kpthumbnail.moc kpviewmanager.moc kpviewscrollablecontainer.moc kpdocumentsaveoptionswidget.moc kpselectiondrag.moc kpdocument.moc kpselection.moc kpcommandhistory.moc kpview.moc kpsinglekeytriggersaction.moc
-+kolourpaint.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kolourpaint.cpp kolourpaintlicense.h $(srcdir)/kpdocument.cpp $(srcdir)/kpdocumentmetainfo.cpp $(srcdir)/kpdocumentsaveoptions.cpp $(srcdir)/kpdocumentsaveoptionswidget.cpp $(srcdir)/kpview.cpp $(srcdir)/kpcolor.cpp $(srcdir)/kpcommandhistory.cpp $(srcdir)/kpmainwindow.cpp $(srcdir)/kpmainwindow_edit.cpp $(srcdir)/kpmainwindow_help.cpp $(srcdir)/kpmainwindow_image.cpp $(srcdir)/kpmainwindow_tools.cpp $(srcdir)/kpmainwindow_file.cpp $(srcdir)/kpmainwindow_settings.cpp $(srcdir)/kpmainwindow_statusbar.cpp $(srcdir)/kpmainwindow_text.cpp $(srcdir)/kpmainwindow_view.cpp $(srcdir)/kpselection.cpp $(srcdir)/kpselectiondrag.cpp $(srcdir)/kpselectiontransparency.cpp $(srcdir)/kpsinglekeytriggersaction.cpp $(srcdir)/kptemppixmap.cpp $(srcdir)/kptextstyle.cpp $(srcdir)/kpthumbnail.cpp $(srcdir)/kpviewmanager.cpp $(srcdir)/kpviewscrollablecontainer.cpp $(srcdir)/kpwidgetmapper.cpp kpmainwindow.moc kpthumbnail.moc kpviewmanager.moc kpviewscrollablecontainer.moc kpdocumentsaveoptionswidget.moc kpselectiondrag.moc kpdocument.moc kpview.moc kpselection.moc kpcommandhistory.moc kpsinglekeytriggersaction.moc
- @echo 'creating kolourpaint.all_cpp.cpp ...'; \
- rm -f kolourpaint.all_cpp.files kolourpaint.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> kolourpaint.all_cpp.final; \
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kolourpaint/cursors/Makefile.in kdegraphics-3.4.0/kolourpaint/cursors/Makefile.in
---- kdegraphics-3.4.0.orig/kolourpaint/cursors/Makefile.in 2005-03-04 13:27:32.000000000 +0100
-+++ kdegraphics-3.4.0/kolourpaint/cursors/Makefile.in 2005-03-05 02:51:45.164834440 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -70,18 +70,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkolourpaintcursors_la_SOURCES)
- DIST_SOURCES = $(libkolourpaintcursors_la_SOURCES)
-@@ -234,6 +234,9 @@
+ clean-noinstLTLIBRARIES:
+diff -rua kdegraphics-3.4.1.orig/kolourpaint/Makefile.in kdegraphics-3.4.1/kolourpaint/Makefile.in
+--- kdegraphics-3.4.1.orig/kolourpaint/Makefile.in 2005-05-23 18:01:23.000000000 +0200
++++ kdegraphics-3.4.1/kolourpaint/Makefile.in 2005-05-25 08:29:50.498524451 +0200
+@@ -293,6 +293,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15159,7 +9164,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -429,7 +432,7 @@
+@@ -521,7 +524,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15168,7 +9173,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -467,9 +470,9 @@
+@@ -559,9 +562,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15178,24 +9183,12 @@
-$(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 -u -Nru -x debian kdegraphics-3.4.0.orig/kolourpaint/pics/Makefile.in kdegraphics-3.4.0/kolourpaint/pics/Makefile.in
---- kdegraphics-3.4.0.orig/kolourpaint/pics/Makefile.in 2005-03-04 13:27:32.000000000 +0100
-+++ kdegraphics-3.4.0/kolourpaint/pics/Makefile.in 2005-03-05 02:51:45.176832383 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -212,6 +212,9 @@
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+diff -rua kdegraphics-3.4.1.orig/kolourpaint/pics/custom/Makefile.in kdegraphics-3.4.1/kolourpaint/pics/custom/Makefile.in
+--- kdegraphics-3.4.1.orig/kolourpaint/pics/custom/Makefile.in 2005-05-23 18:01:23.000000000 +0200
++++ kdegraphics-3.4.1/kolourpaint/pics/custom/Makefile.in 2005-05-25 08:29:50.543520370 +0200
+@@ -206,6 +206,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15206,7 +9199,7 @@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
@@ -401,7 +404,7 @@
- all: docs-am all-recursive
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -15226,170 +9219,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -461,7 +464,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -473,7 +482,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -481,7 +490,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -502,7 +517,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -726,70 +741,70 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=hi48-app-kolourpaint.png hi32-app-kolourpaint.png hi16-action-tool_elliptical_selection.png hi16-action-tool_ellipse.png hi16-action-tool_spraycan.png hi16-action-tool_color_picker.png hi16-action-tool_color_washer.png hi16-action-tool_rect_selection.png hi16-action-tool_polyline.png hi16-action-tool_brush.png hi16-action-tool_eraser.png hi16-action-tool_text.png hi16-action-tool_flood_fill.png hi16-app-kolourpaint.png Makefile.in hi16-action-tool_polygon.png hi16-action-tool_line.png hi16-action-tool_free_form_selection.png hi16-action-tool_rounded_rectangle.png hi16-action-tool_curve.png hi16-action-tool_pen.png Makefile.am hi16-action-tool_rectangle.png
-+KDE_DIST=hi48-app-kolourpaint.png hi32-app-kolourpaint.png hi16-action-tool_ellipse.png hi16-action-tool_elliptical_selection.png hi16-action-tool_spraycan.png hi16-action-tool_color_picker.png hi16-action-tool_color_washer.png hi16-action-tool_rect_selection.png hi16-action-tool_polyline.png hi16-action-tool_brush.png hi16-action-tool_eraser.png hi16-action-tool_flood_fill.png hi16-action-tool_text.png hi16-app-kolourpaint.png Makefile.in hi16-action-tool_polygon.png hi16-action-tool_line.png hi16-action-tool_free_form_selection.png hi16-action-tool_curve.png hi16-action-tool_rounded_rectangle.png hi16-action-tool_pen.png Makefile.am hi16-action-tool_rectangle.png
-
- #>+ 2
- docs-am:
-
- #>+ 59
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/hi16-app-kolourpaint.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kolourpaint.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
- $(INSTALL_DATA) $(srcdir)/hi32-app-kolourpaint.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kolourpaint.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/hi16-app-kolourpaint.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kolourpaint.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
- $(INSTALL_DATA) $(srcdir)/hi48-app-kolourpaint.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kolourpaint.png
- $(mkinstalldirs) $(DESTDIR)$(actionicondir)/hicolor/16x16/actions
-- $(INSTALL_DATA) $(srcdir)/hi16-action-tool_brush.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_brush.png
-- $(INSTALL_DATA) $(srcdir)/hi16-action-tool_color_picker.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_color_picker.png
-- $(INSTALL_DATA) $(srcdir)/hi16-action-tool_color_washer.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_color_washer.png
-+ $(INSTALL_DATA) $(srcdir)/hi16-action-tool_text.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_text.png
-+ $(INSTALL_DATA) $(srcdir)/hi16-action-tool_rounded_rectangle.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_rounded_rectangle.png
-+ $(INSTALL_DATA) $(srcdir)/hi16-action-tool_polyline.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_polyline.png
- $(INSTALL_DATA) $(srcdir)/hi16-action-tool_curve.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_curve.png
-- $(INSTALL_DATA) $(srcdir)/hi16-action-tool_ellipse.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_ellipse.png
- $(INSTALL_DATA) $(srcdir)/hi16-action-tool_elliptical_selection.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_elliptical_selection.png
-+ $(INSTALL_DATA) $(srcdir)/hi16-action-tool_brush.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_brush.png
- $(INSTALL_DATA) $(srcdir)/hi16-action-tool_eraser.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_eraser.png
-- $(INSTALL_DATA) $(srcdir)/hi16-action-tool_flood_fill.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_flood_fill.png
- $(INSTALL_DATA) $(srcdir)/hi16-action-tool_free_form_selection.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_free_form_selection.png
-- $(INSTALL_DATA) $(srcdir)/hi16-action-tool_line.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_line.png
-- $(INSTALL_DATA) $(srcdir)/hi16-action-tool_pen.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_pen.png
-- $(INSTALL_DATA) $(srcdir)/hi16-action-tool_polygon.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_polygon.png
-- $(INSTALL_DATA) $(srcdir)/hi16-action-tool_polyline.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_polyline.png
- $(INSTALL_DATA) $(srcdir)/hi16-action-tool_rect_selection.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_rect_selection.png
- $(INSTALL_DATA) $(srcdir)/hi16-action-tool_rectangle.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_rectangle.png
-- $(INSTALL_DATA) $(srcdir)/hi16-action-tool_rounded_rectangle.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_rounded_rectangle.png
-+ $(INSTALL_DATA) $(srcdir)/hi16-action-tool_color_picker.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_color_picker.png
-+ $(INSTALL_DATA) $(srcdir)/hi16-action-tool_flood_fill.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_flood_fill.png
-+ $(INSTALL_DATA) $(srcdir)/hi16-action-tool_line.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_line.png
-+ $(mkinstalldirs) $(DESTDIR)$(actionicondir)/hicolor/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/hi32-app-kolourpaint.png $(DESTDIR)$(actionicondir)/hicolor/32x32/apps/kolourpaint.png
- $(INSTALL_DATA) $(srcdir)/hi16-action-tool_spraycan.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_spraycan.png
-- $(INSTALL_DATA) $(srcdir)/hi16-action-tool_text.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_text.png
-+ $(INSTALL_DATA) $(srcdir)/hi16-action-tool_pen.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_pen.png
- $(mkinstalldirs) $(DESTDIR)$(actionicondir)/hicolor/16x16/apps
- $(INSTALL_DATA) $(srcdir)/hi16-app-kolourpaint.png $(DESTDIR)$(actionicondir)/hicolor/16x16/apps/kolourpaint.png
-- $(mkinstalldirs) $(DESTDIR)$(actionicondir)/hicolor/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/hi32-app-kolourpaint.png $(DESTDIR)$(actionicondir)/hicolor/32x32/apps/kolourpaint.png
-+ $(INSTALL_DATA) $(srcdir)/hi16-action-tool_color_washer.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_color_washer.png
- $(mkinstalldirs) $(DESTDIR)$(actionicondir)/hicolor/48x48/apps
- $(INSTALL_DATA) $(srcdir)/hi48-app-kolourpaint.png $(DESTDIR)$(actionicondir)/hicolor/48x48/apps/kolourpaint.png
-+ $(INSTALL_DATA) $(srcdir)/hi16-action-tool_ellipse.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_ellipse.png
-+ $(INSTALL_DATA) $(srcdir)/hi16-action-tool_polygon.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_polygon.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kolourpaint.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kolourpaint.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kolourpaint.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kolourpaint.png
-- -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_brush.png
-- -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_color_picker.png
-- -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_color_washer.png
-+ -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_text.png
-+ -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_rounded_rectangle.png
-+ -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_polyline.png
- -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_curve.png
-- -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_ellipse.png
- -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_elliptical_selection.png
-+ -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_brush.png
- -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_eraser.png
-- -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_flood_fill.png
- -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_free_form_selection.png
-- -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_line.png
-- -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_pen.png
-- -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_polygon.png
-- -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_polyline.png
- -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_rect_selection.png
- -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_rectangle.png
-- -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_rounded_rectangle.png
-+ -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_color_picker.png
-+ -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_flood_fill.png
-+ -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_line.png
-+ -rm -f $(DESTDIR)$(actionicondir)/hicolor/32x32/apps/kolourpaint.png
- -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_spraycan.png
-- -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_text.png
-+ -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_pen.png
- -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/apps/kolourpaint.png
-- -rm -f $(DESTDIR)$(actionicondir)/hicolor/32x32/apps/kolourpaint.png
-+ -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_color_washer.png
- -rm -f $(DESTDIR)$(actionicondir)/hicolor/48x48/apps/kolourpaint.png
-+ -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_ellipse.png
-+ -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_polygon.png
-
- #>+ 15
- force-reedit:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kolourpaint/pics/custom/Makefile.in kdegraphics-3.4.0/kolourpaint/pics/custom/Makefile.in
---- kdegraphics-3.4.0.orig/kolourpaint/pics/custom/Makefile.in 2005-03-04 13:27:32.000000000 +0100
-+++ kdegraphics-3.4.0/kolourpaint/pics/custom/Makefile.in 2005-03-05 02:51:45.183831183 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -206,6 +206,9 @@
+diff -rua kdegraphics-3.4.1.orig/kolourpaint/pics/Makefile.in kdegraphics-3.4.1/kolourpaint/pics/Makefile.in
+--- kdegraphics-3.4.1.orig/kolourpaint/pics/Makefile.in 2005-05-23 18:01:23.000000000 +0200
++++ kdegraphics-3.4.1/kolourpaint/pics/Makefile.in 2005-05-25 08:29:50.532521368 +0200
+@@ -212,6 +212,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15399,8 +9232,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -400,7 +403,7 @@
- all: docs-am all-am
+@@ -402,7 +405,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -15408,7 +9241,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -438,9 +441,9 @@
+@@ -440,9 +443,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15420,44 +9253,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kolourpaint/pixmapfx/Makefile.in kdegraphics-3.4.0/kolourpaint/pixmapfx/Makefile.in
---- kdegraphics-3.4.0.orig/kolourpaint/pixmapfx/Makefile.in 2005-03-04 13:27:32.000000000 +0100
-+++ kdegraphics-3.4.0/kolourpaint/pixmapfx/Makefile.in 2005-03-05 02:51:45.226823811 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -74,18 +74,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkolourpaintpixmapfx_la_SOURCES)
- DIST_SOURCES = $(libkolourpaintpixmapfx_la_SOURCES)
+diff -rua kdegraphics-3.4.1.orig/kolourpaint/pixmapfx/Makefile.in kdegraphics-3.4.1/kolourpaint/pixmapfx/Makefile.in
+--- kdegraphics-3.4.1.orig/kolourpaint/pixmapfx/Makefile.in 2005-05-23 18:01:23.000000000 +0200
++++ kdegraphics-3.4.1/kolourpaint/pixmapfx/Makefile.in 2005-05-25 08:29:50.575517469 +0200
@@ -238,6 +238,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -15468,7 +9266,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -443,7 +446,7 @@
+@@ -444,7 +447,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15477,7 +9275,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -481,9 +484,9 @@
+@@ -482,9 +485,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15489,127 +9287,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -728,6 +731,20 @@
- mocs: kpeffectflatten.moc
-
- #>+ 3
-+kpeffectsdialog.moc: $(srcdir)/kpeffectsdialog.h
-+ $(MOC) $(srcdir)/kpeffectsdialog.h -o kpeffectsdialog.moc
-+
-+#>+ 2
-+mocs: kpeffectsdialog.moc
-+
-+#>+ 3
-+kpeffectbalance.moc: $(srcdir)/kpeffectbalance.h
-+ $(MOC) $(srcdir)/kpeffectbalance.h -o kpeffectbalance.moc
-+
-+#>+ 2
-+mocs: kpeffectbalance.moc
-+
-+#>+ 3
- kpeffectinvert.moc: $(srcdir)/kpeffectinvert.h
- $(MOC) $(srcdir)/kpeffectinvert.h -o kpeffectinvert.moc
-
-@@ -749,36 +766,22 @@
- mocs: kpeffectemboss.moc
-
- #>+ 3
--kpeffectreducecolors.moc: $(srcdir)/kpeffectreducecolors.h
-- $(MOC) $(srcdir)/kpeffectreducecolors.h -o kpeffectreducecolors.moc
--
--#>+ 2
--mocs: kpeffectreducecolors.moc
--
--#>+ 3
--kpeffectbalance.moc: $(srcdir)/kpeffectbalance.h
-- $(MOC) $(srcdir)/kpeffectbalance.h -o kpeffectbalance.moc
--
--#>+ 2
--mocs: kpeffectbalance.moc
--
--#>+ 3
--kpeffectsdialog.moc: $(srcdir)/kpeffectsdialog.h
-- $(MOC) $(srcdir)/kpeffectsdialog.h -o kpeffectsdialog.moc
-+kpcoloreffect.moc: $(srcdir)/kpcoloreffect.h
-+ $(MOC) $(srcdir)/kpcoloreffect.h -o kpcoloreffect.moc
-
- #>+ 2
--mocs: kpeffectsdialog.moc
-+mocs: kpcoloreffect.moc
-
- #>+ 3
--kpcoloreffect.moc: $(srcdir)/kpcoloreffect.h
-- $(MOC) $(srcdir)/kpcoloreffect.h -o kpcoloreffect.moc
-+kpeffectreducecolors.moc: $(srcdir)/kpeffectreducecolors.h
-+ $(MOC) $(srcdir)/kpeffectreducecolors.h -o kpeffectreducecolors.moc
-
- #>+ 2
--mocs: kpcoloreffect.moc
-+mocs: kpeffectreducecolors.moc
-
- #>+ 3
- clean-metasources:
-- -rm -f kpeffectflatten.moc kpeffectinvert.moc kpeffectblursharpen.moc kpeffectemboss.moc kpeffectreducecolors.moc kpeffectbalance.moc kpeffectsdialog.moc kpcoloreffect.moc
-+ -rm -f kpeffectflatten.moc kpeffectsdialog.moc kpeffectbalance.moc kpeffectinvert.moc kpeffectblursharpen.moc kpeffectemboss.moc kpcoloreffect.moc kpeffectreducecolors.moc
-
- #>+ 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
-@@ -825,7 +828,7 @@
-
-
- #>+ 11
--libkolourpaintpixmapfx_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kpcoloreffect.cpp $(srcdir)/kpeffectbalance.cpp $(srcdir)/kpeffectblursharpen.cpp $(srcdir)/kpeffectemboss.cpp $(srcdir)/kpeffectflatten.cpp $(srcdir)/kpeffectinvert.cpp $(srcdir)/kpeffectreducecolors.cpp $(srcdir)/kpeffectsdialog.cpp $(srcdir)/kpfloodfill.cpp $(srcdir)/kppixmapfx.cpp kpeffectflatten.moc kpeffectinvert.moc kpeffectblursharpen.moc kpeffectemboss.moc kpeffectreducecolors.moc kpeffectbalance.moc kpeffectsdialog.moc kpcoloreffect.moc
-+libkolourpaintpixmapfx_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kpcoloreffect.cpp $(srcdir)/kpeffectbalance.cpp $(srcdir)/kpeffectblursharpen.cpp $(srcdir)/kpeffectemboss.cpp $(srcdir)/kpeffectflatten.cpp $(srcdir)/kpeffectinvert.cpp $(srcdir)/kpeffectreducecolors.cpp $(srcdir)/kpeffectsdialog.cpp $(srcdir)/kpfloodfill.cpp $(srcdir)/kppixmapfx.cpp kpeffectflatten.moc kpeffectinvert.moc kpeffectbalance.moc kpeffectsdialog.moc kpeffectblursharpen.moc kpcoloreffect.moc kpeffectemboss.moc kpeffectreducecolors.moc
- @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; \
-@@ -879,7 +882,7 @@
- kpeffectreducecolors.o: kpeffectreducecolors.moc
- kpeffectflatten.lo: kpeffectflatten.moc
- kpeffectinvert.o: kpeffectinvert.moc
--kpeffectemboss.o: kpeffectemboss.moc
- kpeffectblursharpen.lo: kpeffectblursharpen.moc
-+kpeffectemboss.o: kpeffectemboss.moc
- kpcoloreffect.o: kpcoloreffect.moc
- kpeffectsdialog.lo: kpeffectsdialog.moc
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kolourpaint/tools/Makefile.in kdegraphics-3.4.0/kolourpaint/tools/Makefile.in
---- kdegraphics-3.4.0.orig/kolourpaint/tools/Makefile.in 2005-03-04 13:27:33.000000000 +0100
-+++ kdegraphics-3.4.0/kolourpaint/tools/Makefile.in 2005-03-05 02:51:45.703742034 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -89,18 +89,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkolourpainttools_la_SOURCES)
- DIST_SOURCES = $(libkolourpainttools_la_SOURCES)
+diff -rua kdegraphics-3.4.1.orig/kolourpaint/tools/Makefile.in kdegraphics-3.4.1/kolourpaint/tools/Makefile.in
+--- kdegraphics-3.4.1.orig/kolourpaint/tools/Makefile.in 2005-05-23 18:01:23.000000000 +0200
++++ kdegraphics-3.4.1/kolourpaint/tools/Makefile.in 2005-05-25 08:29:50.752501419 +0200
@@ -253,6 +253,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -15620,7 +9300,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -494,7 +497,7 @@
+@@ -495,7 +498,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15629,7 +9309,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -532,9 +535,9 @@
+@@ -533,9 +536,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15641,53 +9321,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -957,7 +960,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
--KDE_DIST=kptoolresizescale.h kptoolrotate.h kptoolpolyline.h kptoolcrop.h kptoolellipse.h kptoolairspray.h kptoolfloodfill.h kptoolellipticalselection.h kptooleraser.h kptoolrectangle.h kptoolflip.h kptoolselection.h kptoolpolygon.h kptoolcurve.h kptoolautocrop.h kptooltext.h kptool.h kptoolconverttograyscale.h kptoolfreeformselection.h kptoolskew.h kptoolrectselection.h kptoolclear.h kptoolroundedrectangle.h Makefile.in kptoolaction.h kptoolcolorwasher.h kptoolbrush.h kptoolline.h kptoolpreviewdialog.h kptoolcolorpicker.h Makefile.am kptoolpen.h
-+KDE_DIST=kptoolresizescale.h kptoolrotate.h kptoolpolyline.h kptoolcrop.h kptoolellipse.h kptoolairspray.h kptoolfloodfill.h kptoolellipticalselection.h kptooleraser.h kptoolflip.h kptoolrectangle.h kptoolselection.h kptoolpolygon.h kptoolcurve.h kptoolautocrop.h kptooltext.h kptool.h kptoolconverttograyscale.h kptoolfreeformselection.h kptoolskew.h kptoolrectselection.h kptoolclear.h kptoolroundedrectangle.h Makefile.in kptoolaction.h kptoolcolorwasher.h kptoolbrush.h kptoolline.h kptoolpreviewdialog.h kptoolcolorpicker.h Makefile.am kptoolpen.h
-
- #>+ 2
- docs-am:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kolourpaint/views/Makefile.in kdegraphics-3.4.0/kolourpaint/views/Makefile.in
---- kdegraphics-3.4.0.orig/kolourpaint/views/Makefile.in 2005-03-04 13:27:33.000000000 +0100
-+++ kdegraphics-3.4.0/kolourpaint/views/Makefile.in 2005-03-05 02:51:45.807724204 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -71,18 +71,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkolourpaintviews_la_SOURCES)
- DIST_SOURCES = $(libkolourpaintviews_la_SOURCES)
+diff -rua kdegraphics-3.4.1.orig/kolourpaint/views/Makefile.in kdegraphics-3.4.1/kolourpaint/views/Makefile.in
+--- kdegraphics-3.4.1.orig/kolourpaint/views/Makefile.in 2005-05-23 18:01:23.000000000 +0200
++++ kdegraphics-3.4.1/kolourpaint/views/Makefile.in 2005-05-25 08:29:50.772499606 +0200
@@ -235,6 +235,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -15698,7 +9334,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -434,7 +437,7 @@
+@@ -435,7 +438,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15707,7 +9343,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -472,9 +475,9 @@
+@@ -473,9 +476,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15719,102 +9355,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -706,11 +709,11 @@
- .NOEXPORT:
-
- #>+ 3
--kpzoomedthumbnailview.moc: $(srcdir)/kpzoomedthumbnailview.h
-- $(MOC) $(srcdir)/kpzoomedthumbnailview.h -o kpzoomedthumbnailview.moc
-+kpthumbnailview.moc: $(srcdir)/kpthumbnailview.h
-+ $(MOC) $(srcdir)/kpthumbnailview.h -o kpthumbnailview.moc
-
- #>+ 2
--mocs: kpzoomedthumbnailview.moc
-+mocs: kpthumbnailview.moc
-
- #>+ 3
- kpunzoomedthumbnailview.moc: $(srcdir)/kpunzoomedthumbnailview.h
-@@ -720,11 +723,11 @@
- mocs: kpunzoomedthumbnailview.moc
-
- #>+ 3
--kpthumbnailview.moc: $(srcdir)/kpthumbnailview.h
-- $(MOC) $(srcdir)/kpthumbnailview.h -o kpthumbnailview.moc
-+kpzoomedthumbnailview.moc: $(srcdir)/kpzoomedthumbnailview.h
-+ $(MOC) $(srcdir)/kpzoomedthumbnailview.h -o kpzoomedthumbnailview.moc
-
- #>+ 2
--mocs: kpthumbnailview.moc
-+mocs: kpzoomedthumbnailview.moc
-
- #>+ 3
- kpzoomedview.moc: $(srcdir)/kpzoomedview.h
-@@ -735,7 +738,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f kpzoomedthumbnailview.moc kpunzoomedthumbnailview.moc kpthumbnailview.moc kpzoomedview.moc
-+ -rm -f kpthumbnailview.moc kpunzoomedthumbnailview.moc kpzoomedthumbnailview.moc kpzoomedview.moc
-
- #>+ 2
- KDE_DIST=kpunzoomedthumbnailview.h kpzoomedthumbnailview.h kpzoomedview.h Makefile.in Makefile.am kpthumbnailview.h
-@@ -782,7 +785,7 @@
-
-
- #>+ 11
--libkolourpaintviews_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kpthumbnailview.cpp $(srcdir)/kpunzoomedthumbnailview.cpp $(srcdir)/kpzoomedthumbnailview.cpp $(srcdir)/kpzoomedview.cpp kpthumbnailview.moc kpunzoomedthumbnailview.moc kpzoomedthumbnailview.moc kpzoomedview.moc
-+libkolourpaintviews_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kpthumbnailview.cpp $(srcdir)/kpunzoomedthumbnailview.cpp $(srcdir)/kpzoomedthumbnailview.cpp $(srcdir)/kpzoomedview.cpp kpzoomedthumbnailview.moc kpunzoomedthumbnailview.moc kpthumbnailview.moc kpzoomedview.moc
- @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; \
-@@ -823,8 +826,8 @@
-
- #>+ 11
- nmcheck:
--kpthumbnailview.o: kpthumbnailview.moc
- kpunzoomedthumbnailview.o: kpunzoomedthumbnailview.moc
-+kpthumbnailview.o: kpthumbnailview.moc
- kpunzoomedthumbnailview.lo: kpunzoomedthumbnailview.moc
- kpzoomedview.o: kpzoomedview.moc
- nmcheck-am: nmcheck
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kolourpaint/widgets/Makefile.in kdegraphics-3.4.0/kolourpaint/widgets/Makefile.in
---- kdegraphics-3.4.0.orig/kolourpaint/widgets/Makefile.in 2005-03-04 13:27:33.000000000 +0100
-+++ kdegraphics-3.4.0/kolourpaint/widgets/Makefile.in 2005-03-05 02:51:46.018688030 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -80,18 +80,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkolourpaintwidgets_la_SOURCES)
- DIST_SOURCES = $(libkolourpaintwidgets_la_SOURCES)
+diff -rua kdegraphics-3.4.1.orig/kolourpaint/widgets/Makefile.in kdegraphics-3.4.1/kolourpaint/widgets/Makefile.in
+--- kdegraphics-3.4.1.orig/kolourpaint/widgets/Makefile.in 2005-05-23 18:01:23.000000000 +0200
++++ kdegraphics-3.4.1/kolourpaint/widgets/Makefile.in 2005-05-25 08:29:50.810496160 +0200
@@ -244,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -15825,7 +9368,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -450,7 +453,7 @@
+@@ -451,7 +454,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15834,7 +9377,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -488,9 +491,9 @@
+@@ -489,9 +492,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15846,122 +9389,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -738,18 +741,18 @@
- mocs: kptoolwidgetbrush.moc
-
- #>+ 3
--kptooltoolbar.moc: $(srcdir)/kptooltoolbar.h
-- $(MOC) $(srcdir)/kptooltoolbar.h -o kptooltoolbar.moc
-+kpcolortoolbar.moc: $(srcdir)/kpcolortoolbar.h
-+ $(MOC) $(srcdir)/kpcolortoolbar.h -o kpcolortoolbar.moc
-
- #>+ 2
--mocs: kptooltoolbar.moc
-+mocs: kpcolortoolbar.moc
-
- #>+ 3
--kpcolortoolbar.moc: $(srcdir)/kpcolortoolbar.h
-- $(MOC) $(srcdir)/kpcolortoolbar.h -o kpcolortoolbar.moc
-+kptooltoolbar.moc: $(srcdir)/kptooltoolbar.h
-+ $(MOC) $(srcdir)/kptooltoolbar.h -o kptooltoolbar.moc
-
- #>+ 2
--mocs: kpcolortoolbar.moc
-+mocs: kptooltoolbar.moc
-
- #>+ 3
- kptoolwidgetopaqueortransparent.moc: $(srcdir)/kptoolwidgetopaqueortransparent.h
-@@ -773,18 +776,18 @@
- mocs: kpresizesignallinglabel.moc
-
- #>+ 3
--kptoolwidgetlinewidth.moc: $(srcdir)/kptoolwidgetlinewidth.h
-- $(MOC) $(srcdir)/kptoolwidgetlinewidth.h -o kptoolwidgetlinewidth.moc
-+kpcolorsimilaritydialog.moc: $(srcdir)/kpcolorsimilaritydialog.h
-+ $(MOC) $(srcdir)/kpcolorsimilaritydialog.h -o kpcolorsimilaritydialog.moc
-
- #>+ 2
--mocs: kptoolwidgetlinewidth.moc
-+mocs: kpcolorsimilaritydialog.moc
-
- #>+ 3
--kpcolorsimilaritydialog.moc: $(srcdir)/kpcolorsimilaritydialog.h
-- $(MOC) $(srcdir)/kpcolorsimilaritydialog.h -o kpcolorsimilaritydialog.moc
-+kptoolwidgetlinewidth.moc: $(srcdir)/kptoolwidgetlinewidth.h
-+ $(MOC) $(srcdir)/kptoolwidgetlinewidth.h -o kptoolwidgetlinewidth.moc
-
- #>+ 2
--mocs: kpcolorsimilaritydialog.moc
-+mocs: kptoolwidgetlinewidth.moc
-
- #>+ 3
- kptoolwidgetfillstyle.moc: $(srcdir)/kptoolwidgetfillstyle.h
-@@ -816,7 +819,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f kptoolwidgetbrush.moc kptooltoolbar.moc kpcolortoolbar.moc kptoolwidgetopaqueortransparent.moc kptoolwidgetspraycansize.moc kpresizesignallinglabel.moc kptoolwidgetlinewidth.moc kpcolorsimilaritydialog.moc kptoolwidgetfillstyle.moc kptoolwidgeterasersize.moc kptoolwidgetbase.moc kpsqueezedtextlabel.moc
-+ -rm -f kptoolwidgetbrush.moc kpcolortoolbar.moc kptooltoolbar.moc kptoolwidgetopaqueortransparent.moc kptoolwidgetspraycansize.moc kpresizesignallinglabel.moc kpcolorsimilaritydialog.moc kptoolwidgetlinewidth.moc kptoolwidgetfillstyle.moc kptoolwidgeterasersize.moc kptoolwidgetbase.moc kpsqueezedtextlabel.moc
-
- #>+ 2
- KDE_DIST=kpcolorsimilaritycube.h kptoolwidgetbase.h kptoolwidgetfillstyle.h kptooltoolbar.h kptoolwidgeterasersize.h kptoolwidgetspraycansize.h kptoolwidgetopaqueortransparent.h kpresizesignallinglabel.h kpcolortoolbar.h Makefile.in kptoolwidgetlinewidth.h kpsqueezedtextlabel.h kpcolorsimilaritydialog.h kptoolwidgetbrush.h Makefile.am
-@@ -863,7 +866,7 @@
-
-
- #>+ 11
--libkolourpaintwidgets_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kpcolorsimilaritycube.cpp $(srcdir)/kpcolorsimilaritydialog.cpp $(srcdir)/kpcolortoolbar.cpp $(srcdir)/kpresizesignallinglabel.cpp $(srcdir)/kpsqueezedtextlabel.cpp $(srcdir)/kptooltoolbar.cpp $(srcdir)/kptoolwidgetbase.cpp $(srcdir)/kptoolwidgetbrush.cpp $(srcdir)/kptoolwidgeterasersize.cpp $(srcdir)/kptoolwidgetfillstyle.cpp $(srcdir)/kptoolwidgetlinewidth.cpp $(srcdir)/kptoolwidgetopaqueortransparent.cpp $(srcdir)/kptoolwidgetspraycansize.cpp kptoolwidgetbrush.moc kpcolortoolbar.moc kptooltoolbar.moc kptoolwidgetopaqueortransparent.moc kptoolwidgetspraycansize.moc kpresizesignallinglabel.moc kpcolorsimilaritydialog.moc kptoolwidgetlinewidth.moc kptoolwidgetfillstyle.moc kptoolwidgeterasersize.moc kptoolwidgetbase.moc kpsqueezedtextlabel.moc
-+libkolourpaintwidgets_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kpcolorsimilaritycube.cpp $(srcdir)/kpcolorsimilaritydialog.cpp $(srcdir)/kpcolortoolbar.cpp $(srcdir)/kpresizesignallinglabel.cpp $(srcdir)/kpsqueezedtextlabel.cpp $(srcdir)/kptooltoolbar.cpp $(srcdir)/kptoolwidgetbase.cpp $(srcdir)/kptoolwidgetbrush.cpp $(srcdir)/kptoolwidgeterasersize.cpp $(srcdir)/kptoolwidgetfillstyle.cpp $(srcdir)/kptoolwidgetlinewidth.cpp $(srcdir)/kptoolwidgetopaqueortransparent.cpp $(srcdir)/kptoolwidgetspraycansize.cpp kptoolwidgetbrush.moc kptooltoolbar.moc kpcolortoolbar.moc kptoolwidgetopaqueortransparent.moc kptoolwidgetspraycansize.moc kpresizesignallinglabel.moc kptoolwidgetlinewidth.moc kpcolorsimilaritydialog.moc kptoolwidgetfillstyle.moc kptoolwidgeterasersize.moc kptoolwidgetbase.moc kpsqueezedtextlabel.moc
- @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; \
-@@ -912,8 +915,8 @@
- kpresizesignallinglabel.o: kpresizesignallinglabel.moc
- kptoolwidgetfillstyle.o: kptoolwidgetfillstyle.moc
- kpcolorsimilaritydialog.o: kpcolorsimilaritydialog.moc
--kpcolorsimilaritydialog.lo: kpcolorsimilaritydialog.moc
- kptoolwidgetlinewidth.lo: kptoolwidgetlinewidth.moc
-+kpcolorsimilaritydialog.lo: kpcolorsimilaritydialog.moc
- nmcheck:
- kpcolortoolbar.o: kpcolortoolbar.moc
- kptoolwidgeterasersize.lo: kptoolwidgeterasersize.moc
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kooka/Makefile.in kdegraphics-3.4.0/kooka/Makefile.in
---- kdegraphics-3.4.0.orig/kooka/Makefile.in 2005-03-04 13:27:33.000000000 +0100
-+++ kdegraphics-3.4.0/kooka/Makefile.in 2005-03-05 02:51:46.699571279 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -95,18 +95,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kooka_SOURCES)
- DIST_SOURCES = $(kooka_SOURCES)
+diff -rua kdegraphics-3.4.1.orig/kooka/Makefile.in kdegraphics-3.4.1/kooka/Makefile.in
+--- kdegraphics-3.4.1.orig/kooka/Makefile.in 2005-05-23 18:01:23.000000000 +0200
++++ kdegraphics-3.4.1/kooka/Makefile.in 2005-05-25 08:29:50.910487093 +0200
@@ -284,6 +284,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -15972,7 +9402,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -503,7 +506,7 @@
+@@ -504,7 +507,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15981,7 +9411,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -541,9 +544,9 @@
+@@ -542,9 +545,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15993,259 +9423,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -696,7 +699,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -708,7 +717,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -716,7 +725,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -737,7 +752,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -967,81 +982,74 @@
- .NOEXPORT:
-
- #>+ 3
--img_saver.moc: $(srcdir)/img_saver.h
-- $(MOC) $(srcdir)/img_saver.h -o img_saver.moc
--
--#>+ 2
--mocs: img_saver.moc
--
--#>+ 3
--imgprintdialog.moc: $(srcdir)/imgprintdialog.h
-- $(MOC) $(srcdir)/imgprintdialog.h -o imgprintdialog.moc
-+ocrresedit.moc: $(srcdir)/ocrresedit.h
-+ $(MOC) $(srcdir)/ocrresedit.h -o ocrresedit.moc
-
- #>+ 2
--mocs: imgprintdialog.moc
-+mocs: ocrresedit.moc
-
- #>+ 3
--ksaneocr.moc: $(srcdir)/ksaneocr.h
-- $(MOC) $(srcdir)/ksaneocr.h -o ksaneocr.moc
-+imgnamecombo.moc: $(srcdir)/imgnamecombo.h
-+ $(MOC) $(srcdir)/imgnamecombo.h -o imgnamecombo.moc
-
- #>+ 2
--mocs: ksaneocr.moc
-+mocs: imgnamecombo.moc
-
- #>+ 3
--kocrkadmos.moc: $(srcdir)/kocrkadmos.h
-- $(MOC) $(srcdir)/kocrkadmos.h -o kocrkadmos.moc
-+kookapref.moc: $(srcdir)/kookapref.h
-+ $(MOC) $(srcdir)/kookapref.h -o kookapref.moc
-
- #>+ 2
--mocs: kocrkadmos.moc
-+mocs: kookapref.moc
-
- #>+ 3
--dwmenuaction.moc: $(srcdir)/dwmenuaction.h
-- $(MOC) $(srcdir)/dwmenuaction.h -o dwmenuaction.moc
-+img_saver.moc: $(srcdir)/img_saver.h
-+ $(MOC) $(srcdir)/img_saver.h -o img_saver.moc
-
- #>+ 2
--mocs: dwmenuaction.moc
-+mocs: img_saver.moc
-
- #>+ 3
--thumbview.moc: $(srcdir)/thumbview.h
-- $(MOC) $(srcdir)/thumbview.h -o thumbview.moc
-+imgprintdialog.moc: $(srcdir)/imgprintdialog.h
-+ $(MOC) $(srcdir)/imgprintdialog.h -o imgprintdialog.moc
-
- #>+ 2
--mocs: thumbview.moc
-+mocs: imgprintdialog.moc
-
- #>+ 3
--kocrocrad.moc: $(srcdir)/kocrocrad.h
-- $(MOC) $(srcdir)/kocrocrad.h -o kocrocrad.moc
-+kadmosocr.moc: $(srcdir)/kadmosocr.h
-+ $(MOC) $(srcdir)/kadmosocr.h -o kadmosocr.moc
-
- #>+ 2
--mocs: kocrocrad.moc
-+mocs: kadmosocr.moc
-
- #>+ 3
--ocrresedit.moc: $(srcdir)/ocrresedit.h
-- $(MOC) $(srcdir)/ocrresedit.h -o ocrresedit.moc
-+kocrkadmos.moc: $(srcdir)/kocrkadmos.h
-+ $(MOC) $(srcdir)/kocrkadmos.h -o kocrkadmos.moc
-
- #>+ 2
--mocs: ocrresedit.moc
-+mocs: kocrkadmos.moc
-
- #>+ 3
--imgnamecombo.moc: $(srcdir)/imgnamecombo.h
-- $(MOC) $(srcdir)/imgnamecombo.h -o imgnamecombo.moc
-+dwmenuaction.moc: $(srcdir)/dwmenuaction.h
-+ $(MOC) $(srcdir)/dwmenuaction.h -o dwmenuaction.moc
-
- #>+ 2
--mocs: imgnamecombo.moc
-+mocs: dwmenuaction.moc
-
- #>+ 3
--kookapref.moc: $(srcdir)/kookapref.h
-- $(MOC) $(srcdir)/kookapref.h -o kookapref.moc
-+ksaneocr.moc: $(srcdir)/ksaneocr.h
-+ $(MOC) $(srcdir)/ksaneocr.h -o ksaneocr.moc
-
- #>+ 2
--mocs: kookapref.moc
-+mocs: ksaneocr.moc
-
- #>+ 3
--kadmosocr.moc: $(srcdir)/kadmosocr.h
-- $(MOC) $(srcdir)/kadmosocr.h -o kadmosocr.moc
-+imageselectline.moc: $(srcdir)/imageselectline.h
-+ $(MOC) $(srcdir)/imageselectline.h -o imageselectline.moc
-
- #>+ 2
--mocs: kadmosocr.moc
-+mocs: imageselectline.moc
-
- #>+ 3
- kocrgocr.moc: $(srcdir)/kocrgocr.h
-@@ -1051,13 +1059,6 @@
- mocs: kocrgocr.moc
-
- #>+ 3
--imageselectline.moc: $(srcdir)/imageselectline.h
-- $(MOC) $(srcdir)/imageselectline.h -o imageselectline.moc
--
--#>+ 2
--mocs: imageselectline.moc
--
--#>+ 3
- scanpackager.moc: $(srcdir)/scanpackager.h
- $(MOC) $(srcdir)/scanpackager.h -o scanpackager.moc
-
-@@ -1072,6 +1073,13 @@
- mocs: kookaprint.moc
-
- #>+ 3
-+thumbview.moc: $(srcdir)/thumbview.h
-+ $(MOC) $(srcdir)/thumbview.h -o thumbview.moc
-+
-+#>+ 2
-+mocs: thumbview.moc
-+
-+#>+ 3
- kookaview.moc: $(srcdir)/kookaview.h
- $(MOC) $(srcdir)/kookaview.h -o kookaview.moc
-
-@@ -1079,6 +1087,13 @@
- mocs: kookaview.moc
-
- #>+ 3
-+kocrocrad.moc: $(srcdir)/kocrocrad.h
-+ $(MOC) $(srcdir)/kocrocrad.h -o kocrocrad.moc
-+
-+#>+ 2
-+mocs: kocrocrad.moc
-+
-+#>+ 3
- kooka.moc: $(srcdir)/kooka.h
- $(MOC) $(srcdir)/kooka.h -o kooka.moc
-
-@@ -1094,7 +1109,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f img_saver.moc imgprintdialog.moc ksaneocr.moc kocrkadmos.moc dwmenuaction.moc thumbview.moc kocrocrad.moc ocrresedit.moc imgnamecombo.moc kookapref.moc kadmosocr.moc kocrgocr.moc imageselectline.moc scanpackager.moc kookaprint.moc kookaview.moc kooka.moc kocrbase.moc
-+ -rm -f ocrresedit.moc imgnamecombo.moc kookapref.moc img_saver.moc imgprintdialog.moc kadmosocr.moc kocrkadmos.moc dwmenuaction.moc ksaneocr.moc imageselectline.moc kocrgocr.moc scanpackager.moc kookaprint.moc thumbview.moc kookaview.moc kocrocrad.moc kooka.moc kocrbase.moc
-
- #>+ 2
- KDE_DIST=README.KADMOS kookaui.rc WARNING kooka.desktop CREDITS kookarc CHANGES configure.in.in Makefile.in dwmenuaction.h version.h Makefile.am
-@@ -1141,7 +1156,7 @@
-
-
- #>+ 11
--kooka.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kooka.cpp $(srcdir)/kookaview.cpp $(srcdir)/kookapref.cpp $(srcdir)/img_saver.cpp $(srcdir)/ksaneocr.cpp $(srcdir)/kookaimage.cpp $(srcdir)/kookaimagemeta.cpp $(srcdir)/scanpackager.cpp $(srcdir)/imgnamecombo.cpp $(srcdir)/imageselectline.cpp $(srcdir)/thumbview.cpp $(srcdir)/thumbviewitem.cpp $(srcdir)/dwmenuaction.cpp $(srcdir)/kocrbase.cpp $(srcdir)/kocrgocr.cpp $(srcdir)/kocrkadmos.cpp $(srcdir)/kadmosocr.cpp $(srcdir)/ocrword.cpp $(srcdir)/ocrresedit.cpp $(srcdir)/kookaprint.cpp $(srcdir)/imgprintdialog.cpp $(srcdir)/kocrocrad.cpp img_saver.moc imgprintdialog.moc dwmenuaction.moc kocrkadmos.moc ksaneocr.moc thumbview.moc kocrocrad.moc ocrresedit.moc imgnamecombo.moc kookapref.moc kadmosocr.moc kocrgocr.moc imageselectline.moc scanpackager.moc kookaprint.moc kookaview.moc kooka.moc kocrbase.moc
-+kooka.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kooka.cpp $(srcdir)/kookaview.cpp $(srcdir)/kookapref.cpp $(srcdir)/img_saver.cpp $(srcdir)/ksaneocr.cpp $(srcdir)/kookaimage.cpp $(srcdir)/kookaimagemeta.cpp $(srcdir)/scanpackager.cpp $(srcdir)/imgnamecombo.cpp $(srcdir)/imageselectline.cpp $(srcdir)/thumbview.cpp $(srcdir)/thumbviewitem.cpp $(srcdir)/dwmenuaction.cpp $(srcdir)/kocrbase.cpp $(srcdir)/kocrgocr.cpp $(srcdir)/kocrkadmos.cpp $(srcdir)/kadmosocr.cpp $(srcdir)/ocrword.cpp $(srcdir)/ocrresedit.cpp $(srcdir)/kookaprint.cpp $(srcdir)/imgprintdialog.cpp $(srcdir)/kocrocrad.cpp ocrresedit.moc imgnamecombo.moc kookapref.moc img_saver.moc imgprintdialog.moc kadmosocr.moc ksaneocr.moc dwmenuaction.moc kocrkadmos.moc kocrgocr.moc imageselectline.moc scanpackager.moc kookaview.moc thumbview.moc kookaprint.moc kocrocrad.moc kooka.moc kocrbase.moc
- @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; \
-@@ -1186,14 +1201,14 @@
- kocrbase.lo: kocrbase.moc
- imgnamecombo.o: imgnamecombo.moc
- img_saver.o: img_saver.moc
--kadmosocr.lo: kadmosocr.moc
--kocrkadmos.o: kocrkadmos.moc
- ksaneocr.lo: ksaneocr.moc
-+kocrkadmos.o: kocrkadmos.moc
-+kadmosocr.lo: kadmosocr.moc
- kookaview.o: kookaview.moc
- kooka.lo: kooka.moc
- kookaprint.o: kookaprint.moc
--kookaview.lo: kookaview.moc
- kocrocrad.o: kocrocrad.moc
-+kookaview.lo: kookaview.moc
- kookapref.lo: kookapref.moc
- nmcheck-am: nmcheck
- imgprintdialog.lo: imgprintdialog.moc
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kooka/pics/Makefile.in kdegraphics-3.4.0/kooka/pics/Makefile.in
---- kdegraphics-3.4.0.orig/kooka/pics/Makefile.in 2005-03-04 13:27:33.000000000 +0100
-+++ kdegraphics-3.4.0/kooka/pics/Makefile.in 2005-03-05 02:51:46.706570079 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdegraphics-3.4.1.orig/kooka/pics/Makefile.in kdegraphics-3.4.1/kooka/pics/Makefile.in
+--- kdegraphics-3.4.1.orig/kooka/pics/Makefile.in 2005-05-23 18:01:23.000000000 +0200
++++ kdegraphics-3.4.1/kooka/pics/Makefile.in 2005-05-25 08:29:50.921486095 +0200
@@ -206,6 +206,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -16256,7 +9436,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -400,7 +403,7 @@
+@@ -401,7 +404,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16265,7 +9445,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -438,9 +441,9 @@
+@@ -439,9 +442,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16277,54 +9457,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -599,7 +602,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=mirror-horiz.png ocrad.png ocr-select.png ocr.png thumbviewtile.png gocr.png newfromselect.png scaletoheight.png scaletowidth.png lockzoom.png mirror-vert.png Makefile.in scaleorig.png mirror-both.png Makefile.am
-+KDE_DIST=mirror-horiz.png ocrad.png ocr-select.png ocr.png thumbviewtile.png gocr.png newfromselect.png scaletoheight.png scaletowidth.png lockzoom.png mirror-vert.png Makefile.in mirror-both.png scaleorig.png Makefile.am
-
- #>+ 2
- docs-am:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kpdf/Makefile.in kdegraphics-3.4.0/kpdf/Makefile.in
---- kdegraphics-3.4.0.orig/kpdf/Makefile.in 2005-03-04 13:27:33.000000000 +0100
-+++ kdegraphics-3.4.0/kpdf/Makefile.in 2005-03-05 02:51:46.000000000 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -82,18 +82,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkpdfpart_la_SOURCES)
- DIST_SOURCES = $(libkpdfpart_la_SOURCES)
-@@ -263,6 +263,9 @@
+diff -rua kdegraphics-3.4.1.orig/kpdf/conf/Makefile.in kdegraphics-3.4.1/kpdf/conf/Makefile.in
+--- kdegraphics-3.4.1.orig/kpdf/conf/Makefile.in 2005-05-23 18:01:23.000000000 +0200
++++ kdegraphics-3.4.1/kpdf/conf/Makefile.in 2005-05-25 08:29:50.970481652 +0200
+@@ -241,6 +241,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16334,7 +9470,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -470,7 +473,7 @@
+@@ -440,7 +443,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16343,7 +9479,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -508,9 +511,9 @@
+@@ -478,9 +481,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16353,131 +9489,12 @@
-$(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)
-@@ -626,7 +629,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -638,7 +647,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -646,7 +655,13 @@
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -667,7 +682,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -953,26 +968,26 @@
-
- #>+ 22
- install-kde-icons:
-- $(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/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/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/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/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/128x128/apps/kpdf.png
-+ -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/48x48/apps/kpdf.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kpdf.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpdf.png
-
- #>+ 15
- force-reedit:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kpdf/conf/Makefile.in kdegraphics-3.4.0/kpdf/conf/Makefile.in
---- kdegraphics-3.4.0.orig/kpdf/conf/Makefile.in 2005-03-04 13:27:33.000000000 +0100
-+++ kdegraphics-3.4.0/kpdf/conf/Makefile.in 2005-03-05 02:51:46.000000000 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -68,18 +68,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkpdfconf_la_SOURCES)
- DIST_SOURCES = $(libkpdfconf_la_SOURCES)
-@@ -241,6 +241,9 @@
+ clean-noinstLTLIBRARIES:
+diff -rua kdegraphics-3.4.1.orig/kpdf/core/generator_pdf/Makefile.in kdegraphics-3.4.1/kpdf/core/generator_pdf/Makefile.in
+--- kdegraphics-3.4.1.orig/kpdf/core/generator_pdf/Makefile.in 2005-05-23 18:01:23.000000000 +0200
++++ kdegraphics-3.4.1/kpdf/core/generator_pdf/Makefile.in 2005-05-25 08:29:51.108469139 +0200
+@@ -228,6 +228,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16487,7 +9504,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -439,7 +442,7 @@
+@@ -420,7 +423,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16496,7 +9513,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -477,9 +480,9 @@
+@@ -458,9 +461,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16508,44 +9525,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kpdf/core/Makefile.in kdegraphics-3.4.0/kpdf/core/Makefile.in
---- kdegraphics-3.4.0.orig/kpdf/core/Makefile.in 2005-03-04 13:27:33.000000000 +0100
-+++ kdegraphics-3.4.0/kpdf/core/Makefile.in 2005-03-05 02:51:47.000000000 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -69,18 +69,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkpdfcore_la_SOURCES)
- DIST_SOURCES = $(libkpdfcore_la_SOURCES)
+diff -rua kdegraphics-3.4.1.orig/kpdf/core/Makefile.in kdegraphics-3.4.1/kpdf/core/Makefile.in
+--- kdegraphics-3.4.1.orig/kpdf/core/Makefile.in 2005-05-23 18:01:23.000000000 +0200
++++ kdegraphics-3.4.1/kpdf/core/Makefile.in 2005-05-25 08:29:51.019477209 +0200
@@ -247,6 +247,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -16556,7 +9538,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -439,7 +442,7 @@
+@@ -440,7 +443,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16565,7 +9547,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -477,9 +480,9 @@
+@@ -478,9 +481,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16577,93 +9559,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -542,7 +545,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -554,7 +563,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -562,7 +571,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -583,7 +598,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kpdf/core/generator_pdf/Makefile.in kdegraphics-3.4.0/kpdf/core/generator_pdf/Makefile.in
---- kdegraphics-3.4.0.orig/kpdf/core/generator_pdf/Makefile.in 2005-03-04 13:27:33.000000000 +0100
-+++ kdegraphics-3.4.0/kpdf/core/generator_pdf/Makefile.in 2005-03-05 02:51:47.000000000 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -64,18 +64,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libgeneratorpdf_la_SOURCES)
- DIST_SOURCES = $(libgeneratorpdf_la_SOURCES)
-@@ -228,6 +228,9 @@
+diff -rua kdegraphics-3.4.1.orig/kpdf/Makefile.in kdegraphics-3.4.1/kpdf/Makefile.in
+--- kdegraphics-3.4.1.orig/kpdf/Makefile.in 2005-05-23 18:01:23.000000000 +0200
++++ kdegraphics-3.4.1/kpdf/Makefile.in 2005-05-25 08:29:50.952483284 +0200
+@@ -263,6 +263,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16673,7 +9572,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -419,7 +422,7 @@
+@@ -471,7 +474,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16682,7 +9581,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -457,9 +460,9 @@
+@@ -509,9 +512,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16692,46 +9591,11 @@
-$(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 -u -Nru -x debian kdegraphics-3.4.0.orig/kpdf/shell/Makefile.in kdegraphics-3.4.0/kpdf/shell/Makefile.in
---- kdegraphics-3.4.0.orig/kpdf/shell/Makefile.in 2005-03-04 13:27:33.000000000 +0100
-+++ kdegraphics-3.4.0/kpdf/shell/Makefile.in 2005-03-05 02:51:48.000000000 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -73,18 +73,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kpdf_SOURCES)
- DIST_SOURCES = $(kpdf_SOURCES)
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+diff -rua kdegraphics-3.4.1.orig/kpdf/shell/Makefile.in kdegraphics-3.4.1/kpdf/shell/Makefile.in
+--- kdegraphics-3.4.1.orig/kpdf/shell/Makefile.in 2005-05-23 18:01:23.000000000 +0200
++++ kdegraphics-3.4.1/kpdf/shell/Makefile.in 2005-05-25 08:29:51.127467416 +0200
@@ -246,6 +246,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -16742,7 +9606,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -441,7 +444,7 @@
+@@ -442,7 +445,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16751,7 +9615,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -479,9 +482,9 @@
+@@ -480,9 +483,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16763,44 +9627,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kpdf/ui/Makefile.in kdegraphics-3.4.0/kpdf/ui/Makefile.in
---- kdegraphics-3.4.0.orig/kpdf/ui/Makefile.in 2005-03-04 13:27:33.000000000 +0100
-+++ kdegraphics-3.4.0/kpdf/ui/Makefile.in 2005-03-05 02:51:48.000000000 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -71,18 +71,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkpdfui_la_SOURCES)
- DIST_SOURCES = $(libkpdfui_la_SOURCES)
+diff -rua kdegraphics-3.4.1.orig/kpdf/ui/Makefile.in kdegraphics-3.4.1/kpdf/ui/Makefile.in
+--- kdegraphics-3.4.1.orig/kpdf/ui/Makefile.in 2005-05-23 18:01:23.000000000 +0200
++++ kdegraphics-3.4.1/kpdf/ui/Makefile.in 2005-05-25 08:29:51.231457986 +0200
@@ -235,6 +235,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -16811,7 +9640,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -428,7 +431,7 @@
+@@ -429,7 +432,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16820,7 +9649,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -466,9 +469,9 @@
+@@ -467,9 +470,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16832,65 +9661,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -747,25 +750,25 @@
- mocs: searchwidget.moc
-
- #>+ 3
--presentationwidget.moc: $(srcdir)/presentationwidget.h
-- $(MOC) $(srcdir)/presentationwidget.h -o presentationwidget.moc
-+pageview.moc: $(srcdir)/pageview.h
-+ $(MOC) $(srcdir)/pageview.h -o pageview.moc
-
- #>+ 2
--mocs: presentationwidget.moc
-+mocs: pageview.moc
-
- #>+ 3
--pageview.moc: $(srcdir)/pageview.h
-- $(MOC) $(srcdir)/pageview.h -o pageview.moc
-+presentationwidget.moc: $(srcdir)/presentationwidget.h
-+ $(MOC) $(srcdir)/presentationwidget.h -o presentationwidget.moc
-
- #>+ 2
--mocs: pageview.moc
-+mocs: presentationwidget.moc
-
- #>+ 3
- clean-metasources:
-- -rm -f minibar.moc thumbnaillist.moc toc.moc searchwidget.moc presentationwidget.moc pageview.moc
-+ -rm -f minibar.moc thumbnaillist.moc toc.moc searchwidget.moc pageview.moc presentationwidget.moc
-
- #>+ 2
--KDE_DIST=pagepainter.h toc.h thumbnaillist.h propertiesdialog.h pageview.h presentationwidget.h searchwidget.h pageviewutils.h minibar.h Makefile.in Makefile.am
-+KDE_DIST=pagepainter.h toc.h thumbnaillist.h pageview.h propertiesdialog.h presentationwidget.h searchwidget.h pageviewutils.h minibar.h Makefile.in Makefile.am
-
- #>+ 2
- docs-am:
-@@ -809,7 +812,7 @@
-
-
- #>+ 11
--libkpdfui_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pagepainter.cpp $(srcdir)/pageview.cpp ../conf/settings.h $(srcdir)/pageviewutils.cpp ../conf/settings.h $(srcdir)/minibar.cpp $(srcdir)/thumbnaillist.cpp ../conf/settings.h $(srcdir)/searchwidget.cpp ../conf/settings.h $(srcdir)/toc.cpp $(srcdir)/propertiesdialog.cpp $(srcdir)/presentationwidget.cpp ../conf/settings.h minibar.moc thumbnaillist.moc toc.moc searchwidget.moc pageview.moc presentationwidget.moc
-+libkpdfui_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pagepainter.cpp $(srcdir)/pageview.cpp ../conf/settings.h $(srcdir)/pageviewutils.cpp ../conf/settings.h $(srcdir)/minibar.cpp $(srcdir)/thumbnaillist.cpp ../conf/settings.h $(srcdir)/searchwidget.cpp ../conf/settings.h $(srcdir)/toc.cpp $(srcdir)/propertiesdialog.cpp $(srcdir)/presentationwidget.cpp ../conf/settings.h minibar.moc thumbnaillist.moc toc.moc searchwidget.moc presentationwidget.moc pageview.moc
- @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 -u -Nru -x debian kdegraphics-3.4.0.orig/kpdf/xpdf/Makefile.in kdegraphics-3.4.0/kpdf/xpdf/Makefile.in
---- kdegraphics-3.4.0.orig/kpdf/xpdf/Makefile.in 2005-03-04 13:27:33.000000000 +0100
-+++ kdegraphics-3.4.0/kpdf/xpdf/Makefile.in 2005-03-05 02:51:48.000000000 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -212,6 +212,9 @@
+diff -rua kdegraphics-3.4.1.orig/kpdf/xpdf/fofi/Makefile.in kdegraphics-3.4.1/kpdf/xpdf/fofi/Makefile.in
+--- kdegraphics-3.4.1.orig/kpdf/xpdf/fofi/Makefile.in 2005-05-23 18:01:23.000000000 +0200
++++ kdegraphics-3.4.1/kpdf/xpdf/fofi/Makefile.in 2005-05-25 08:29:51.258455538 +0200
+@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16900,16 +9674,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -398,7 +401,7 @@
- all: docs-am all-recursive
+@@ -427,7 +430,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*) \
-@@ -436,9 +439,9 @@
+@@ -465,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16920,94 +9694,11 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- mostlyclean-libtool:
-@@ -458,7 +461,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -470,7 +479,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -478,7 +487,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -499,7 +514,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kpdf/xpdf/fofi/Makefile.in kdegraphics-3.4.0/kpdf/xpdf/fofi/Makefile.in
---- kdegraphics-3.4.0.orig/kpdf/xpdf/fofi/Makefile.in 2005-03-04 13:27:33.000000000 +0100
-+++ kdegraphics-3.4.0/kpdf/xpdf/fofi/Makefile.in 2005-03-05 02:51:48.000000000 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -69,18 +69,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libfofi_la_SOURCES)
- DIST_SOURCES = $(libfofi_la_SOURCES)
-@@ -233,6 +233,9 @@
+ clean-noinstLTLIBRARIES:
+diff -rua kdegraphics-3.4.1.orig/kpdf/xpdf/goo/Makefile.in kdegraphics-3.4.1/kpdf/xpdf/goo/Makefile.in
+--- kdegraphics-3.4.1.orig/kpdf/xpdf/goo/Makefile.in 2005-05-23 18:01:23.000000000 +0200
++++ kdegraphics-3.4.1/kpdf/xpdf/goo/Makefile.in 2005-05-25 08:29:51.275453996 +0200
+@@ -241,6 +241,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17017,16 +9708,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -426,7 +429,7 @@
+@@ -431,7 +434,7 @@
.SUFFIXES:
- .SUFFIXES: .cc .lo .o .obj
+ .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*) \
-@@ -464,9 +467,9 @@
+@@ -469,9 +472,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17038,58 +9729,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kpdf/xpdf/goo/Makefile.in kdegraphics-3.4.0/kpdf/xpdf/goo/Makefile.in
---- kdegraphics-3.4.0.orig/kpdf/xpdf/goo/Makefile.in 2005-03-04 13:27:33.000000000 +0100
-+++ kdegraphics-3.4.0/kpdf/xpdf/goo/Makefile.in 2005-03-05 02:51:48.000000000 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -66,29 +66,29 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libgoo_la_SOURCES)
- DIST_SOURCES = $(libgoo_la_SOURCES)
-@@ -241,6 +241,9 @@
+diff -rua kdegraphics-3.4.1.orig/kpdf/xpdf/Makefile.in kdegraphics-3.4.1/kpdf/xpdf/Makefile.in
+--- kdegraphics-3.4.1.orig/kpdf/xpdf/Makefile.in 2005-05-23 18:01:23.000000000 +0200
++++ kdegraphics-3.4.1/kpdf/xpdf/Makefile.in 2005-05-25 08:29:51.243456898 +0200
+@@ -212,6 +212,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17099,16 +9742,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -430,7 +433,7 @@
+@@ -399,7 +402,7 @@
+ all: docs-am all-recursive
.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*) \
-@@ -468,9 +471,9 @@
+@@ -437,9 +440,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17119,45 +9762,10 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- clean-noinstLTLIBRARIES:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kpdf/xpdf/splash/Makefile.in kdegraphics-3.4.0/kpdf/xpdf/splash/Makefile.in
---- kdegraphics-3.4.0.orig/kpdf/xpdf/splash/Makefile.in 2005-03-04 13:27:33.000000000 +0100
-+++ kdegraphics-3.4.0/kpdf/xpdf/splash/Makefile.in 2005-03-05 02:51:48.000000000 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -79,18 +79,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libsplash_la_SOURCES)
- DIST_SOURCES = $(libsplash_la_SOURCES)
+ mostlyclean-libtool:
+diff -rua kdegraphics-3.4.1.orig/kpdf/xpdf/splash/Makefile.in kdegraphics-3.4.1/kpdf/xpdf/splash/Makefile.in
+--- kdegraphics-3.4.1.orig/kpdf/xpdf/splash/Makefile.in 2005-05-23 18:01:23.000000000 +0200
++++ kdegraphics-3.4.1/kpdf/xpdf/splash/Makefile.in 2005-05-25 08:29:51.292452455 +0200
@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -17168,7 +9776,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -436,7 +439,7 @@
+@@ -437,7 +440,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -17177,7 +9785,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -474,9 +477,9 @@
+@@ -475,9 +478,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17189,44 +9797,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kpdf/xpdf/xpdf/Makefile.in kdegraphics-3.4.0/kpdf/xpdf/xpdf/Makefile.in
---- kdegraphics-3.4.0.orig/kpdf/xpdf/xpdf/Makefile.in 2005-03-04 13:27:33.000000000 +0100
-+++ kdegraphics-3.4.0/kpdf/xpdf/xpdf/Makefile.in 2005-03-05 02:51:48.000000000 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -86,18 +86,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libxpdf_la_SOURCES)
- DIST_SOURCES = $(libxpdf_la_SOURCES)
+diff -rua kdegraphics-3.4.1.orig/kpdf/xpdf/xpdf/Makefile.in kdegraphics-3.4.1/kpdf/xpdf/xpdf/Makefile.in
+--- kdegraphics-3.4.1.orig/kpdf/xpdf/xpdf/Makefile.in 2005-05-23 18:01:24.000000000 +0200
++++ kdegraphics-3.4.1/kpdf/xpdf/xpdf/Makefile.in 2005-05-25 08:29:51.313450551 +0200
@@ -250,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -17237,7 +9810,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -449,7 +452,7 @@
+@@ -450,7 +453,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -17246,7 +9819,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -487,9 +490,9 @@
+@@ -488,9 +491,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17258,54 +9831,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -753,7 +756,7 @@
- .NOEXPORT:
-
- #>+ 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 Error.h GlobalParams.h UnicodeMapTables.h FontEncodingTables.h PDFDoc.h Gfx.h UTF8.h BuiltinFontTables.h Parser.h JArithmeticDecoder.h GfxFont.h CMap.h Function.h CharCodeToUnicode.h Makefile.in BuiltinFont.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 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 Page.h PSTokenizer.h ErrorCodes.h GfxState.h TextOutputDev.h Makefile.am Outline.h
-
- #>+ 2
- docs-am:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kpovmodeler/Makefile.in kdegraphics-3.4.0/kpovmodeler/Makefile.in
---- kdegraphics-3.4.0.orig/kpovmodeler/Makefile.in 2005-03-04 13:27:34.000000000 +0100
-+++ kdegraphics-3.4.0/kpovmodeler/Makefile.in 2005-03-05 02:51:50.698885517 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -256,18 +256,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkpovmodeler_la_SOURCES) \
- $(libkpovmodelerpart_la_SOURCES) $(kpovmodeler_SOURCES)
-@@ -440,6 +440,9 @@
+diff -rua kdegraphics-3.4.1.orig/kpovmodeler/examples/includes/inlined/Makefile.in kdegraphics-3.4.1/kpovmodeler/examples/includes/inlined/Makefile.in
+--- kdegraphics-3.4.1.orig/kpovmodeler/examples/includes/inlined/Makefile.in 2005-05-23 18:01:24.000000000 +0200
++++ kdegraphics-3.4.1/kpovmodeler/examples/includes/inlined/Makefile.in 2005-05-25 08:29:51.875399591 +0200
+@@ -206,6 +206,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17315,16 +9844,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -954,7 +957,7 @@
+@@ -397,7 +400,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*) \
-@@ -992,9 +995,9 @@
+@@ -435,9 +438,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17334,528 +9863,11 @@
-$(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)
-@@ -1428,7 +1431,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1440,7 +1449,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -1448,7 +1457,13 @@
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -1469,7 +1484,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1756,18 +1771,18 @@
- mocs: pmcylinderedit.moc
-
- #>+ 3
--pmtorusedit.moc: $(srcdir)/pmtorusedit.h
-- $(MOC) $(srcdir)/pmtorusedit.h -o pmtorusedit.moc
-+pminteriortextureedit.moc: $(srcdir)/pminteriortextureedit.h
-+ $(MOC) $(srcdir)/pminteriortextureedit.h -o pminteriortextureedit.moc
-
- #>+ 2
--mocs: pmtorusedit.moc
-+mocs: pminteriortextureedit.moc
-
- #>+ 3
--pminteriortextureedit.moc: $(srcdir)/pminteriortextureedit.h
-- $(MOC) $(srcdir)/pminteriortextureedit.h -o pminteriortextureedit.moc
-+pmtorusedit.moc: $(srcdir)/pmtorusedit.h
-+ $(MOC) $(srcdir)/pmtorusedit.h -o pmtorusedit.moc
-
- #>+ 2
--mocs: pminteriortextureedit.moc
-+mocs: pmtorusedit.moc
-
- #>+ 3
- pmblobedit.moc: $(srcdir)/pmblobedit.h
-@@ -1826,13 +1841,6 @@
- mocs: pmcameraedit.moc
-
- #>+ 3
--pmlayoutsettings.moc: $(srcdir)/pmlayoutsettings.h
-- $(MOC) $(srcdir)/pmlayoutsettings.h -o pmlayoutsettings.moc
--
--#>+ 2
--mocs: pmlayoutsettings.moc
--
--#>+ 3
- pmblobsphereedit.moc: $(srcdir)/pmblobsphereedit.h
- $(MOC) $(srcdir)/pmblobsphereedit.h -o pmblobsphereedit.moc
-
-@@ -1847,6 +1855,13 @@
- mocs: pmboxedit.moc
-
- #>+ 3
-+pmlayoutsettings.moc: $(srcdir)/pmlayoutsettings.h
-+ $(MOC) $(srcdir)/pmlayoutsettings.h -o pmlayoutsettings.moc
-+
-+#>+ 2
-+mocs: pmlayoutsettings.moc
-+
-+#>+ 3
- pmspheresweepedit.moc: $(srcdir)/pmspheresweepedit.h
- $(MOC) $(srcdir)/pmspheresweepedit.h -o pmspheresweepedit.moc
-
-@@ -1861,25 +1876,25 @@
- mocs: pmdockwidget_private.moc
-
- #>+ 3
--pmlibraryiconview.moc: $(srcdir)/pmlibraryiconview.h
-- $(MOC) $(srcdir)/pmlibraryiconview.h -o pmlibraryiconview.moc
-+pmimagemapedit.moc: $(srcdir)/pmimagemapedit.h
-+ $(MOC) $(srcdir)/pmimagemapedit.h -o pmimagemapedit.moc
-
- #>+ 2
--mocs: pmlibraryiconview.moc
-+mocs: pmimagemapedit.moc
-
- #>+ 3
--pmimagemapedit.moc: $(srcdir)/pmimagemapedit.h
-- $(MOC) $(srcdir)/pmimagemapedit.h -o pmimagemapedit.moc
-+pmlibraryiconview.moc: $(srcdir)/pmlibraryiconview.h
-+ $(MOC) $(srcdir)/pmlibraryiconview.h -o pmlibraryiconview.moc
-
- #>+ 2
--mocs: pmimagemapedit.moc
-+mocs: pmlibraryiconview.moc
-
- #>+ 3
--pmradiosityedit.moc: $(srcdir)/pmradiosityedit.h
-- $(MOC) $(srcdir)/pmradiosityedit.h -o pmradiosityedit.moc
-+pmdragwidget.moc: $(srcdir)/pmdragwidget.h
-+ $(MOC) $(srcdir)/pmdragwidget.h -o pmdragwidget.moc
-
- #>+ 2
--mocs: pmradiosityedit.moc
-+mocs: pmdragwidget.moc
-
- #>+ 3
- pmlightgroupedit.moc: $(srcdir)/pmlightgroupedit.h
-@@ -1889,11 +1904,11 @@
- mocs: pmlightgroupedit.moc
-
- #>+ 3
--pmdragwidget.moc: $(srcdir)/pmdragwidget.h
-- $(MOC) $(srcdir)/pmdragwidget.h -o pmdragwidget.moc
-+pmradiosityedit.moc: $(srcdir)/pmradiosityedit.h
-+ $(MOC) $(srcdir)/pmradiosityedit.h -o pmradiosityedit.moc
-
- #>+ 2
--mocs: pmdragwidget.moc
-+mocs: pmradiosityedit.moc
-
- #>+ 3
- pmactions.moc: $(srcdir)/pmactions.h
-@@ -1903,13 +1918,6 @@
- mocs: pmactions.moc
-
- #>+ 3
--pmlibrarybrowser.moc: $(srcdir)/pmlibrarybrowser.h
-- $(MOC) $(srcdir)/pmlibrarybrowser.h -o pmlibrarybrowser.moc
--
--#>+ 2
--mocs: pmlibrarybrowser.moc
--
--#>+ 3
- pmdiscedit.moc: $(srcdir)/pmdiscedit.h
- $(MOC) $(srcdir)/pmdiscedit.h -o pmdiscedit.moc
-
-@@ -1917,11 +1925,11 @@
- mocs: pmdiscedit.moc
-
- #>+ 3
--pmpalettevalueedit.moc: $(srcdir)/pmpalettevalueedit.h
-- $(MOC) $(srcdir)/pmpalettevalueedit.h -o pmpalettevalueedit.moc
-+pmlibrarybrowser.moc: $(srcdir)/pmlibrarybrowser.h
-+ $(MOC) $(srcdir)/pmlibrarybrowser.h -o pmlibrarybrowser.moc
-
- #>+ 2
--mocs: pmpalettevalueedit.moc
-+mocs: pmlibrarybrowser.moc
-
- #>+ 3
- pmlightedit.moc: $(srcdir)/pmlightedit.h
-@@ -1931,11 +1939,11 @@
- mocs: pmlightedit.moc
-
- #>+ 3
--pmview.moc: $(srcdir)/pmview.h
-- $(MOC) $(srcdir)/pmview.h -o pmview.moc
-+pmpalettevalueedit.moc: $(srcdir)/pmpalettevalueedit.h
-+ $(MOC) $(srcdir)/pmpalettevalueedit.h -o pmpalettevalueedit.moc
-
- #>+ 2
--mocs: pmview.moc
-+mocs: pmpalettevalueedit.moc
-
- #>+ 3
- pmobjectlibrarysettings.moc: $(srcdir)/pmobjectlibrarysettings.h
-@@ -1945,6 +1953,13 @@
- mocs: pmobjectlibrarysettings.moc
-
- #>+ 3
-+pmview.moc: $(srcdir)/pmview.h
-+ $(MOC) $(srcdir)/pmview.h -o pmview.moc
-+
-+#>+ 2
-+mocs: pmview.moc
-+
-+#>+ 3
- pmfactory.moc: $(srcdir)/pmfactory.h
- $(MOC) $(srcdir)/pmfactory.h -o pmfactory.moc
-
-@@ -2036,18 +2051,18 @@
- mocs: pmfiledialog.moc
-
- #>+ 3
--pmpovraymatrixedit.moc: $(srcdir)/pmpovraymatrixedit.h
-- $(MOC) $(srcdir)/pmpovraymatrixedit.h -o pmpovraymatrixedit.moc
-+pmboundedbyedit.moc: $(srcdir)/pmboundedbyedit.h
-+ $(MOC) $(srcdir)/pmboundedbyedit.h -o pmboundedbyedit.moc
-
- #>+ 2
--mocs: pmpovraymatrixedit.moc
-+mocs: pmboundedbyedit.moc
-
- #>+ 3
--pmboundedbyedit.moc: $(srcdir)/pmboundedbyedit.h
-- $(MOC) $(srcdir)/pmboundedbyedit.h -o pmboundedbyedit.moc
-+pmpovraymatrixedit.moc: $(srcdir)/pmpovraymatrixedit.h
-+ $(MOC) $(srcdir)/pmpovraymatrixedit.h -o pmpovraymatrixedit.moc
-
- #>+ 2
--mocs: pmboundedbyedit.moc
-+mocs: pmpovraymatrixedit.moc
-
- #>+ 3
- pmlistpatternedit.moc: $(srcdir)/pmlistpatternedit.h
-@@ -2092,18 +2107,18 @@
- mocs: pmpigmentedit.moc
-
- #>+ 3
--pmglobalphotonsedit.moc: $(srcdir)/pmglobalphotonsedit.h
-- $(MOC) $(srcdir)/pmglobalphotonsedit.h -o pmglobalphotonsedit.moc
-+pmglobalsettingsedit.moc: $(srcdir)/pmglobalsettingsedit.h
-+ $(MOC) $(srcdir)/pmglobalsettingsedit.h -o pmglobalsettingsedit.moc
-
- #>+ 2
--mocs: pmglobalphotonsedit.moc
-+mocs: pmglobalsettingsedit.moc
-
- #>+ 3
--pmglobalsettingsedit.moc: $(srcdir)/pmglobalsettingsedit.h
-- $(MOC) $(srcdir)/pmglobalsettingsedit.h -o pmglobalsettingsedit.moc
-+pmglobalphotonsedit.moc: $(srcdir)/pmglobalphotonsedit.h
-+ $(MOC) $(srcdir)/pmglobalphotonsedit.h -o pmglobalphotonsedit.moc
-
- #>+ 2
--mocs: pmglobalsettingsedit.moc
-+mocs: pmglobalphotonsedit.moc
-
- #>+ 3
- pmerrordialog.moc: $(srcdir)/pmerrordialog.h
-@@ -2148,13 +2163,6 @@
- mocs: pmconeedit.moc
-
- #>+ 3
--pmphotonsedit.moc: $(srcdir)/pmphotonsedit.h
-- $(MOC) $(srcdir)/pmphotonsedit.h -o pmphotonsedit.moc
--
--#>+ 2
--mocs: pmphotonsedit.moc
--
--#>+ 3
- pmpatternedit.moc: $(srcdir)/pmpatternedit.h
- $(MOC) $(srcdir)/pmpatternedit.h -o pmpatternedit.moc
-
-@@ -2162,11 +2170,11 @@
- mocs: pmpatternedit.moc
-
- #>+ 3
--pmsoredit.moc: $(srcdir)/pmsoredit.h
-- $(MOC) $(srcdir)/pmsoredit.h -o pmsoredit.moc
-+pmphotonsedit.moc: $(srcdir)/pmphotonsedit.h
-+ $(MOC) $(srcdir)/pmphotonsedit.h -o pmphotonsedit.moc
-
- #>+ 2
--mocs: pmsoredit.moc
-+mocs: pmphotonsedit.moc
-
- #>+ 3
- pmrainbowedit.moc: $(srcdir)/pmrainbowedit.h
-@@ -2176,6 +2184,13 @@
- mocs: pmrainbowedit.moc
-
- #>+ 3
-+pmsoredit.moc: $(srcdir)/pmsoredit.h
-+ $(MOC) $(srcdir)/pmsoredit.h -o pmsoredit.moc
-+
-+#>+ 2
-+mocs: pmsoredit.moc
-+
-+#>+ 3
- pmquickcoloredit.moc: $(srcdir)/pmquickcoloredit.h
- $(MOC) $(srcdir)/pmquickcoloredit.h -o pmquickcoloredit.moc
-
-@@ -2190,18 +2205,18 @@
- mocs: pmdeclareedit.moc
-
- #>+ 3
--pmsqeedit.moc: $(srcdir)/pmsqeedit.h
-- $(MOC) $(srcdir)/pmsqeedit.h -o pmsqeedit.moc
-+pmdialogview.moc: $(srcdir)/pmdialogview.h
-+ $(MOC) $(srcdir)/pmdialogview.h -o pmdialogview.moc
-
- #>+ 2
--mocs: pmsqeedit.moc
-+mocs: pmdialogview.moc
-
- #>+ 3
--pmdialogview.moc: $(srcdir)/pmdialogview.h
-- $(MOC) $(srcdir)/pmdialogview.h -o pmdialogview.moc
-+pmsqeedit.moc: $(srcdir)/pmsqeedit.h
-+ $(MOC) $(srcdir)/pmsqeedit.h -o pmsqeedit.moc
-
- #>+ 2
--mocs: pmdialogview.moc
-+mocs: pmsqeedit.moc
-
- #>+ 3
- pmbicubicpatchedit.moc: $(srcdir)/pmbicubicpatchedit.h
-@@ -2211,6 +2226,13 @@
- mocs: pmbicubicpatchedit.moc
-
- #>+ 3
-+pmobjectlinkedit.moc: $(srcdir)/pmobjectlinkedit.h
-+ $(MOC) $(srcdir)/pmobjectlinkedit.h -o pmobjectlinkedit.moc
-+
-+#>+ 2
-+mocs: pmobjectlinkedit.moc
-+
-+#>+ 3
- pmcoloredit.moc: $(srcdir)/pmcoloredit.h
- $(MOC) $(srcdir)/pmcoloredit.h -o pmcoloredit.moc
-
-@@ -2225,13 +2247,6 @@
- mocs: pmglview.moc
-
- #>+ 3
--pmobjectlinkedit.moc: $(srcdir)/pmobjectlinkedit.h
-- $(MOC) $(srcdir)/pmobjectlinkedit.h -o pmobjectlinkedit.moc
--
--#>+ 2
--mocs: pmobjectlinkedit.moc
--
--#>+ 3
- pmmaterialedit.moc: $(srcdir)/pmmaterialedit.h
- $(MOC) $(srcdir)/pmmaterialedit.h -o pmmaterialedit.moc
-
-@@ -2302,18 +2317,18 @@
- mocs: pmnormaledit.moc
-
- #>+ 3
--pmgraphicalobjectedit.moc: $(srcdir)/pmgraphicalobjectedit.h
-- $(MOC) $(srcdir)/pmgraphicalobjectedit.h -o pmgraphicalobjectedit.moc
-+pmlibraryobjectsearch.moc: $(srcdir)/pmlibraryobjectsearch.h
-+ $(MOC) $(srcdir)/pmlibraryobjectsearch.h -o pmlibraryobjectsearch.moc
-
- #>+ 2
--mocs: pmgraphicalobjectedit.moc
-+mocs: pmlibraryobjectsearch.moc
-
- #>+ 3
--pmlibraryobjectsearch.moc: $(srcdir)/pmlibraryobjectsearch.h
-- $(MOC) $(srcdir)/pmlibraryobjectsearch.h -o pmlibraryobjectsearch.moc
-+pmgraphicalobjectedit.moc: $(srcdir)/pmgraphicalobjectedit.h
-+ $(MOC) $(srcdir)/pmgraphicalobjectedit.h -o pmgraphicalobjectedit.moc
-
- #>+ 2
--mocs: pmlibraryobjectsearch.moc
-+mocs: pmgraphicalobjectedit.moc
-
- #>+ 3
- pmprismedit.moc: $(srcdir)/pmprismedit.h
-@@ -2358,18 +2373,18 @@
- mocs: pmdockwidget.moc
-
- #>+ 3
--pmdetailobjectedit.moc: $(srcdir)/pmdetailobjectedit.h
-- $(MOC) $(srcdir)/pmdetailobjectedit.h -o pmdetailobjectedit.moc
-+pmgridsettings.moc: $(srcdir)/pmgridsettings.h
-+ $(MOC) $(srcdir)/pmgridsettings.h -o pmgridsettings.moc
-
- #>+ 2
--mocs: pmdetailobjectedit.moc
-+mocs: pmgridsettings.moc
-
- #>+ 3
--pmgridsettings.moc: $(srcdir)/pmgridsettings.h
-- $(MOC) $(srcdir)/pmgridsettings.h -o pmgridsettings.moc
-+pmdetailobjectedit.moc: $(srcdir)/pmdetailobjectedit.h
-+ $(MOC) $(srcdir)/pmdetailobjectedit.h -o pmdetailobjectedit.moc
-
- #>+ 2
--mocs: pmgridsettings.moc
-+mocs: pmdetailobjectedit.moc
-
- #>+ 3
- pmrendermanager.moc: $(srcdir)/pmrendermanager.h
-@@ -2414,18 +2429,18 @@
- mocs: pmvectoredit.moc
-
- #>+ 3
--pmtextureedit.moc: $(srcdir)/pmtextureedit.h
-- $(MOC) $(srcdir)/pmtextureedit.h -o pmtextureedit.moc
-+pmpovraywidget.moc: $(srcdir)/pmpovraywidget.h
-+ $(MOC) $(srcdir)/pmpovraywidget.h -o pmpovraywidget.moc
-
- #>+ 2
--mocs: pmtextureedit.moc
-+mocs: pmpovraywidget.moc
-
- #>+ 3
--pmpovraywidget.moc: $(srcdir)/pmpovraywidget.h
-- $(MOC) $(srcdir)/pmpovraywidget.h -o pmpovraywidget.moc
-+pmtextureedit.moc: $(srcdir)/pmtextureedit.h
-+ $(MOC) $(srcdir)/pmtextureedit.h -o pmtextureedit.moc
-
- #>+ 2
--mocs: pmpovraywidget.moc
-+mocs: pmtextureedit.moc
-
- #>+ 3
- pmrotateedit.moc: $(srcdir)/pmrotateedit.h
-@@ -2463,18 +2478,18 @@
- mocs: pmsolidobjectedit.moc
-
- #>+ 3
--pmshell.moc: $(srcdir)/pmshell.h
-- $(MOC) $(srcdir)/pmshell.h -o pmshell.moc
-+pmfogedit.moc: $(srcdir)/pmfogedit.h
-+ $(MOC) $(srcdir)/pmfogedit.h -o pmfogedit.moc
-
- #>+ 2
--mocs: pmshell.moc
-+mocs: pmfogedit.moc
-
- #>+ 3
--pmfogedit.moc: $(srcdir)/pmfogedit.h
-- $(MOC) $(srcdir)/pmfogedit.h -o pmfogedit.moc
-+pmshell.moc: $(srcdir)/pmshell.h
-+ $(MOC) $(srcdir)/pmshell.h -o pmshell.moc
-
- #>+ 2
--mocs: pmfogedit.moc
-+mocs: pmshell.moc
-
- #>+ 3
- pmsettingsdialog.moc: $(srcdir)/pmsettingsdialog.h
-@@ -2543,7 +2558,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f pmblobcylinderedit.moc pmlineedits.moc pmcylinderedit.moc pmtorusedit.moc pminteriortextureedit.moc pmblobedit.moc pmpreviewsettings.moc pmpovrayoutputwidget.moc pmpluginsettings.moc pmobjectselect.moc pmviewlayoutmanager.moc pmlibraryentrypreview.moc pmcameraedit.moc pmlayoutsettings.moc pmblobsphereedit.moc pmboxedit.moc pmspheresweepedit.moc pmdockwidget_private.moc pmlibraryiconview.moc pmimagemapedit.moc pmradiosityedit.moc pmlightgroupedit.moc pmdragwidget.moc pmactions.moc pmlibrarybrowser.moc pmdiscedit.moc pmpalettevalueedit.moc pmlightedit.moc pmview.moc pmobjectlibrarysettings.moc pmfactory.moc pmpolynomedit.moc pmdensityedit.moc pmlatheedit.moc pmlibraryhandleedit.moc pminterioredit.moc pmclippedbyedit.moc pmtexturemapedit.moc pmpovraysettings.moc pmtexturebaseedit.moc pmdialogeditbase.moc pmslopeedit.moc pmfiledialog.moc pmpovraymatrixedit.moc pmboundedbyedit.moc pmlistpatternedit.moc pmwarpedit.moc pmopenglsettings.moc pmcsgedit.moc pmplaneedit.moc pmpigmentedit.moc pmglobalphotonsedit.moc pmglobalsettingsedit.moc pmerrordialog.moc pmtriangleedit.moc pminserterrordialog.moc pmfinishedit.moc pmsphereedit.moc pmconeedit.moc pmphotonsedit.moc pmpatternedit.moc pmsoredit.moc pmrainbowedit.moc pmquickcoloredit.moc pmdeclareedit.moc pmsqeedit.moc pmdialogview.moc pmbicubicpatchedit.moc pmcoloredit.moc pmglview.moc pmobjectlinkedit.moc pmmaterialedit.moc pmrawedit.moc pmbumpmapedit.moc pmskysphereedit.moc pmmediaedit.moc pmobjectsettings.moc pmlinkedit.moc pmcolorsettings.moc pmjuliafractaledit.moc pmnormaledit.moc pmgraphicalobjectedit.moc pmlibraryobjectsearch.moc pmprismedit.moc pmtextedit.moc pmisosurfaceedit.moc pmpovrayrenderwidget.moc pmviewbase.moc pmdockwidget.moc pmdetailobjectedit.moc pmgridsettings.moc pmrendermanager.moc pmsolidcoloredit.moc pmpart.moc pmheightfieldedit.moc pmmaterialmapedit.moc pmvectoredit.moc pmtextureedit.moc pmpovraywidget.moc pmrotateedit.moc pmtreeview.moc pmtranslateedit.moc pmvectorlistedit.moc pmsolidobjectedit.moc pmshell.moc pmfogedit.moc pmsettingsdialog.moc pmcommandmanager.moc pmblendmapmodifiersedit.moc pmrendermodesdialog.moc pmmeshedit.moc pmnamedobjectedit.moc pmcommentedit.moc pmscaleedit.moc
-+ -rm -f pmblobcylinderedit.moc pmlineedits.moc pmcylinderedit.moc pminteriortextureedit.moc pmtorusedit.moc pmblobedit.moc pmpreviewsettings.moc pmpovrayoutputwidget.moc pmpluginsettings.moc pmobjectselect.moc pmviewlayoutmanager.moc pmlibraryentrypreview.moc pmcameraedit.moc pmblobsphereedit.moc pmboxedit.moc pmlayoutsettings.moc pmspheresweepedit.moc pmdockwidget_private.moc pmimagemapedit.moc pmlibraryiconview.moc pmdragwidget.moc pmlightgroupedit.moc pmradiosityedit.moc pmactions.moc pmdiscedit.moc pmlibrarybrowser.moc pmlightedit.moc pmpalettevalueedit.moc pmobjectlibrarysettings.moc pmview.moc pmfactory.moc pmpolynomedit.moc pmdensityedit.moc pmlatheedit.moc pmlibraryhandleedit.moc pminterioredit.moc pmclippedbyedit.moc pmtexturemapedit.moc pmpovraysettings.moc pmtexturebaseedit.moc pmdialogeditbase.moc pmslopeedit.moc pmfiledialog.moc pmboundedbyedit.moc pmpovraymatrixedit.moc pmlistpatternedit.moc pmwarpedit.moc pmopenglsettings.moc pmcsgedit.moc pmplaneedit.moc pmpigmentedit.moc pmglobalsettingsedit.moc pmglobalphotonsedit.moc pmerrordialog.moc pmtriangleedit.moc pminserterrordialog.moc pmfinishedit.moc pmsphereedit.moc pmconeedit.moc pmpatternedit.moc pmphotonsedit.moc pmrainbowedit.moc pmsoredit.moc pmquickcoloredit.moc pmdeclareedit.moc pmdialogview.moc pmsqeedit.moc pmbicubicpatchedit.moc pmobjectlinkedit.moc pmcoloredit.moc pmglview.moc pmmaterialedit.moc pmrawedit.moc pmbumpmapedit.moc pmskysphereedit.moc pmmediaedit.moc pmobjectsettings.moc pmlinkedit.moc pmcolorsettings.moc pmjuliafractaledit.moc pmnormaledit.moc pmlibraryobjectsearch.moc pmgraphicalobjectedit.moc pmprismedit.moc pmtextedit.moc pmisosurfaceedit.moc pmpovrayrenderwidget.moc pmviewbase.moc pmdockwidget.moc pmgridsettings.moc pmdetailobjectedit.moc pmrendermanager.moc pmsolidcoloredit.moc pmpart.moc pmheightfieldedit.moc pmmaterialmapedit.moc pmvectoredit.moc pmpovraywidget.moc pmtextureedit.moc pmrotateedit.moc pmtreeview.moc pmtranslateedit.moc pmvectorlistedit.moc pmsolidobjectedit.moc pmfogedit.moc pmshell.moc pmsettingsdialog.moc pmcommandmanager.moc pmblendmapmodifiersedit.moc pmrendermodesdialog.moc pmmeshedit.moc pmnamedobjectedit.moc pmcommentedit.moc pmscaleedit.moc
-
- #>+ 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
-@@ -2562,31 +2577,31 @@
-
- #>+ 28
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpovmodeler.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes
-+ $(INSTALL_DATA) $(srcdir)/cr32-mime-kpovmodeler_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kpovmodeler_doc.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes
- $(INSTALL_DATA) $(srcdir)/cr16-mime-kpovmodeler_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kpovmodeler_doc.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpovmodeler.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes
-- $(INSTALL_DATA) $(srcdir)/cr32-mime-kpovmodeler_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kpovmodeler_doc.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/lo16-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kpovmodeler.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
- $(INSTALL_DATA) $(srcdir)/lo32-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kpovmodeler.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpovmodeler.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpovmodeler.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/lo16-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kpovmodeler.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes
- $(INSTALL_DATA) $(srcdir)/cr48-mime-kpovmodeler_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kpovmodeler_doc.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpovmodeler.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kpovmodeler_doc.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kpovmodeler_doc.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpovmodeler.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kpovmodeler_doc.png
-- -rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kpovmodeler.png
- -rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kpovmodeler.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpovmodeler.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpovmodeler.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kpovmodeler.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kpovmodeler_doc.png
-
- #>+ 15
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kpovmodeler/examples/Makefile.in kdegraphics-3.4.0/kpovmodeler/examples/Makefile.in
---- kdegraphics-3.4.0.orig/kpovmodeler/examples/Makefile.in 2005-03-04 13:27:34.000000000 +0100
-+++ kdegraphics-3.4.0/kpovmodeler/examples/Makefile.in 2005-03-05 02:51:50.705884317 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+ mostlyclean-libtool:
+diff -rua kdegraphics-3.4.1.orig/kpovmodeler/examples/includes/Makefile.in kdegraphics-3.4.1/kpovmodeler/examples/includes/Makefile.in
+--- kdegraphics-3.4.1.orig/kpovmodeler/examples/includes/Makefile.in 2005-05-23 18:01:24.000000000 +0200
++++ kdegraphics-3.4.1/kpovmodeler/examples/includes/Makefile.in 2005-05-25 08:29:51.865400498 +0200
@@ -212,6 +212,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -17866,7 +9878,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -398,7 +401,7 @@
+@@ -399,7 +402,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -17875,7 +9887,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -436,9 +439,9 @@
+@@ -437,9 +440,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17887,70 +9899,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -458,7 +461,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -470,7 +479,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -478,7 +487,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -499,7 +514,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kpovmodeler/examples/includes/Makefile.in kdegraphics-3.4.0/kpovmodeler/examples/includes/Makefile.in
---- kdegraphics-3.4.0.orig/kpovmodeler/examples/includes/Makefile.in 2005-03-04 13:27:34.000000000 +0100
-+++ kdegraphics-3.4.0/kpovmodeler/examples/includes/Makefile.in 2005-03-05 02:51:50.713882945 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -212,6 +212,9 @@
+diff -rua kdegraphics-3.4.1.orig/kpovmodeler/examples/includes/original/Makefile.in kdegraphics-3.4.1/kpovmodeler/examples/includes/original/Makefile.in
+--- kdegraphics-3.4.1.orig/kpovmodeler/examples/includes/original/Makefile.in 2005-05-23 18:01:24.000000000 +0200
++++ kdegraphics-3.4.1/kpovmodeler/examples/includes/original/Makefile.in 2005-05-25 08:29:51.886398594 +0200
+@@ -206,6 +206,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17960,8 +9912,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -398,7 +401,7 @@
- all: docs-am all-recursive
+@@ -397,7 +400,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -17969,7 +9921,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -436,9 +439,9 @@
+@@ -435,9 +438,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17981,70 +9933,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -458,7 +461,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -470,7 +479,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -478,7 +487,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -499,7 +514,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kpovmodeler/examples/includes/inlined/Makefile.in kdegraphics-3.4.0/kpovmodeler/examples/includes/inlined/Makefile.in
---- kdegraphics-3.4.0.orig/kpovmodeler/examples/includes/inlined/Makefile.in 2005-03-04 13:27:34.000000000 +0100
-+++ kdegraphics-3.4.0/kpovmodeler/examples/includes/inlined/Makefile.in 2005-03-05 02:51:50.721881574 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -206,6 +206,9 @@
+diff -rua kdegraphics-3.4.1.orig/kpovmodeler/examples/Makefile.in kdegraphics-3.4.1/kpovmodeler/examples/Makefile.in
+--- kdegraphics-3.4.1.orig/kpovmodeler/examples/Makefile.in 2005-05-23 18:01:24.000000000 +0200
++++ kdegraphics-3.4.1/kpovmodeler/examples/Makefile.in 2005-05-25 08:29:51.853401586 +0200
+@@ -212,6 +212,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18054,8 +9946,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
- all: docs-am all-am
+@@ -399,7 +402,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -18063,7 +9955,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -437,9 +440,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18075,21 +9967,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kpovmodeler/examples/includes/original/Makefile.in kdegraphics-3.4.0/kpovmodeler/examples/includes/original/Makefile.in
---- kdegraphics-3.4.0.orig/kpovmodeler/examples/includes/original/Makefile.in 2005-03-04 13:27:34.000000000 +0100
-+++ kdegraphics-3.4.0/kpovmodeler/examples/includes/original/Makefile.in 2005-03-05 02:51:50.728880374 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdegraphics-3.4.1.orig/kpovmodeler/examples/scenes/advanced/Makefile.in kdegraphics-3.4.1/kpovmodeler/examples/scenes/advanced/Makefile.in
+--- kdegraphics-3.4.1.orig/kpovmodeler/examples/scenes/advanced/Makefile.in 2005-05-23 18:01:24.000000000 +0200
++++ kdegraphics-3.4.1/kpovmodeler/examples/scenes/advanced/Makefile.in 2005-05-25 08:29:51.909396509 +0200
@@ -206,6 +206,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -18100,7 +9980,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
+@@ -394,7 +397,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18109,7 +9989,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -432,9 +435,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18121,22 +10001,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kpovmodeler/examples/scenes/Makefile.in kdegraphics-3.4.0/kpovmodeler/examples/scenes/Makefile.in
---- kdegraphics-3.4.0.orig/kpovmodeler/examples/scenes/Makefile.in 2005-03-04 13:27:34.000000000 +0100
-+++ kdegraphics-3.4.0/kpovmodeler/examples/scenes/Makefile.in 2005-03-05 02:51:50.742877973 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -212,6 +212,9 @@
+diff -rua kdegraphics-3.4.1.orig/kpovmodeler/examples/scenes/csg/Makefile.in kdegraphics-3.4.1/kpovmodeler/examples/scenes/csg/Makefile.in
+--- kdegraphics-3.4.1.orig/kpovmodeler/examples/scenes/csg/Makefile.in 2005-05-23 18:01:24.000000000 +0200
++++ kdegraphics-3.4.1/kpovmodeler/examples/scenes/csg/Makefile.in 2005-05-25 08:29:51.920395511 +0200
+@@ -206,6 +206,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18146,8 +10014,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -398,7 +401,7 @@
- all: docs-am all-recursive
+@@ -394,7 +397,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -18155,7 +10023,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -436,9 +439,9 @@
+@@ -432,9 +435,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18167,69 +10035,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -458,7 +461,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -470,7 +479,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -478,7 +487,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -499,7 +514,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kpovmodeler/examples/scenes/advanced/Makefile.in kdegraphics-3.4.0/kpovmodeler/examples/scenes/advanced/Makefile.in
---- kdegraphics-3.4.0.orig/kpovmodeler/examples/scenes/advanced/Makefile.in 2005-03-04 13:27:34.000000000 +0100
-+++ kdegraphics-3.4.0/kpovmodeler/examples/scenes/advanced/Makefile.in 2005-03-05 02:51:50.755875745 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdegraphics-3.4.1.orig/kpovmodeler/examples/scenes/interior/Makefile.in kdegraphics-3.4.1/kpovmodeler/examples/scenes/interior/Makefile.in
+--- kdegraphics-3.4.1.orig/kpovmodeler/examples/scenes/interior/Makefile.in 2005-05-23 18:01:24.000000000 +0200
++++ kdegraphics-3.4.1/kpovmodeler/examples/scenes/interior/Makefile.in 2005-05-25 08:29:51.930394604 +0200
@@ -206,6 +206,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -18240,7 +10048,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -394,7 +397,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18249,7 +10057,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -432,9 +435,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18261,21 +10069,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kpovmodeler/examples/scenes/csg/Makefile.in kdegraphics-3.4.0/kpovmodeler/examples/scenes/csg/Makefile.in
---- kdegraphics-3.4.0.orig/kpovmodeler/examples/scenes/csg/Makefile.in 2005-03-04 13:27:34.000000000 +0100
-+++ kdegraphics-3.4.0/kpovmodeler/examples/scenes/csg/Makefile.in 2005-03-05 02:51:50.762874545 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdegraphics-3.4.1.orig/kpovmodeler/examples/scenes/lights/Makefile.in kdegraphics-3.4.1/kpovmodeler/examples/scenes/lights/Makefile.in
+--- kdegraphics-3.4.1.orig/kpovmodeler/examples/scenes/lights/Makefile.in 2005-05-23 18:01:24.000000000 +0200
++++ kdegraphics-3.4.1/kpovmodeler/examples/scenes/lights/Makefile.in 2005-05-25 08:29:51.941393607 +0200
@@ -206,6 +206,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -18286,7 +10082,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -394,7 +397,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18295,7 +10091,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -432,9 +435,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18307,22 +10103,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kpovmodeler/examples/scenes/interior/Makefile.in kdegraphics-3.4.0/kpovmodeler/examples/scenes/interior/Makefile.in
---- kdegraphics-3.4.0.orig/kpovmodeler/examples/scenes/interior/Makefile.in 2005-03-04 13:27:34.000000000 +0100
-+++ kdegraphics-3.4.0/kpovmodeler/examples/scenes/interior/Makefile.in 2005-03-05 02:51:50.769873345 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -206,6 +206,9 @@
+diff -rua kdegraphics-3.4.1.orig/kpovmodeler/examples/scenes/Makefile.in kdegraphics-3.4.1/kpovmodeler/examples/scenes/Makefile.in
+--- kdegraphics-3.4.1.orig/kpovmodeler/examples/scenes/Makefile.in 2005-05-23 18:01:24.000000000 +0200
++++ kdegraphics-3.4.1/kpovmodeler/examples/scenes/Makefile.in 2005-05-25 08:29:51.899397415 +0200
+@@ -212,6 +212,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18332,8 +10116,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
- all: docs-am all-am
+@@ -399,7 +402,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -18341,7 +10125,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -437,9 +440,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18353,21 +10137,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kpovmodeler/examples/scenes/lights/Makefile.in kdegraphics-3.4.0/kpovmodeler/examples/scenes/lights/Makefile.in
---- kdegraphics-3.4.0.orig/kpovmodeler/examples/scenes/lights/Makefile.in 2005-03-04 13:27:34.000000000 +0100
-+++ kdegraphics-3.4.0/kpovmodeler/examples/scenes/lights/Makefile.in 2005-03-05 02:51:50.776872144 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdegraphics-3.4.1.orig/kpovmodeler/examples/scenes/objects/Makefile.in kdegraphics-3.4.1/kpovmodeler/examples/scenes/objects/Makefile.in
+--- kdegraphics-3.4.1.orig/kpovmodeler/examples/scenes/objects/Makefile.in 2005-05-23 18:01:24.000000000 +0200
++++ kdegraphics-3.4.1/kpovmodeler/examples/scenes/objects/Makefile.in 2005-05-25 08:29:51.952392610 +0200
@@ -206,6 +206,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -18378,7 +10150,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -396,7 +399,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18387,7 +10159,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -434,9 +437,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18399,22 +10171,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kpovmodeler/examples/scenes/objects/Makefile.in kdegraphics-3.4.0/kpovmodeler/examples/scenes/objects/Makefile.in
---- kdegraphics-3.4.0.orig/kpovmodeler/examples/scenes/objects/Makefile.in 2005-03-04 13:27:34.000000000 +0100
-+++ kdegraphics-3.4.0/kpovmodeler/examples/scenes/objects/Makefile.in 2005-03-05 02:51:50.807866830 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -206,6 +206,9 @@
+diff -rua kdegraphics-3.4.1.orig/kpovmodeler/Makefile.in kdegraphics-3.4.1/kpovmodeler/Makefile.in
+--- kdegraphics-3.4.1.orig/kpovmodeler/Makefile.in 2005-05-23 18:01:24.000000000 +0200
++++ kdegraphics-3.4.1/kpovmodeler/Makefile.in 2005-05-25 08:29:51.841402674 +0200
+@@ -440,6 +440,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18424,16 +10184,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -395,7 +398,7 @@
- all: docs-am all-am
+@@ -955,7 +958,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*) \
-@@ -433,9 +436,9 @@
+@@ -993,9 +996,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18443,24 +10203,12 @@
-$(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 -u -Nru -x debian kdegraphics-3.4.0.orig/kpovmodeler/pics/Makefile.in kdegraphics-3.4.0/kpovmodeler/pics/Makefile.in
---- kdegraphics-3.4.0.orig/kpovmodeler/pics/Makefile.in 2005-03-04 13:27:34.000000000 +0100
-+++ kdegraphics-3.4.0/kpovmodeler/pics/Makefile.in 2005-03-05 02:51:50.815865458 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -212,6 +212,9 @@
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+diff -rua kdegraphics-3.4.1.orig/kpovmodeler/pics/crystalsvg/Makefile.in kdegraphics-3.4.1/kpovmodeler/pics/crystalsvg/Makefile.in
+--- kdegraphics-3.4.1.orig/kpovmodeler/pics/crystalsvg/Makefile.in 2005-05-23 18:01:24.000000000 +0200
++++ kdegraphics-3.4.1/kpovmodeler/pics/crystalsvg/Makefile.in 2005-05-25 08:29:52.019386534 +0200
+@@ -196,6 +196,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18470,8 +10218,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -398,7 +401,7 @@
- all: docs-am all-recursive
+@@ -384,7 +387,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -18479,7 +10227,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -436,9 +439,9 @@
+@@ -422,9 +425,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18491,69 +10239,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -458,7 +461,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -470,7 +479,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -478,7 +487,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -499,7 +514,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kpovmodeler/pics/crystalsvg/Makefile.in kdegraphics-3.4.0/kpovmodeler/pics/crystalsvg/Makefile.in
---- kdegraphics-3.4.0.orig/kpovmodeler/pics/crystalsvg/Makefile.in 2005-03-04 13:27:34.000000000 +0100
-+++ kdegraphics-3.4.0/kpovmodeler/pics/crystalsvg/Makefile.in 2005-03-05 02:51:50.866856715 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdegraphics-3.4.1.orig/kpovmodeler/pics/locolor/Makefile.in kdegraphics-3.4.1/kpovmodeler/pics/locolor/Makefile.in
+--- kdegraphics-3.4.1.orig/kpovmodeler/pics/locolor/Makefile.in 2005-05-23 18:01:24.000000000 +0200
++++ kdegraphics-3.4.1/kpovmodeler/pics/locolor/Makefile.in 2005-05-25 08:29:52.046384086 +0200
@@ -196,6 +196,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -18564,7 +10252,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -383,7 +386,7 @@
+@@ -384,7 +387,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18573,7 +10261,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -421,9 +424,9 @@
+@@ -422,9 +425,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18585,901 +10273,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -566,473 +569,473 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=cr16-action-pminsertsibling.png cr22-action-pmnormalmapdeclare.png cr22-action-pmpolynom.png cr22-action-pmslopemap.png cr22-action-pmprojectedthrough.png cr22-action-pmblobsphere.png cr16-action-pmcolorlist.png cr16-action-pmaddpoint.png cr22-action-pmconfiguredialogview.png cr22-action-pmslope.png cr16-action-pmsqe.png cr22-action-pmintersection.png cr16-action-pmpigmentlist.png cr22-action-pmfinishdeclare.png cr16-action-pmlight.png cr16-action-pmaddsubprism.png cr16-action-pmquickcolor.png cr16-action-pmpolynom.png cr22-action-pmsor.png cr16-action-pmheightfield.png cr22-action-pmnormalmap.png cr22-action-pmdensitymapdeclare.png cr22-action-pmcolorlist.png cr16-action-pmdeclare.png cr22-action-pmpigmentdeclare.png cr22-action-pmboundedby.png cr22-action-pmtorus.png cr16-action-pminteriortexturedeclare.png cr16-action-pmaddpointabove.png cr16-action-pmnormaldeclare.png cr22-action-pmtexturelist.png cr22-action-pmsolidcolor.png cr22-action-pmquickcolor.png cr22-action-pmtexture.png cr16-action-pmdifference.png cr22-action-pmblob.png cr22-action-pmskyspheredeclare.png cr16-action-pmfinish.png cr22-action-pmmerge.png cr16-action-pmmaterialmap.png cr16-action-pmglview.png cr16-action-pmscale.png cr16-action-pmmaterial.png cr22-action-pmcolormapdeclare.png cr22-action-pmmaterialdeclare.png cr22-action-pmtexturemapdeclare.png cr22-action-pmdensitymap.png cr22-action-pmtranslate.png cr16-action-pmnormalmapdeclare.png cr16-action-pmsolidcolor.png cr22-action-pmunion.png cr22-action-pmrendersettings.png cr22-action-pmmaterialmap.png cr16-action-pmrenderpreview.png cr16-action-pmtext.png cr16-action-pmdrag.png cr16-action-pmisosurface.png cr16-action-pmbox.png cr16-action-pmslope.png cr16-action-pmpigment.png cr22-action-pmobjectlink.png cr16-action-pmtranslate.png cr22-action-pmpigmentmapdeclare.png cr16-action-pmrainbowdeclare.png cr16-action-pmtriangle.png cr16-action-pmphotons.png cr22-action-pmdifference.png cr22-action-pmraw.png cr22-action-pmnormaldeclare.png cr22-action-pmbox.png cr22-action-pmtexturemap.png cr22-action-pmfog.png cr22-action-pmconfiguregrid.png cr22-action-pminteriortexturedeclare.png cr16-action-pminteriordeclare.png cr16-action-pmcomment.png cr16-action-pmwarp.png cr22-action-pmclippedby.png cr16-action-pmdensitymapdeclare.png cr22-action-pmblobcylinder.png cr16-action-pmskysphere.png cr16-action-pmradiosity.png cr16-action-pmdialogview.png cr16-action-pmscene.png cr22-action-pmpigmentlist.png cr16-action-pminserterrors.png cr22-action-pminserterrors.png cr16-action-pmmaterialdeclare.png cr16-action-pmrotate.png cr22-action-pmdrag.png cr22-action-pmconfiguregraphicalview.png cr16-action-pmcamera.png cr16-action-pmboundedby.png cr22-action-pmrender.png cr22-action-pmpigmentmap.png cr22-action-pmlightgroup.png cr22-action-pmspheresweep.png cr22-action-pmsphere.png cr22-action-pmcolormap.png cr22-action-pmsqe.png cr16-action-pmtexturelist.png cr22-action-pmconfigureobjectlibrary.png cr16-action-pmbicubicpatch.png cr22-action-pminterior.png cr16-action-pmglobalphotons.png cr16-action-pmlistpattern.png cr22-action-pmpigment.png cr16-action-pmblobcylinder.png cr16-action-pmjuliafractal.png cr22-action-pmconfigurecolors.png cr22-action-pmlistpattern.png cr16-action-pmfogdeclare.png Makefile.am cr22-action-pmslopemapdeclare.png cr22-action-pmfinish.png cr16-action-pmdensitymap.png cr16-action-pmmesh.png cr22-action-pmtext.png cr16-action-pmobjectlink.png cr22-action-pmglobalsettings.png cr16-action-pmslopemap.png cr16-action-pmskyspheredeclare.png cr16-action-pmdensitylist.png cr16-action-pmlathe.png cr16-action-pmfinishdeclare.png cr22-action-pmcomment.png cr16-action-pmdensitydeclare.png cr16-action-pmrendersettings.png cr16-action-pmplane.png cr22-action-pmlookslike.png cr22-action-pmmatrix.png cr22-action-pminteriortexture.png cr16-action-pmunion.png cr22-action-pmnormallist.png cr16-action-pmmediadeclare.png cr22-action-pmplane.png cr16-action-pmobjectdeclare.png Makefile.in cr22-action-pmscene.png cr16-action-pmlightgroup.png cr22-action-pmimagemap.png cr16-action-pmclippedby.png cr16-action-pmtreeview.png cr22-action-pmradiosity.png cr16-action-pmsor.png cr22-action-pmobjectdeclare.png cr16-action-pminsertlastchild.png cr16-action-pmblendmapmodifiers.png cr22-action-pmconfigureopengl.png cr16-action-pmnormallist.png cr16-action-pmspheresweep.png cr16-action-pmsphere.png cr22-action-pmfogdeclare.png cr16-action-pmpigmentmapdeclare.png cr16-action-pmpigmentdeclare.png cr22-action-pmdensitylist.png cr22-action-pmjuliafractal.png cr16-action-pmglobalsettings.png cr16-action-pmlookslike.png cr22-action-pmdensitydeclare.png cr22-action-pmconfiguretexturepreview.png cr16-action-pminterior.png cr22-action-pmdensity.png cr22-action-pmscale.png cr22-action-pmmedia.png cr16-action-pmmatrix.png cr16-action-pmprojectedthrough.png cr16-action-pmrainbow.png cr22-action-pmskysphere.png cr16-action-pmbumpmap.png cr16-action-pmimagemap.png cr22-action-pmnormal.png cr22-action-pmconfigurepovray.png cr16-action-pmpattern.png cr16-action-pmtexturemapdeclare.png cr16-action-pminteriortexture.png cr16-action-pmcone.png cr16-action-pmtorus.png cr16-action-pmnormalmap.png cr16-action-pmtexturedeclare.png cr22-action-pmwarp.png cr22-action-pmtriangle.png cr16-action-pmremovepoint.png cr16-action-pmblob.png cr16-action-pmdensity.png cr16-action-pmfog.png cr22-action-pmprism.png cr16-action-pmpigmentmap.png cr16-action-pmtexture.png cr16-action-pmcylinder.png cr22-action-pmrainbowdeclare.png cr22-action-pmphotons.png cr22-action-pmblendmapmodifiers.png cr22-action-pmlathe.png cr16-action-pmrender.png cr16-action-pmcolormap.png cr16-action-pmdisc.png cr16-action-pminsertfirstchild.png cr22-action-pmtexturedeclare.png cr22-action-pmrotate.png cr22-action-pmcamera.png cr16-action-pmnormal.png cr16-action-pmprism.png cr22-action-pmdeclare.png cr22-action-pmheightfield.png cr22-action-pmglobalphotons.png cr22-action-pmconfigureviewlayout.png cr22-action-pmbumpmap.png cr22-action-pmmediadeclare.png cr22-action-pmrenderpreview.png cr16-action-pmintersection.png cr16-action-pmtexturemap.png cr16-action-pmmerge.png cr22-action-pmcylinder.png cr16-action-pmmedia.png cr22-action-pmconfigureobjects.png cr16-action-pmcolormapdeclare.png cr22-action-pmpattern.png cr22-action-pmmesh.png cr22-action-pmisosurface.png cr22-action-pmlight.png cr16-action-pmblobsphere.png cr22-action-pminteriordeclare.png cr22-action-pmdisc.png cr22-action-pmbicubicpatch.png cr22-action-pmrainbow.png cr16-action-pmraw.png cr22-action-pmmaterial.png cr16-action-pmslopemapdeclare.png cr22-action-pmcone.png
-+KDE_DIST=cr16-action-pminsertsibling.png cr22-action-pmnormalmapdeclare.png cr22-action-pmpolynom.png cr22-action-pmslopemap.png cr22-action-pmprojectedthrough.png cr22-action-pmblobsphere.png cr16-action-pmcolorlist.png cr16-action-pmaddpoint.png cr22-action-pmconfiguredialogview.png cr22-action-pmslope.png cr16-action-pmsqe.png cr22-action-pmintersection.png cr16-action-pmpigmentlist.png cr22-action-pmfinishdeclare.png cr16-action-pmlight.png cr16-action-pmaddsubprism.png cr16-action-pmquickcolor.png cr16-action-pmpolynom.png cr22-action-pmsor.png cr16-action-pmheightfield.png cr22-action-pmnormalmap.png cr22-action-pmdensitymapdeclare.png cr22-action-pmcolorlist.png cr16-action-pmdeclare.png cr22-action-pmpigmentdeclare.png cr22-action-pmboundedby.png cr22-action-pmtorus.png cr16-action-pminteriortexturedeclare.png cr16-action-pmaddpointabove.png cr16-action-pmnormaldeclare.png cr22-action-pmtexturelist.png cr22-action-pmsolidcolor.png cr22-action-pmquickcolor.png cr22-action-pmtexture.png cr16-action-pmdifference.png cr22-action-pmblob.png cr22-action-pmskyspheredeclare.png cr16-action-pmfinish.png cr22-action-pmmerge.png cr16-action-pmmaterialmap.png cr16-action-pmglview.png cr16-action-pmscale.png cr16-action-pmmaterial.png cr22-action-pmcolormapdeclare.png cr22-action-pmmaterialdeclare.png cr22-action-pmdensitymap.png cr22-action-pmtexturemapdeclare.png cr22-action-pmtranslate.png cr16-action-pmnormalmapdeclare.png cr16-action-pmsolidcolor.png cr22-action-pmunion.png cr22-action-pmrendersettings.png cr16-action-pmrenderpreview.png cr22-action-pmmaterialmap.png cr16-action-pmtext.png cr16-action-pmdrag.png cr16-action-pmbox.png cr16-action-pmisosurface.png cr16-action-pmslope.png cr16-action-pmpigment.png cr22-action-pmobjectlink.png cr16-action-pmtranslate.png cr16-action-pmrainbowdeclare.png cr22-action-pmpigmentmapdeclare.png cr16-action-pmtriangle.png cr16-action-pmphotons.png cr22-action-pmdifference.png cr22-action-pmraw.png cr22-action-pmnormaldeclare.png cr22-action-pmbox.png cr22-action-pmtexturemap.png cr22-action-pmfog.png cr22-action-pmconfiguregrid.png cr22-action-pminteriortexturedeclare.png cr16-action-pminteriordeclare.png cr16-action-pmcomment.png cr16-action-pmwarp.png cr22-action-pmclippedby.png cr16-action-pmdensitymapdeclare.png cr22-action-pmblobcylinder.png cr16-action-pmskysphere.png cr16-action-pmdialogview.png cr16-action-pmradiosity.png cr16-action-pmscene.png cr22-action-pmpigmentlist.png cr16-action-pminserterrors.png cr22-action-pminserterrors.png cr16-action-pmmaterialdeclare.png cr16-action-pmrotate.png cr22-action-pmdrag.png cr22-action-pmconfiguregraphicalview.png cr16-action-pmboundedby.png cr16-action-pmcamera.png cr22-action-pmrender.png cr22-action-pmpigmentmap.png cr22-action-pmlightgroup.png cr22-action-pmspheresweep.png cr22-action-pmsphere.png cr22-action-pmcolormap.png cr22-action-pmsqe.png cr16-action-pmtexturelist.png cr22-action-pmconfigureobjectlibrary.png cr16-action-pmbicubicpatch.png cr22-action-pminterior.png cr16-action-pmglobalphotons.png cr16-action-pmlistpattern.png cr22-action-pmpigment.png cr16-action-pmblobcylinder.png cr16-action-pmjuliafractal.png cr22-action-pmconfigurecolors.png cr16-action-pmfogdeclare.png cr22-action-pmlistpattern.png Makefile.am cr22-action-pmfinish.png cr22-action-pmslopemapdeclare.png cr16-action-pmdensitymap.png cr16-action-pmmesh.png cr22-action-pmtext.png cr16-action-pmobjectlink.png cr22-action-pmglobalsettings.png cr16-action-pmslopemap.png cr16-action-pmskyspheredeclare.png cr16-action-pmdensitylist.png cr16-action-pmlathe.png cr16-action-pmfinishdeclare.png cr22-action-pmcomment.png cr16-action-pmdensitydeclare.png cr16-action-pmrendersettings.png cr16-action-pmplane.png cr22-action-pmlookslike.png cr22-action-pminteriortexture.png cr22-action-pmmatrix.png cr16-action-pmunion.png cr22-action-pmnormallist.png cr16-action-pmmediadeclare.png cr22-action-pmplane.png cr16-action-pmobjectdeclare.png Makefile.in cr22-action-pmscene.png cr16-action-pmlightgroup.png cr22-action-pmimagemap.png cr16-action-pmclippedby.png cr16-action-pmtreeview.png cr22-action-pmradiosity.png cr16-action-pmsor.png cr22-action-pmobjectdeclare.png cr16-action-pminsertlastchild.png cr16-action-pmblendmapmodifiers.png cr22-action-pmconfigureopengl.png cr16-action-pmnormallist.png cr16-action-pmspheresweep.png cr16-action-pmsphere.png cr22-action-pmfogdeclare.png cr16-action-pmpigmentmapdeclare.png cr16-action-pmpigmentdeclare.png cr22-action-pmdensitylist.png cr22-action-pmjuliafractal.png cr16-action-pmglobalsettings.png cr16-action-pmlookslike.png cr22-action-pmdensitydeclare.png cr22-action-pmconfiguretexturepreview.png cr16-action-pminterior.png cr22-action-pmdensity.png cr22-action-pmscale.png cr22-action-pmmedia.png cr16-action-pmmatrix.png cr16-action-pmprojectedthrough.png cr16-action-pmrainbow.png cr22-action-pmskysphere.png cr16-action-pmbumpmap.png cr16-action-pmimagemap.png cr22-action-pmnormal.png cr22-action-pmconfigurepovray.png cr16-action-pmpattern.png cr16-action-pminteriortexture.png cr16-action-pmtexturemapdeclare.png cr16-action-pmcone.png cr16-action-pmtorus.png cr16-action-pmnormalmap.png cr16-action-pmtexturedeclare.png cr22-action-pmwarp.png cr16-action-pmremovepoint.png cr22-action-pmtriangle.png cr16-action-pmblob.png cr16-action-pmdensity.png cr16-action-pmfog.png cr22-action-pmprism.png cr16-action-pmpigmentmap.png cr16-action-pmtexture.png cr16-action-pmcylinder.png cr22-action-pmrainbowdeclare.png cr22-action-pmphotons.png cr22-action-pmblendmapmodifiers.png cr22-action-pmlathe.png cr16-action-pmrender.png cr16-action-pmcolormap.png cr16-action-pmdisc.png cr16-action-pminsertfirstchild.png cr22-action-pmtexturedeclare.png cr22-action-pmrotate.png cr16-action-pmnormal.png cr22-action-pmcamera.png cr16-action-pmprism.png cr22-action-pmdeclare.png cr22-action-pmheightfield.png cr22-action-pmconfigureviewlayout.png cr22-action-pmglobalphotons.png cr22-action-pmbumpmap.png cr22-action-pmmediadeclare.png cr22-action-pmrenderpreview.png cr16-action-pmintersection.png cr16-action-pmtexturemap.png cr16-action-pmmerge.png cr22-action-pmcylinder.png cr16-action-pmmedia.png cr22-action-pmconfigureobjects.png cr16-action-pmcolormapdeclare.png cr22-action-pmpattern.png cr22-action-pmmesh.png cr22-action-pmisosurface.png cr22-action-pmlight.png cr16-action-pmblobsphere.png cr22-action-pmdisc.png cr22-action-pminteriordeclare.png cr22-action-pmbicubicpatch.png cr22-action-pmrainbow.png cr16-action-pmraw.png cr16-action-pmslopemapdeclare.png cr22-action-pmmaterial.png cr22-action-pmcone.png
-
- #>+ 2
- docs-am:
-
- #>+ 462
- install-kde-icons:
-+ $(mkinstalldirs) $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmunion.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmunion.png
- $(mkinstalldirs) $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmaddpoint.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddpoint.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmaddpointabove.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddpointabove.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmaddsubprism.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddsubprism.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmbicubicpatch.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmbicubicpatch.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmblendmapmodifiers.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblendmapmodifiers.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmblob.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblob.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmblobcylinder.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblobcylinder.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmblobsphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblobsphere.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmboundedby.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmboundedby.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmbox.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmbox.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmlookslike.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlookslike.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdensitymapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitymapdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmblobcylinder.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblobcylinder.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmimagemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmimagemap.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmnormallist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormallist.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmtext.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtext.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmbumpmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmbumpmap.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmcamera.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcamera.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmclippedby.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmclippedby.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmcolorlist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolorlist.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmcolormap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolormap.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmcolormapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolormapdeclare.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmcomment.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcomment.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmcone.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcone.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmcylinder.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcylinder.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdeclare.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmdensity.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensity.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmdensitydeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitydeclare.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmdensitylist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitylist.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmdensitymap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitymap.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmglobalsettings.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmglobalsettings.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmspheresweep.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmspheresweep.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmquickcolor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmquickcolor.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmdensitymapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitymapdeclare.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmdialogview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdialogview.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmdifference.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdifference.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmdisc.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdisc.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmdrag.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdrag.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmfinish.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfinish.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmfinishdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfinishdeclare.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmfog.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfog.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmfogdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfogdeclare.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmglobalphotons.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglobalphotons.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmblob.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblob.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmtriangle.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtriangle.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtranslate.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtranslate.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmunion.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmunion.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmclippedby.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmclippedby.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmsor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsor.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmcone.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcone.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmsqe.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsqe.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmrender.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrender.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdensity.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensity.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmscale.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmscale.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmrenderpreview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrenderpreview.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmcolorlist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolorlist.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmtexturemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturemap.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmlightgroup.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlightgroup.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmcamera.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcamera.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmquickcolor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmquickcolor.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmnormalmapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormalmapdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmslopemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmslopemap.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmscale.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmscale.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmglobalsettings.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglobalsettings.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmglview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglview.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmheightfield.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmheightfield.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmimagemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmimagemap.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pminserterrors.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminserterrors.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pminsertfirstchild.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertfirstchild.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pminsertlastchild.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertlastchild.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pminsertsibling.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertsibling.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pminterior.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminterior.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pminteriordeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminteriordeclare.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pminteriortexture.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminteriortexture.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pminteriortexturedeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminteriortexturedeclare.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmintersection.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmintersection.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmisosurface.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmisosurface.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmjuliafractal.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmjuliafractal.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmlathe.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlathe.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmlight.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlight.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmmaterial.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmaterial.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pminteriortexturedeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriortexturedeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmwarp.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmwarp.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmfog.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfog.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmsolidcolor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsolidcolor.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmnormaldeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormaldeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmtexturemapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturemapdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmmedia.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmedia.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmtexturedeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturedeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdensitylist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitylist.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmaddsubprism.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddsubprism.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmmerge.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmerge.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtexturemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturemap.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmlightgroup.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlightgroup.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmlistpattern.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlistpattern.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmlookslike.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlookslike.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmmaterial.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmaterial.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmmaterialdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmaterialdeclare.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmmaterialmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmaterialmap.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmmatrix.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmatrix.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmfinish.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfinish.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmisosurface.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmisosurface.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmrotate.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrotate.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pminserterrors.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminserterrors.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfiguretexturepreview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguretexturepreview.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtexturemapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturemapdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmnormalmapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormalmapdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmnormalmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormalmap.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmglobalphotons.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglobalphotons.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmmedia.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmedia.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmmediadeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmediadeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmsor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsor.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtexture.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexture.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmsqe.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsqe.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdensitymap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitymap.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmmerge.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmerge.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmmesh.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmesh.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmnormal.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormal.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmnormaldeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormaldeclare.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmnormallist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormallist.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmnormalmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormalmap.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmnormalmapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormalmapdeclare.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmobjectdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmobjectdeclare.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmobjectlink.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmobjectlink.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmpattern.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpattern.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmphotons.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmphotons.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmpigment.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigment.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmpigmentdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentdeclare.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmpigmentlist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentlist.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmpigmentmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentmap.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmpigmentmapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentmapdeclare.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmplane.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmplane.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmpolynom.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpolynom.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmprism.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmprism.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmprojectedthrough.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmprojectedthrough.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmquickcolor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmquickcolor.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigurepovray.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigurepovray.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmobjectlink.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmobjectlink.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmmaterialdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmaterialdeclare.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmradiosity.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmradiosity.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmrainbow.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrainbow.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmrainbowdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrainbowdeclare.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmraw.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmraw.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmremovepoint.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmremovepoint.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmrender.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrender.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmrenderpreview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrenderpreview.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmrendersettings.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrendersettings.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmrotate.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrotate.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmscale.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmscale.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmscene.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmscene.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmskysphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmskysphere.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmskyspheredeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmskyspheredeclare.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmslope.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslope.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmslopemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslopemap.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmslopemapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslopemapdeclare.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmsolidcolor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsolidcolor.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmsor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsor.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmsphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsphere.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmspheresweep.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmspheresweep.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmsqe.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsqe.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmtext.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtext.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmtexture.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexture.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmtexturedeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturedeclare.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmtexturelist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturelist.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmtexturemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturemap.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmtexturemapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturemapdeclare.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmtorus.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtorus.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmtranslate.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtranslate.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmtreeview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtreeview.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmtriangle.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtriangle.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmunion.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmunion.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmwarp.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmwarp.png
-- $(mkinstalldirs) $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmbicubicpatch.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbicubicpatch.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmblendmapmodifiers.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblendmapmodifiers.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmblob.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblob.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmblobcylinder.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblobcylinder.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmblobsphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblobsphere.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmboundedby.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmboundedby.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmbox.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbox.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmbumpmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbumpmap.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmcamera.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcamera.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmclippedby.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmclippedby.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmcolorlist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolorlist.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmcolormap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolormap.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmcolormapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolormapdeclare.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmcomment.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcomment.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmcone.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcone.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigurecolors.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigurecolors.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfiguredialogview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguredialogview.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pminteriortexturedeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminteriortexturedeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmrainbow.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrainbow.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pminteriordeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriordeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmobjectdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmobjectdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmmatrix.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmatrix.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmisosurface.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmisosurface.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmremovepoint.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmremovepoint.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtexturedeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturedeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmpattern.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpattern.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmjuliafractal.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmjuliafractal.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdensitylist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitylist.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfiguregraphicalview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguregraphicalview.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfiguregrid.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguregrid.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigureobjectlibrary.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureobjectlibrary.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmmaterialmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmaterialmap.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmpigmentdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmblobsphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblobsphere.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmfog.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfog.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigureobjects.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureobjects.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigureopengl.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureopengl.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigurepovray.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigurepovray.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfiguretexturepreview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguretexturepreview.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigureviewlayout.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureviewlayout.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmcylinder.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcylinder.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pminserterrors.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminserterrors.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdensitymap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitymap.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmcomment.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcomment.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmobjectlink.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmobjectlink.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmlistpattern.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlistpattern.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdeclare.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmdensity.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensity.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmdensitydeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitydeclare.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmdensitylist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitylist.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmdensitymap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitymap.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmdensitymapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitymapdeclare.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmdifference.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdifference.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmdisc.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdisc.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmdrag.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdrag.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmfinish.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfinish.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmfinishdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfinishdeclare.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmfog.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfog.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmfogdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfogdeclare.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmglobalphotons.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmglobalphotons.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmglobalsettings.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmglobalsettings.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmheightfield.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmheightfield.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmimagemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmimagemap.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pminserterrors.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminserterrors.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pminterior.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminterior.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pminteriordeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriordeclare.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pminteriortexture.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriortexture.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pminteriortexturedeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriortexturedeclare.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmintersection.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmintersection.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmisosurface.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmisosurface.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmskysphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmskysphere.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmpigmentmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentmap.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmboundedby.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmboundedby.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmpolynom.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpolynom.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmblobsphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblobsphere.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmmaterialmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmaterialmap.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pminsertlastchild.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertlastchild.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmmesh.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmesh.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmblendmapmodifiers.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblendmapmodifiers.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmjuliafractal.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmjuliafractal.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmlathe.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlathe.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmlight.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlight.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmlightgroup.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlightgroup.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmsphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsphere.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmpigmentdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmmaterialdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmaterialdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmcolormapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolormapdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfiguredialogview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguredialogview.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmnormal.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormal.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmlistpattern.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlistpattern.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmlight.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlight.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmtorus.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtorus.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmfogdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfogdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmblendmapmodifiers.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblendmapmodifiers.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pminteriordeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminteriordeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmpigmentmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentmap.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmfinishdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfinishdeclare.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmlookslike.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlookslike.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmmaterial.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmaterial.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmmaterialdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmaterialdeclare.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmmaterialmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmaterialmap.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmmatrix.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmatrix.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmmedia.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmedia.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmpigment.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigment.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtriangle.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtriangle.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pminterior.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminterior.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmmediadeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmediadeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmglobalphotons.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmglobalphotons.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmlight.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlight.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmslopemapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmslopemapdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtorus.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtorus.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdensity.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensity.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmphotons.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmphotons.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmtranslate.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtranslate.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmrender.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrender.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdialogview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdialogview.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmpigmentmapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentmapdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmlathe.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlathe.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmobjectdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmobjectdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmcolormap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolormap.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmslope.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmslope.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmslopemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslopemap.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmcolorlist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolorlist.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmmaterial.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmaterial.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmpigmentmapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentmapdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmlathe.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlathe.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmmediadeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmediadeclare.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmmerge.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmerge.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmmesh.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmesh.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmnormal.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormal.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmnormaldeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormaldeclare.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmnormallist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormallist.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmpigmentlist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentlist.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdensitydeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitydeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdisc.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdisc.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmimagemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmimagemap.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmbox.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbox.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmslope.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslope.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pminsertfirstchild.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertfirstchild.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmfinish.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfinish.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmrotate.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrotate.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmclippedby.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmclippedby.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmcylinder.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcylinder.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigurecolors.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigurecolors.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmbumpmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbumpmap.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmheightfield.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmheightfield.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmslopemapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslopemapdeclare.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmnormalmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormalmap.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmnormalmapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormalmapdeclare.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmobjectdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmobjectdeclare.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmobjectlink.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmobjectlink.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmpattern.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpattern.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmphotons.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmphotons.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmpigment.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigment.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmpigmentdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmmesh.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmesh.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmrainbow.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrainbow.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmrainbowdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrainbowdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdrag.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdrag.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmpattern.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpattern.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmradiosity.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmradiosity.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmmatrix.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmatrix.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmscene.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmscene.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmpigmentlist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentlist.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmpigmentmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentmap.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmpigmentmapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentmapdeclare.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmplane.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmplane.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmpolynom.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpolynom.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmcamera.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcamera.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdensitydeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitydeclare.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmprism.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmprism.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmprojectedthrough.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmprojectedthrough.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmquickcolor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmquickcolor.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmradiosity.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmradiosity.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmrainbow.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrainbow.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmrainbowdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrainbowdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmfinishdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfinishdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigureviewlayout.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureviewlayout.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmskyspheredeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmskyspheredeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmbicubicpatch.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmbicubicpatch.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmraw.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmraw.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmrender.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrender.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmrenderpreview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrenderpreview.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtexturelist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturelist.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmscene.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmscene.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pminteriortexture.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriortexture.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmbox.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmbox.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtext.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtext.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmprism.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmprism.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmheightfield.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmheightfield.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pminsertsibling.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertsibling.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmrendersettings.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrendersettings.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmrotate.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrotate.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmscale.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmscale.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmscene.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmscene.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmskysphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmskysphere.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmpolynom.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpolynom.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmplane.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmplane.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmrainbowdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrainbowdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmblob.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblob.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigureopengl.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureopengl.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmskyspheredeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmskyspheredeclare.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmslope.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmslope.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmslopemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmslopemap.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmslopemapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmslopemapdeclare.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmsolidcolor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsolidcolor.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmsor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsor.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmcone.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcone.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfiguregrid.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguregrid.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmsphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsphere.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmspheresweep.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmspheresweep.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmsqe.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsqe.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmtext.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtext.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigureobjectlibrary.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureobjectlibrary.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmtexture.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexture.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmtexturedeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturedeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmprojectedthrough.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmprojectedthrough.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmrenderpreview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrenderpreview.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmplane.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmplane.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtreeview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtreeview.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmnormal.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormal.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmtexturelist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturelist.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmtexturemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturemap.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmtexturemapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturemapdeclare.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmtorus.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtorus.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmtranslate.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtranslate.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmtriangle.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtriangle.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmunion.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmunion.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmwarp.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmwarp.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmbicubicpatch.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbicubicpatch.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmglview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglview.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmintersection.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmintersection.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdifference.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdifference.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdisc.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdisc.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmpigment.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigment.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmwarp.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmwarp.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmrendersettings.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrendersettings.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pminterior.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminterior.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmphotons.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmphotons.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmblobcylinder.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblobcylinder.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmraw.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmraw.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmnormaldeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormaldeclare.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-pmprojectedthrough.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmprojectedthrough.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmcomment.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcomment.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pminteriortexture.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminteriortexture.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmboundedby.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmboundedby.png
-+ $(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
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddpoint.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddpointabove.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddsubprism.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmbicubicpatch.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblendmapmodifiers.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblob.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblobcylinder.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblobsphere.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmboundedby.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmbox.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmunion.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlookslike.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitymapdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblobcylinder.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmimagemap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormallist.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtext.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmbumpmap.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcamera.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmclippedby.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolorlist.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolormap.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolormapdeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcomment.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcone.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcylinder.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensity.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitydeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitylist.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitymap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmglobalsettings.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmspheresweep.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmquickcolor.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitymapdeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdialogview.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdifference.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdisc.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdrag.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfinish.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfinishdeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfog.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfogdeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglobalphotons.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblob.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtriangle.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtranslate.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmunion.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmclippedby.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsor.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcone.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsqe.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrender.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensity.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmscale.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrenderpreview.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolorlist.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturemap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlightgroup.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcamera.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmquickcolor.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormalmapdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmslopemap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmscale.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglobalsettings.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglview.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmheightfield.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmimagemap.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminserterrors.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertfirstchild.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertlastchild.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertsibling.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminterior.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminteriordeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminteriortexture.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminteriortexturedeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmintersection.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmisosurface.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmjuliafractal.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlathe.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlight.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmaterial.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriortexturedeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmwarp.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfog.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsolidcolor.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormaldeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturemapdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmedia.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturedeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitylist.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddsubprism.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmerge.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturemap.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlightgroup.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlistpattern.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlookslike.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmaterial.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmaterialdeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmaterialmap.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmatrix.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmedia.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmediadeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmerge.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmesh.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormal.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormaldeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormallist.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormalmap.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormalmapdeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmobjectdeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmobjectlink.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpattern.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmphotons.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigment.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentdeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentlist.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentmap.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentmapdeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmplane.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpolynom.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmprism.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmprojectedthrough.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmquickcolor.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmradiosity.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrainbow.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrainbowdeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmraw.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmremovepoint.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrender.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrenderpreview.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrendersettings.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfinish.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmisosurface.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrotate.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmscale.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmscene.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmskysphere.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmskyspheredeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslope.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslopemap.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslopemapdeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsolidcolor.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminserterrors.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguretexturepreview.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturemapdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormalmapdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormalmap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglobalphotons.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmedia.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsor.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsphere.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmspheresweep.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsqe.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtext.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexture.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturedeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturelist.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturemap.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturemapdeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtorus.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtranslate.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtreeview.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtriangle.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmunion.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmwarp.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbicubicpatch.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblendmapmodifiers.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblob.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblobcylinder.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblobsphere.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmboundedby.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbox.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbumpmap.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcamera.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmclippedby.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolorlist.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolormap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsqe.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitymap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmerge.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigurepovray.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmobjectlink.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmaterialdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmradiosity.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsolidcolor.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolormapdeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcomment.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcone.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigurecolors.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguredialogview.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminteriortexturedeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrainbow.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriordeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmobjectdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmatrix.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmisosurface.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmremovepoint.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturedeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpattern.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmjuliafractal.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitylist.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguregraphicalview.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguregrid.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureobjectlibrary.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmaterialmap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblobsphere.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfog.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureobjects.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureopengl.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigurepovray.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguretexturepreview.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureviewlayout.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcylinder.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminserterrors.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitymap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcomment.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmobjectlink.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlistpattern.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensity.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitydeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitylist.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitymap.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitymapdeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdifference.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdisc.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdrag.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfinish.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfinishdeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfog.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfogdeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmglobalphotons.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmglobalsettings.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmheightfield.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmimagemap.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminserterrors.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminterior.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriordeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriortexture.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriortexturedeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmintersection.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmisosurface.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmskysphere.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentmap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmboundedby.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpolynom.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblobsphere.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmaterialmap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertlastchild.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmesh.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblendmapmodifiers.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmjuliafractal.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlathe.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlight.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlightgroup.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsphere.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmaterialdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolormapdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguredialogview.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormal.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlistpattern.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlight.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtorus.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfogdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblendmapmodifiers.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminteriordeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentmap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfinishdeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlookslike.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmaterial.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmaterialdeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmaterialmap.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmatrix.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmedia.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigment.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtriangle.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminterior.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmediadeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmglobalphotons.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlight.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmslopemapdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtorus.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensity.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmphotons.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtranslate.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrender.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdialogview.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentmapdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlathe.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmobjectdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolormap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmslope.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslopemap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolorlist.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmaterial.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentmapdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlathe.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmediadeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmerge.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmesh.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormal.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormaldeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormallist.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentlist.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitydeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdisc.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmimagemap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbox.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslope.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertfirstchild.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfinish.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrotate.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmclippedby.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcylinder.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigurecolors.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbumpmap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmheightfield.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslopemapdeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormalmap.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormalmapdeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmobjectdeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmobjectlink.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpattern.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmphotons.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigment.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmesh.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrainbow.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrainbowdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdrag.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpattern.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmradiosity.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmatrix.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmscene.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentlist.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentmap.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentmapdeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmplane.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpolynom.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcamera.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitydeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmprism.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmprojectedthrough.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmquickcolor.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmradiosity.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrainbow.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrainbowdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfinishdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureviewlayout.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmskyspheredeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmbicubicpatch.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmraw.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrender.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrenderpreview.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturelist.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmscene.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriortexture.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmbox.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtext.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmprism.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmheightfield.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertsibling.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrendersettings.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrotate.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmscale.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmscene.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmskysphere.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpolynom.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmplane.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrainbowdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblob.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureopengl.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmskyspheredeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmslope.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmslopemap.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmslopemapdeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsolidcolor.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsor.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcone.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguregrid.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsphere.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmspheresweep.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsqe.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtext.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureobjectlibrary.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexture.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturedeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmprojectedthrough.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrenderpreview.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmplane.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtreeview.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormal.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturelist.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturemap.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturemapdeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtorus.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtranslate.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtriangle.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmunion.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmwarp.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbicubicpatch.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglview.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmintersection.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdifference.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdisc.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigment.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmwarp.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrendersettings.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminterior.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmphotons.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblobcylinder.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmraw.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormaldeclare.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/pmprojectedthrough.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcomment.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminteriortexture.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmboundedby.png
-+ -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 -u -Nru -x debian kdegraphics-3.4.0.orig/kpovmodeler/pics/locolor/Makefile.in kdegraphics-3.4.0/kpovmodeler/pics/locolor/Makefile.in
---- kdegraphics-3.4.0.orig/kpovmodeler/pics/locolor/Makefile.in 2005-03-04 13:27:34.000000000 +0100
-+++ kdegraphics-3.4.0/kpovmodeler/pics/locolor/Makefile.in 2005-03-05 02:51:50.885853457 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -196,6 +196,9 @@
+diff -rua kdegraphics-3.4.1.orig/kpovmodeler/pics/Makefile.in kdegraphics-3.4.1/kpovmodeler/pics/Makefile.in
+--- kdegraphics-3.4.1.orig/kpovmodeler/pics/Makefile.in 2005-05-23 18:01:24.000000000 +0200
++++ kdegraphics-3.4.1/kpovmodeler/pics/Makefile.in 2005-05-25 08:29:51.963391612 +0200
+@@ -212,6 +212,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19489,8 +10286,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -383,7 +386,7 @@
- all: docs-am all-am
+@@ -399,7 +402,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -19498,7 +10295,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -421,9 +424,9 @@
+@@ -437,9 +440,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19510,323 +10307,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -574,156 +577,156 @@
- #>+ 153
- install-kde-icons:
- $(mkinstalldirs) $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmaddpoint.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddpoint.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmaddpointabove.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddpointabove.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmaddsubprism.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddsubprism.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmbicubicpatch.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbicubicpatch.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmblendmapmodifiers.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblendmapmodifiers.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmblob.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblob.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmblobcylinder.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblobcylinder.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmblobsphere.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblobsphere.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmboundedby.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmboundedby.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmbox.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbox.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmheightfield.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmheightfield.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmlight.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlight.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmtorus.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtorus.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmbumpmap.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbumpmap.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmcamera.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcamera.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmclippedby.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmclippedby.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmcomment.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcomment.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmcone.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcone.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmcylinder.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcylinder.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdeclare.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmdensity.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensity.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmdensitydeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitydeclare.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmdensitylist.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitylist.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmdensitymap.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitymap.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmdensitymapdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitymapdeclare.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmdifference.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdifference.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmrendersettings.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrendersettings.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmlathe.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlathe.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmbox.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbox.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmrender.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrender.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmdisc.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdisc.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmdrag.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdrag.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmfog.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmfog.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmfogdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmfogdeclare.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmglobalsettings.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmglobalsettings.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmheightfield.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmheightfield.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmimagemap.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmimagemap.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pminserterrors.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminserterrors.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pminsertfirstchild.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertfirstchild.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pminsertlastchild.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertlastchild.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pminsertsibling.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertsibling.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmintersection.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmintersection.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmdifference.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdifference.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmtexture.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtexture.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmdrag.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdrag.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmjuliafractal.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmjuliafractal.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmlathe.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlathe.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmlight.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlight.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmlistpattern.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlistpattern.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmlookslike.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlookslike.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmmaterialmap.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmaterialmap.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmmatrix.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmatrix.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmmerge.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmerge.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pminsertfirstchild.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertfirstchild.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmobjectdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmobjectdeclare.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmobjectlink.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmobjectlink.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmpigment.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpigment.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmpigmentdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpigmentdeclare.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmplane.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmplane.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmpolynom.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpolynom.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmprism.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmprism.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmquickcolor.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmquickcolor.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmrainbow.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrainbow.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmrainbowdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrainbowdeclare.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmraw.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmraw.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmremovepoint.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmremovepoint.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmrender.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrender.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmrenderpreview.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrenderpreview.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmrendersettings.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrendersettings.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmrotate.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrotate.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmscale.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmscale.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmscene.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmscene.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmskysphere.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmskysphere.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmprism.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmprism.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmraw.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmraw.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmglobalsettings.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmglobalsettings.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmtext.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtext.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmcomment.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcomment.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmmatrix.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmatrix.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmclippedby.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmclippedby.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmblob.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblob.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmplane.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmplane.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmskyspheredeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmskyspheredeclare.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmcone.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcone.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmquickcolor.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmquickcolor.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmtexturedeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtexturedeclare.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmsphere.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsphere.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmaddpoint.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddpoint.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmimagemap.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmimagemap.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmdensity.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensity.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmdensitylist.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitylist.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmaddsubprism.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddsubprism.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmsolidcolor.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsolidcolor.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmcylinder.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcylinder.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmdensitymapdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitymapdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmunion.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmunion.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmpigmentdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpigmentdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmdensitymap.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitymap.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmobjectlink.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmobjectlink.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pminsertlastchild.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertlastchild.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmremovepoint.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmremovepoint.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmsor.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsor.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmsphere.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsphere.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmmaterialmap.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmaterialmap.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmskysphere.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmskysphere.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmsqr.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsqr.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmtext.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtext.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmtexture.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtexture.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmtexturedeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtexturedeclare.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmtorus.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtorus.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmboundedby.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmboundedby.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmlistpattern.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlistpattern.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmscale.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmscale.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmblobsphere.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblobsphere.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmrainbow.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrainbow.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmfog.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmfog.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmbicubicpatch.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbicubicpatch.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmfogdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmfogdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmlookslike.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlookslike.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pminsertsibling.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertsibling.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmmerge.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmerge.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmcamera.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcamera.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmtranslate.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtranslate.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmpolynom.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpolynom.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmrenderpreview.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrenderpreview.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmintersection.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmintersection.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmblobcylinder.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblobcylinder.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmdensitydeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitydeclare.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmpigment.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpigment.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmaddpointabove.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddpointabove.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmblendmapmodifiers.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblendmapmodifiers.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmrainbowdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrainbowdeclare.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmtriangle.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtriangle.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmunion.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmunion.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddpoint.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddpointabove.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddsubprism.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbicubicpatch.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblendmapmodifiers.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblob.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblobcylinder.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblobsphere.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmboundedby.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbox.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmheightfield.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlight.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtorus.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbumpmap.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcamera.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmclippedby.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcomment.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcone.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcylinder.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensity.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitydeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitylist.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitymap.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitymapdeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdifference.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrendersettings.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlathe.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbox.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrender.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdisc.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdrag.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmfog.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmfogdeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmglobalsettings.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmheightfield.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmimagemap.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminserterrors.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertfirstchild.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertlastchild.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertsibling.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmintersection.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdifference.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtexture.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdrag.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmjuliafractal.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlathe.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlight.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlistpattern.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlookslike.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmaterialmap.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmatrix.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmerge.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertfirstchild.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmobjectdeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmobjectlink.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpigment.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpigmentdeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmplane.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpolynom.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmprism.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmquickcolor.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrainbow.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrainbowdeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmraw.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmremovepoint.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrender.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrenderpreview.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrendersettings.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrotate.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmscale.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmscene.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmskysphere.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmprism.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmraw.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmglobalsettings.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtext.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcomment.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmatrix.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmclippedby.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblob.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmplane.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmskyspheredeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcone.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmquickcolor.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtexturedeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsphere.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddpoint.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmimagemap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensity.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitylist.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddsubprism.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsolidcolor.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcylinder.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitymapdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmunion.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpigmentdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitymap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmobjectlink.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertlastchild.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmremovepoint.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsor.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsphere.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmaterialmap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmskysphere.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsqr.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtext.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtexture.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtexturedeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtorus.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmboundedby.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlistpattern.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmscale.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblobsphere.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrainbow.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmfog.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbicubicpatch.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmfogdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlookslike.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertsibling.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmerge.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcamera.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtranslate.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpolynom.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrenderpreview.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmintersection.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblobcylinder.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitydeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpigment.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddpointabove.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblendmapmodifiers.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrainbowdeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtriangle.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmunion.png
-
- #>+ 15
- force-reedit:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kruler/Makefile.in kdegraphics-3.4.0/kruler/Makefile.in
---- kdegraphics-3.4.0.orig/kruler/Makefile.in 2005-03-04 13:27:34.000000000 +0100
-+++ kdegraphics-3.4.0/kruler/Makefile.in 2005-03-05 02:51:50.924846771 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -73,18 +73,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kruler_SOURCES)
- DIST_SOURCES = $(kruler_SOURCES)
+diff -rua kdegraphics-3.4.1.orig/kruler/Makefile.in kdegraphics-3.4.1/kruler/Makefile.in
+--- kdegraphics-3.4.1.orig/kruler/Makefile.in 2005-05-23 18:01:24.000000000 +0200
++++ kdegraphics-3.4.1/kruler/Makefile.in 2005-05-25 08:29:52.070381910 +0200
@@ -261,6 +261,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -19837,7 +10320,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -458,7 +461,7 @@
+@@ -459,7 +462,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19846,7 +10329,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -496,9 +499,9 @@
+@@ -497,9 +500,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19858,69 +10341,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -630,7 +633,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -642,7 +651,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -650,7 +659,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -671,7 +686,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kruler/pics/Makefile.in kdegraphics-3.4.0/kruler/pics/Makefile.in
---- kdegraphics-3.4.0.orig/kruler/pics/Makefile.in 2005-03-04 13:27:34.000000000 +0100
-+++ kdegraphics-3.4.0/kruler/pics/Makefile.in 2005-03-05 02:51:50.939844200 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdegraphics-3.4.1.orig/kruler/pics/Makefile.in kdegraphics-3.4.1/kruler/pics/Makefile.in
+--- kdegraphics-3.4.1.orig/kruler/pics/Makefile.in 2005-05-23 18:01:24.000000000 +0200
++++ kdegraphics-3.4.1/kruler/pics/Makefile.in 2005-05-25 08:29:52.082380822 +0200
@@ -206,6 +206,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -19931,7 +10354,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -395,7 +398,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19940,7 +10363,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -433,9 +436,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19952,64 +10375,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -604,16 +607,16 @@
-
- #>+ 13
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kruler.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kruler.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-kruler.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kruler.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kruler.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kruler.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-kruler.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kruler.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kruler.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kruler.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kruler.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kruler.png
-
- #>+ 15
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/ksnapshot/Makefile.in kdegraphics-3.4.0/ksnapshot/Makefile.in
---- kdegraphics-3.4.0.orig/ksnapshot/Makefile.in 2005-03-04 13:27:34.000000000 +0100
-+++ kdegraphics-3.4.0/ksnapshot/Makefile.in 2005-03-05 02:51:50.997834256 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -74,18 +74,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(ksnapshot_SOURCES)
- DIST_SOURCES = $(ksnapshot_SOURCES)
+diff -rua kdegraphics-3.4.1.orig/ksnapshot/Makefile.in kdegraphics-3.4.1/ksnapshot/Makefile.in
+--- kdegraphics-3.4.1.orig/ksnapshot/Makefile.in 2005-05-23 18:01:24.000000000 +0200
++++ kdegraphics-3.4.1/ksnapshot/Makefile.in 2005-05-25 08:29:52.183371664 +0200
@@ -246,6 +246,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -20020,7 +10388,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -445,7 +448,7 @@
+@@ -446,7 +449,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20029,7 +10397,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -483,9 +486,9 @@
+@@ -484,9 +487,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20041,187 +10409,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -805,19 +808,19 @@
-
- #>+ 16
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-ksnapshot.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksnapshot.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-ksnapshot.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksnapshot.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-ksnapshot.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ksnapshot.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-ksnapshot.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksnapshot.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-ksnapshot.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksnapshot.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
- $(INSTALL_DATA) $(srcdir)/crsc-app-ksnapshot.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/ksnapshot.svgz
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksnapshot.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksnapshot.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ksnapshot.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksnapshot.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksnapshot.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/ksnapshot.svgz
-
- #>+ 15
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/ksvg/Makefile.in kdegraphics-3.4.0/ksvg/Makefile.in
---- kdegraphics-3.4.0.orig/ksvg/Makefile.in 2005-03-04 13:27:34.000000000 +0100
-+++ kdegraphics-3.4.0/ksvg/Makefile.in 2005-03-05 02:51:51.058823798 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -80,18 +80,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libksvg_la_SOURCES)
- DIST_SOURCES = $(libksvg_la_SOURCES)
-@@ -258,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@
-@@ -456,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*) \
-@@ -494,9 +497,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)
-@@ -577,7 +580,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -589,7 +598,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -597,7 +606,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -618,7 +633,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/ksvg/core/Makefile.in kdegraphics-3.4.0/ksvg/core/Makefile.in
---- kdegraphics-3.4.0.orig/ksvg/core/Makefile.in 2005-03-04 13:27:34.000000000 +0100
-+++ kdegraphics-3.4.0/ksvg/core/Makefile.in 2005-03-05 02:51:51.000000000 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -71,18 +71,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libksvgcore_la_SOURCES)
- DIST_SOURCES = $(libksvgcore_la_SOURCES)
+diff -rua kdegraphics-3.4.1.orig/ksvg/core/Makefile.in kdegraphics-3.4.1/ksvg/core/Makefile.in
+--- kdegraphics-3.4.1.orig/ksvg/core/Makefile.in 2005-05-23 18:01:24.000000000 +0200
++++ kdegraphics-3.4.1/ksvg/core/Makefile.in 2005-05-25 08:29:52.222368127 +0200
@@ -247,6 +247,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -20232,7 +10422,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -443,7 +446,7 @@
+@@ -444,7 +447,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -20241,7 +10431,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -481,9 +484,9 @@
+@@ -482,9 +485,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20253,44 +10443,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/ksvg/dom/Makefile.in kdegraphics-3.4.0/ksvg/dom/Makefile.in
---- kdegraphics-3.4.0.orig/ksvg/dom/Makefile.in 2005-03-04 13:27:34.000000000 +0100
-+++ kdegraphics-3.4.0/ksvg/dom/Makefile.in 2005-03-05 02:51:51.000000000 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -189,18 +189,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libksvgdom_la_SOURCES)
- DIST_SOURCES = $(libksvgdom_la_SOURCES)
+diff -rua kdegraphics-3.4.1.orig/ksvg/dom/Makefile.in kdegraphics-3.4.1/ksvg/dom/Makefile.in
+--- kdegraphics-3.4.1.orig/ksvg/dom/Makefile.in 2005-05-23 18:01:24.000000000 +0200
++++ kdegraphics-3.4.1/ksvg/dom/Makefile.in 2005-05-25 08:29:52.280362868 +0200
@@ -362,6 +362,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -20301,7 +10456,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -604,7 +607,7 @@
+@@ -605,7 +608,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -20310,7 +10465,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -642,9 +645,9 @@
+@@ -643,9 +646,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20322,44 +10477,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/ksvg/ecma/Makefile.in kdegraphics-3.4.0/ksvg/ecma/Makefile.in
---- kdegraphics-3.4.0.orig/ksvg/ecma/Makefile.in 2005-03-04 13:27:34.000000000 +0100
-+++ kdegraphics-3.4.0/ksvg/ecma/Makefile.in 2005-03-05 02:51:51.000000000 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -69,18 +69,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libksvgecma_la_SOURCES)
- DIST_SOURCES = $(libksvgecma_la_SOURCES)
+diff -rua kdegraphics-3.4.1.orig/ksvg/ecma/Makefile.in kdegraphics-3.4.1/ksvg/ecma/Makefile.in
+--- kdegraphics-3.4.1.orig/ksvg/ecma/Makefile.in 2005-05-23 18:01:24.000000000 +0200
++++ kdegraphics-3.4.1/ksvg/ecma/Makefile.in 2005-05-25 08:29:52.297361327 +0200
@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -20370,7 +10490,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -424,7 +427,7 @@
+@@ -425,7 +428,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20379,7 +10499,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -462,9 +465,9 @@
+@@ -463,9 +466,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20391,45 +10511,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/ksvg/impl/Makefile.in kdegraphics-3.4.0/ksvg/impl/Makefile.in
---- kdegraphics-3.4.0.orig/ksvg/impl/Makefile.in 2005-03-04 13:27:34.000000000 +0100
-+++ kdegraphics-3.4.0/ksvg/impl/Makefile.in 2005-03-05 02:51:51.432759679 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -220,18 +220,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libksvgdomimpl_la_SOURCES)
- DIST_SOURCES = $(libksvgdomimpl_la_SOURCES)
-@@ -398,6 +398,9 @@
+diff -rua kdegraphics-3.4.1.orig/ksvg/impl/libs/art_support/Makefile.in kdegraphics-3.4.1/ksvg/impl/libs/art_support/Makefile.in
+--- kdegraphics-3.4.1.orig/ksvg/impl/libs/art_support/Makefile.in 2005-05-23 18:01:24.000000000 +0200
++++ kdegraphics-3.4.1/ksvg/impl/libs/art_support/Makefile.in 2005-05-25 08:29:52.401351897 +0200
+@@ -223,6 +223,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20439,16 +10524,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -697,7 +700,7 @@
+@@ -413,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*) \
-@@ -735,9 +738,9 @@
+@@ -451,9 +454,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20460,107 +10545,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -974,7 +977,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -986,7 +995,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -994,7 +1003,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -1015,7 +1030,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1242,18 +1257,18 @@
- mocs: SVGScriptElementImpl.moc
-
- #>+ 3
--SVGImageElementImpl.moc: $(srcdir)/SVGImageElementImpl.h
-- $(MOC) $(srcdir)/SVGImageElementImpl.h -o SVGImageElementImpl.moc
-+SVGDocumentImpl.moc: $(srcdir)/SVGDocumentImpl.h
-+ $(MOC) $(srcdir)/SVGDocumentImpl.h -o SVGDocumentImpl.moc
-
- #>+ 2
--mocs: SVGImageElementImpl.moc
-+mocs: SVGDocumentImpl.moc
-
- #>+ 3
--SVGDocumentImpl.moc: $(srcdir)/SVGDocumentImpl.h
-- $(MOC) $(srcdir)/SVGDocumentImpl.h -o SVGDocumentImpl.moc
-+SVGImageElementImpl.moc: $(srcdir)/SVGImageElementImpl.h
-+ $(MOC) $(srcdir)/SVGImageElementImpl.h -o SVGImageElementImpl.moc
-
- #>+ 2
--mocs: SVGDocumentImpl.moc
-+mocs: SVGImageElementImpl.moc
-
- #>+ 3
- SVGTimeScheduler.moc: $(srcdir)/SVGTimeScheduler.h
-@@ -1264,10 +1279,10 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f SVGScriptElementImpl.moc SVGImageElementImpl.moc SVGDocumentImpl.moc SVGTimeScheduler.moc
-+ -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 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 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 SVGAnimatedPathDataImpl.h SVGAnimatedEnumerationImpl.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 SVGZoomEventImpl.h SVGVKernElementImpl.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 SVGScriptElementImpl.h SVGDocumentImpl.h SVGPathSegCurvetoQuadraticSmoothImpl.h SVGAnimatedTransformListImpl.h SVGCSSRuleImpl.h SVGContainerImpl.h SVGEcma.h SVGPolylineElementImpl.h SVGCursorElementImpl.h SVGMetadataElementImpl.h SVGLengthListImpl.h SVGLangSpaceImpl.h SVGFEBlendElementImpl.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:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/ksvg/impl/libs/Makefile.in kdegraphics-3.4.0/ksvg/impl/libs/Makefile.in
---- kdegraphics-3.4.0.orig/ksvg/impl/libs/Makefile.in 2005-03-04 13:27:34.000000000 +0100
-+++ kdegraphics-3.4.0/ksvg/impl/libs/Makefile.in 2005-03-05 02:51:51.000000000 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdegraphics-3.4.1.orig/ksvg/impl/libs/libtext2path/Makefile.in kdegraphics-3.4.1/ksvg/impl/libs/libtext2path/Makefile.in
+--- kdegraphics-3.4.1.orig/ksvg/impl/libs/libtext2path/Makefile.in 2005-05-23 18:01:24.000000000 +0200
++++ kdegraphics-3.4.1/ksvg/impl/libs/libtext2path/Makefile.in 2005-05-25 08:29:52.413350808 +0200
@@ -212,6 +212,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -20571,7 +10558,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -398,7 +401,7 @@
+@@ -400,7 +403,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -20580,7 +10567,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -436,9 +439,9 @@
+@@ -438,9 +441,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20592,84 +10579,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -458,7 +461,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -470,7 +479,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -478,7 +487,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -499,7 +514,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/ksvg/impl/libs/art_support/Makefile.in kdegraphics-3.4.0/ksvg/impl/libs/art_support/Makefile.in
---- kdegraphics-3.4.0.orig/ksvg/impl/libs/art_support/Makefile.in 2005-03-04 13:27:34.000000000 +0100
-+++ kdegraphics-3.4.0/ksvg/impl/libs/art_support/Makefile.in 2005-03-05 02:51:51.000000000 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -66,11 +66,11 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libksvgart_la_SOURCES)
- DIST_SOURCES = $(libksvgart_la_SOURCES)
-@@ -223,6 +223,9 @@
+diff -rua kdegraphics-3.4.1.orig/ksvg/impl/libs/libtext2path/src/Makefile.in kdegraphics-3.4.1/ksvg/impl/libs/libtext2path/src/Makefile.in
+--- kdegraphics-3.4.1.orig/ksvg/impl/libs/libtext2path/src/Makefile.in 2005-05-23 18:01:24.000000000 +0200
++++ kdegraphics-3.4.1/ksvg/impl/libs/libtext2path/src/Makefile.in 2005-05-25 08:29:52.429349358 +0200
+@@ -246,6 +246,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20679,16 +10592,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -412,7 +415,7 @@
+@@ -440,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*) \
-@@ -450,9 +453,9 @@
+@@ -478,9 +481,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20698,23 +10611,11 @@
-$(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 -u -Nru -x debian kdegraphics-3.4.0.orig/ksvg/impl/libs/libtext2path/Makefile.in kdegraphics-3.4.0/ksvg/impl/libs/libtext2path/Makefile.in
---- kdegraphics-3.4.0.orig/ksvg/impl/libs/libtext2path/Makefile.in 2005-03-04 13:27:34.000000000 +0100
-+++ kdegraphics-3.4.0/ksvg/impl/libs/libtext2path/Makefile.in 2005-03-05 02:51:51.000000000 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+diff -rua kdegraphics-3.4.1.orig/ksvg/impl/libs/Makefile.in kdegraphics-3.4.1/ksvg/impl/libs/Makefile.in
+--- kdegraphics-3.4.1.orig/ksvg/impl/libs/Makefile.in 2005-05-23 18:01:24.000000000 +0200
++++ kdegraphics-3.4.1/ksvg/impl/libs/Makefile.in 2005-05-25 08:29:52.386353257 +0200
@@ -212,6 +212,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -20746,93 +10647,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -459,7 +462,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -471,7 +480,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -479,7 +488,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -500,7 +515,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/ksvg/impl/libs/libtext2path/src/Makefile.in kdegraphics-3.4.0/ksvg/impl/libs/libtext2path/src/Makefile.in
---- kdegraphics-3.4.0.orig/ksvg/impl/libs/libtext2path/src/Makefile.in 2005-03-04 13:27:34.000000000 +0100
-+++ kdegraphics-3.4.0/ksvg/impl/libs/libtext2path/src/Makefile.in 2005-03-05 02:51:51.000000000 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -80,18 +80,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libtext2path_la_SOURCES)
- DIST_SOURCES = $(libtext2path_la_SOURCES)
-@@ -246,6 +246,9 @@
+diff -rua kdegraphics-3.4.1.orig/ksvg/impl/libs/xrgbrender/Makefile.in kdegraphics-3.4.1/ksvg/impl/libs/xrgbrender/Makefile.in
+--- kdegraphics-3.4.1.orig/ksvg/impl/libs/xrgbrender/Makefile.in 2005-05-23 18:01:24.000000000 +0200
++++ kdegraphics-3.4.1/ksvg/impl/libs/xrgbrender/Makefile.in 2005-05-25 08:29:52.443348088 +0200
+@@ -223,6 +223,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20842,16 +10660,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -439,7 +442,7 @@
+@@ -413,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*) \
-@@ -477,9 +480,9 @@
+@@ -451,9 +454,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20861,38 +10679,12 @@
-$(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 -u -Nru -x debian kdegraphics-3.4.0.orig/ksvg/impl/libs/xrgbrender/Makefile.in kdegraphics-3.4.0/ksvg/impl/libs/xrgbrender/Makefile.in
---- kdegraphics-3.4.0.orig/ksvg/impl/libs/xrgbrender/Makefile.in 2005-03-04 13:27:34.000000000 +0100
-+++ kdegraphics-3.4.0/ksvg/impl/libs/xrgbrender/Makefile.in 2005-03-05 02:51:51.000000000 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -66,11 +66,11 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libksvgxrgbrender_la_SOURCES)
- DIST_SOURCES = $(libksvgxrgbrender_la_SOURCES)
-@@ -223,6 +223,9 @@
+ clean-noinstLTLIBRARIES:
+diff -rua kdegraphics-3.4.1.orig/ksvg/impl/Makefile.in kdegraphics-3.4.1/ksvg/impl/Makefile.in
+--- kdegraphics-3.4.1.orig/ksvg/impl/Makefile.in 2005-05-23 18:01:24.000000000 +0200
++++ kdegraphics-3.4.1/ksvg/impl/Makefile.in 2005-05-25 08:29:52.374354345 +0200
+@@ -398,6 +398,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20902,16 +10694,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -412,7 +415,7 @@
+@@ -698,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*) \
-@@ -450,9 +453,9 @@
+@@ -736,9 +739,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20923,45 +10715,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/ksvg/plugin/Makefile.in kdegraphics-3.4.0/ksvg/plugin/Makefile.in
---- kdegraphics-3.4.0.orig/ksvg/plugin/Makefile.in 2005-03-04 13:27:34.000000000 +0100
-+++ kdegraphics-3.4.0/ksvg/plugin/Makefile.in 2005-03-05 02:51:51.501747850 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -87,18 +87,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libksvgplugin_la_SOURCES) $(svgthumbnail_la_SOURCES)
- DIST_SOURCES = $(libksvgplugin_la_SOURCES) $(svgthumbnail_la_SOURCES)
-@@ -271,6 +271,9 @@
+diff -rua kdegraphics-3.4.1.orig/ksvg/Makefile.in kdegraphics-3.4.1/ksvg/Makefile.in
+--- kdegraphics-3.4.1.orig/ksvg/Makefile.in 2005-05-23 18:01:24.000000000 +0200
++++ kdegraphics-3.4.1/ksvg/Makefile.in 2005-05-25 08:29:52.202369941 +0200
+@@ -258,6 +258,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20971,16 +10728,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -475,7 +478,7 @@
+@@ -457,7 +460,7 @@
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
+ .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*) \
-@@ -513,9 +516,9 @@
+@@ -495,9 +498,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20990,115 +10747,12 @@
-$(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)
-@@ -672,7 +675,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -684,7 +693,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -692,7 +701,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -713,7 +728,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -977,18 +992,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)
-@@ -1001,7 +1016,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
-@@ -1052,7 +1067,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 -u -Nru -x debian kdegraphics-3.4.0.orig/ksvg/plugin/backends/Makefile.in kdegraphics-3.4.0/ksvg/plugin/backends/Makefile.in
---- kdegraphics-3.4.0.orig/ksvg/plugin/backends/Makefile.in 2005-03-04 13:27:34.000000000 +0100
-+++ kdegraphics-3.4.0/ksvg/plugin/backends/Makefile.in 2005-03-05 02:51:51.509746478 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -212,6 +212,9 @@
+diff -rua kdegraphics-3.4.1.orig/ksvg/plugin/backends/agg/Makefile.in kdegraphics-3.4.1/ksvg/plugin/backends/agg/Makefile.in
+--- kdegraphics-3.4.1.orig/ksvg/plugin/backends/agg/Makefile.in 2005-05-23 18:01:25.000000000 +0200
++++ kdegraphics-3.4.1/ksvg/plugin/backends/agg/Makefile.in 2005-05-25 08:29:52.496343282 +0200
+@@ -247,6 +247,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21108,16 +10762,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -398,7 +401,7 @@
- all: docs-am all-recursive
+@@ -446,7 +449,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*) \
-@@ -436,9 +439,9 @@
+@@ -484,9 +487,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21127,95 +10781,12 @@
-$(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:
-@@ -458,7 +461,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -470,7 +479,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -478,7 +487,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -499,7 +514,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/ksvg/plugin/backends/agg/Makefile.in kdegraphics-3.4.0/ksvg/plugin/backends/agg/Makefile.in
---- kdegraphics-3.4.0.orig/ksvg/plugin/backends/agg/Makefile.in 2005-03-04 13:27:34.000000000 +0100
-+++ kdegraphics-3.4.0/ksvg/plugin/backends/agg/Makefile.in 2005-03-05 02:51:51.523744078 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -81,18 +81,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libksvgrendereragg_la_SOURCES)
- DIST_SOURCES = $(libksvgrendereragg_la_SOURCES)
-@@ -247,6 +247,9 @@
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+diff -rua kdegraphics-3.4.1.orig/ksvg/plugin/backends/libart/Makefile.in kdegraphics-3.4.1/ksvg/plugin/backends/libart/Makefile.in
+--- kdegraphics-3.4.1.orig/ksvg/plugin/backends/libart/Makefile.in 2005-05-23 18:01:25.000000000 +0200
++++ kdegraphics-3.4.1/ksvg/plugin/backends/libart/Makefile.in 2005-05-25 08:29:52.514341650 +0200
+@@ -248,6 +248,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21225,7 +10796,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -445,7 +448,7 @@
+@@ -443,7 +446,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21234,7 +10805,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -483,9 +486,9 @@
+@@ -481,9 +484,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21246,45 +10817,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/ksvg/plugin/backends/libart/Makefile.in kdegraphics-3.4.0/ksvg/plugin/backends/libart/Makefile.in
---- kdegraphics-3.4.0.orig/ksvg/plugin/backends/libart/Makefile.in 2005-03-04 13:27:34.000000000 +0100
-+++ kdegraphics-3.4.0/ksvg/plugin/backends/libart/Makefile.in 2005-03-05 02:51:51.536741850 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -82,18 +82,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libksvgrendererlibart_la_SOURCES)
- DIST_SOURCES = $(libksvgrendererlibart_la_SOURCES)
-@@ -248,6 +248,9 @@
+diff -rua kdegraphics-3.4.1.orig/ksvg/plugin/backends/Makefile.in kdegraphics-3.4.1/ksvg/plugin/backends/Makefile.in
+--- kdegraphics-3.4.1.orig/ksvg/plugin/backends/Makefile.in 2005-05-23 18:01:25.000000000 +0200
++++ kdegraphics-3.4.1/ksvg/plugin/backends/Makefile.in 2005-05-25 08:29:52.479344824 +0200
+@@ -212,6 +212,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21294,16 +10830,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -442,7 +445,7 @@
+@@ -399,7 +402,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*) \
-@@ -480,9 +483,9 @@
+@@ -437,9 +440,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21313,24 +10849,12 @@
-$(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 -u -Nru -x debian kdegraphics-3.4.0.orig/ksvg/test/Makefile.in kdegraphics-3.4.0/ksvg/test/Makefile.in
---- kdegraphics-3.4.0.orig/ksvg/test/Makefile.in 2005-03-04 13:27:34.000000000 +0100
-+++ kdegraphics-3.4.0/ksvg/test/Makefile.in 2005-03-05 02:51:51.544740478 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -212,6 +212,9 @@
+ mostlyclean-libtool:
+diff -rua kdegraphics-3.4.1.orig/ksvg/plugin/Makefile.in kdegraphics-3.4.1/ksvg/plugin/Makefile.in
+--- kdegraphics-3.4.1.orig/ksvg/plugin/Makefile.in 2005-05-23 18:01:24.000000000 +0200
++++ kdegraphics-3.4.1/ksvg/plugin/Makefile.in 2005-05-25 08:29:52.467345912 +0200
+@@ -271,6 +271,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21340,16 +10864,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -398,7 +401,7 @@
- all: docs-am all-recursive
+@@ -476,7 +479,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*) \
-@@ -436,9 +439,9 @@
+@@ -514,9 +517,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21359,94 +10883,11 @@
-$(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:
-@@ -458,7 +461,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -470,7 +479,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -478,7 +487,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -499,7 +514,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/ksvg/test/external/Makefile.in kdegraphics-3.4.0/ksvg/test/external/Makefile.in
---- kdegraphics-3.4.0.orig/ksvg/test/external/Makefile.in 2005-03-04 13:27:34.000000000 +0100
-+++ kdegraphics-3.4.0/ksvg/test/external/Makefile.in 2005-03-05 02:51:51.557738249 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -76,18 +76,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(printnodetest_SOURCES) $(svgdisplay_SOURCES)
- DIST_SOURCES = $(printnodetest_SOURCES) $(svgdisplay_SOURCES)
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+diff -rua kdegraphics-3.4.1.orig/ksvg/test/external/Makefile.in kdegraphics-3.4.1/ksvg/test/external/Makefile.in
+--- kdegraphics-3.4.1.orig/ksvg/test/external/Makefile.in 2005-05-23 18:01:25.000000000 +0200
++++ kdegraphics-3.4.1/ksvg/test/external/Makefile.in 2005-05-25 08:29:52.545338839 +0200
@@ -240,6 +240,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -21457,7 +10898,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -435,7 +438,7 @@
+@@ -436,7 +439,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -21466,7 +10907,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -473,9 +476,9 @@
+@@ -474,9 +477,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21478,22 +10919,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kuickshow/Makefile.in kdegraphics-3.4.0/kuickshow/Makefile.in
---- kdegraphics-3.4.0.orig/kuickshow/Makefile.in 2005-03-04 13:27:34.000000000 +0100
-+++ kdegraphics-3.4.0/kuickshow/Makefile.in 2005-03-05 02:51:51.565736878 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -213,6 +213,9 @@
+diff -rua kdegraphics-3.4.1.orig/ksvg/test/Makefile.in kdegraphics-3.4.1/ksvg/test/Makefile.in
+--- kdegraphics-3.4.1.orig/ksvg/test/Makefile.in 2005-05-23 18:01:25.000000000 +0200
++++ kdegraphics-3.4.1/ksvg/test/Makefile.in 2005-05-25 08:29:52.527340472 +0200
+@@ -212,6 +212,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21524,70 +10953,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -459,7 +462,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -471,7 +480,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -479,7 +488,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -500,7 +515,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kuickshow/misc/Makefile.in kdegraphics-3.4.0/kuickshow/misc/Makefile.in
---- kdegraphics-3.4.0.orig/kuickshow/misc/Makefile.in 2005-03-04 13:27:34.000000000 +0100
-+++ kdegraphics-3.4.0/kuickshow/misc/Makefile.in 2005-03-05 02:51:51.572735678 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -206,6 +206,9 @@
+diff -rua kdegraphics-3.4.1.orig/kuickshow/Makefile.in kdegraphics-3.4.1/kuickshow/Makefile.in
+--- kdegraphics-3.4.1.orig/kuickshow/Makefile.in 2005-05-23 18:01:25.000000000 +0200
++++ kdegraphics-3.4.1/kuickshow/Makefile.in 2005-05-25 08:29:52.557337751 +0200
+@@ -213,6 +213,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21597,8 +10966,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
- all: docs-am all-am
+@@ -400,7 +403,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -21606,7 +10975,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -438,9 +441,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21618,21 +10987,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kuickshow/pics/Makefile.in kdegraphics-3.4.0/kuickshow/pics/Makefile.in
---- kdegraphics-3.4.0.orig/kuickshow/pics/Makefile.in 2005-03-04 13:27:34.000000000 +0100
-+++ kdegraphics-3.4.0/kuickshow/pics/Makefile.in 2005-03-05 02:51:51.579734478 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdegraphics-3.4.1.orig/kuickshow/misc/Makefile.in kdegraphics-3.4.1/kuickshow/misc/Makefile.in
+--- kdegraphics-3.4.1.orig/kuickshow/misc/Makefile.in 2005-05-23 18:01:25.000000000 +0200
++++ kdegraphics-3.4.1/kuickshow/misc/Makefile.in 2005-05-25 08:29:52.569336663 +0200
@@ -206,6 +206,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -21643,7 +11000,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -400,7 +403,7 @@
+@@ -394,7 +397,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -21652,7 +11009,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -438,9 +441,9 @@
+@@ -432,9 +435,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21664,45 +11021,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kuickshow/src/Makefile.in kdegraphics-3.4.0/kuickshow/src/Makefile.in
---- kdegraphics-3.4.0.orig/kuickshow/src/Makefile.in 2005-03-04 13:27:35.000000000 +0100
-+++ kdegraphics-3.4.0/kuickshow/src/Makefile.in 2005-03-05 02:51:51.651722134 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -94,18 +94,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kuickshow_la_SOURCES)
- #>- DIST_SOURCES = $(kuickshow_la_SOURCES)
-@@ -262,6 +262,9 @@
+diff -rua kdegraphics-3.4.1.orig/kuickshow/pics/Makefile.in kdegraphics-3.4.1/kuickshow/pics/Makefile.in
+--- kdegraphics-3.4.1.orig/kuickshow/pics/Makefile.in 2005-05-23 18:01:25.000000000 +0200
++++ kdegraphics-3.4.1/kuickshow/pics/Makefile.in 2005-05-25 08:29:52.580335666 +0200
+@@ -206,6 +206,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21712,16 +11034,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -473,7 +476,7 @@
+@@ -401,7 +404,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*) \
-@@ -511,9 +514,9 @@
+@@ -439,9 +442,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21731,148 +11053,12 @@
-$(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)
-@@ -929,18 +932,18 @@
- mocs: filefinder.moc
- #>+ 3
--slideshowwidget.moc: $(srcdir)/slideshowwidget.h
-- $(MOC) $(srcdir)/slideshowwidget.h -o slideshowwidget.moc
-+imagewindow.moc: $(srcdir)/imagewindow.h
-+ $(MOC) $(srcdir)/imagewindow.h -o imagewindow.moc
-
- #>+ 2
--mocs: slideshowwidget.moc
-+mocs: imagewindow.moc
-
- #>+ 3
--imagewindow.moc: $(srcdir)/imagewindow.h
-- $(MOC) $(srcdir)/imagewindow.h -o imagewindow.moc
-+slideshowwidget.moc: $(srcdir)/slideshowwidget.h
-+ $(MOC) $(srcdir)/slideshowwidget.h -o slideshowwidget.moc
-
- #>+ 2
--mocs: imagewindow.moc
-+mocs: slideshowwidget.moc
-
- #>+ 3
- generalwidget.moc: $(srcdir)/generalwidget.h
-@@ -978,18 +981,18 @@
- mocs: kuickio.moc
-
- #>+ 3
--imlibwidget.moc: $(srcdir)/imlibwidget.h
-- $(MOC) $(srcdir)/imlibwidget.h -o imlibwidget.moc
-+kuickconfigdlg.moc: $(srcdir)/kuickconfigdlg.h
-+ $(MOC) $(srcdir)/kuickconfigdlg.h -o kuickconfigdlg.moc
-
- #>+ 2
--mocs: imlibwidget.moc
-+mocs: kuickconfigdlg.moc
-
- #>+ 3
--kuickconfigdlg.moc: $(srcdir)/kuickconfigdlg.h
-- $(MOC) $(srcdir)/kuickconfigdlg.h -o kuickconfigdlg.moc
-+imlibwidget.moc: $(srcdir)/imlibwidget.h
-+ $(MOC) $(srcdir)/imlibwidget.h -o imlibwidget.moc
-
- #>+ 2
--mocs: kuickconfigdlg.moc
-+mocs: imlibwidget.moc
-
- #>+ 3
- kuickshow.moc: $(srcdir)/kuickshow.h
-@@ -1000,7 +1003,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f filewidget.moc aboutwidget.moc printing.moc filefinder.moc slideshowwidget.moc imagewindow.moc generalwidget.moc mainwidget.moc kurlwidget.moc defaultswidget.moc kuickio.moc imlibwidget.moc kuickconfigdlg.moc kuickshow.moc
-+ -rm -f filewidget.moc aboutwidget.moc printing.moc filefinder.moc imagewindow.moc slideshowwidget.moc generalwidget.moc mainwidget.moc kurlwidget.moc defaultswidget.moc kuickio.moc kuickconfigdlg.moc imlibwidget.moc kuickshow.moc
-
- #>+ 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
-@@ -1010,20 +1013,20 @@
-
- #>+ 16
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kuickshow.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kuickshow.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-kuickshow.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kuickshow.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
- $(INSTALL_DATA) $(srcdir)/lo16-app-kuickshow.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kuickshow.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
- $(INSTALL_DATA) $(srcdir)/lo32-app-kuickshow.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kuickshow.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kuickshow.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kuickshow.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kuickshow.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kuickshow.png
- -rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kuickshow.png
- -rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kuickshow.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kuickshow.png
-
- #>+ 15
- force-reedit:
-@@ -1064,7 +1067,7 @@
-
-
- #>+ 11
--libkdeinit_kuickshow_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kuickshow.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/generalwidget.cpp $(srcdir)/kuickconfigdlg.cpp $(srcdir)/main.cpp $(srcdir)/defaultswidget.cpp $(srcdir)/imagewindow.cpp $(srcdir)/kuickdata.cpp $(srcdir)/imdata.cpp $(srcdir)/filefinder.cpp $(srcdir)/kurlwidget.cpp $(srcdir)/filewidget.cpp $(srcdir)/kuickio.cpp $(srcdir)/kuick.cpp $(srcdir)/imlibwidget.cpp $(srcdir)/slideshowwidget.cpp $(srcdir)/printing.cpp aboutwidget.moc filewidget.moc filefinder.moc printing.moc imagewindow.moc slideshowwidget.moc generalwidget.moc kurlwidget.moc defaultswidget.moc kuickio.moc kuickconfigdlg.moc imlibwidget.moc kuickshow.moc
-+libkdeinit_kuickshow_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kuickshow.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/generalwidget.cpp $(srcdir)/kuickconfigdlg.cpp $(srcdir)/main.cpp $(srcdir)/defaultswidget.cpp $(srcdir)/imagewindow.cpp $(srcdir)/kuickdata.cpp $(srcdir)/imdata.cpp $(srcdir)/filefinder.cpp $(srcdir)/kurlwidget.cpp $(srcdir)/filewidget.cpp $(srcdir)/kuickio.cpp $(srcdir)/kuick.cpp $(srcdir)/imlibwidget.cpp $(srcdir)/slideshowwidget.cpp $(srcdir)/printing.cpp aboutwidget.moc filewidget.moc filefinder.moc printing.moc slideshowwidget.moc imagewindow.moc generalwidget.moc kurlwidget.moc defaultswidget.moc kuickio.moc imlibwidget.moc kuickconfigdlg.moc kuickshow.moc
- @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; \
-@@ -1076,7 +1079,7 @@
- rm -f libkdeinit_kuickshow_la.all_cpp.final libkdeinit_kuickshow_la.all_cpp.files
-
- #>+ 11
--kuickshow_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kuickshow.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/generalwidget.cpp $(srcdir)/kuickconfigdlg.cpp $(srcdir)/main.cpp $(srcdir)/defaultswidget.cpp $(srcdir)/imagewindow.cpp $(srcdir)/kuickdata.cpp $(srcdir)/imdata.cpp $(srcdir)/filefinder.cpp $(srcdir)/kurlwidget.cpp $(srcdir)/filewidget.cpp $(srcdir)/kuickio.cpp $(srcdir)/kuick.cpp $(srcdir)/imlibwidget.cpp $(srcdir)/slideshowwidget.cpp $(srcdir)/printing.cpp aboutwidget.moc filewidget.moc filefinder.moc printing.moc imagewindow.moc slideshowwidget.moc generalwidget.moc kurlwidget.moc defaultswidget.moc kuickio.moc kuickconfigdlg.moc imlibwidget.moc kuickshow.moc
-+kuickshow_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kuickshow.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/generalwidget.cpp $(srcdir)/kuickconfigdlg.cpp $(srcdir)/main.cpp $(srcdir)/defaultswidget.cpp $(srcdir)/imagewindow.cpp $(srcdir)/kuickdata.cpp $(srcdir)/imdata.cpp $(srcdir)/filefinder.cpp $(srcdir)/kurlwidget.cpp $(srcdir)/filewidget.cpp $(srcdir)/kuickio.cpp $(srcdir)/kuick.cpp $(srcdir)/imlibwidget.cpp $(srcdir)/slideshowwidget.cpp $(srcdir)/printing.cpp aboutwidget.moc filewidget.moc filefinder.moc printing.moc slideshowwidget.moc imagewindow.moc generalwidget.moc kurlwidget.moc defaultswidget.moc kuickio.moc imlibwidget.moc kuickconfigdlg.moc kuickshow.moc
- @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 -u -Nru -x debian kdegraphics-3.4.0.orig/kview/Makefile.in kdegraphics-3.4.0/kview/Makefile.in
---- kdegraphics-3.4.0.orig/kview/Makefile.in 2005-03-04 13:27:35.000000000 +0100
-+++ kdegraphics-3.4.0/kview/Makefile.in 2005-03-05 02:51:51.675718019 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -92,18 +92,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kview_la_SOURCES)
- #>- DIST_SOURCES = $(kview_la_SOURCES)
-@@ -276,6 +276,9 @@
+ mostlyclean-libtool:
+diff -rua kdegraphics-3.4.1.orig/kuickshow/src/Makefile.in kdegraphics-3.4.1/kuickshow/src/Makefile.in
+--- kdegraphics-3.4.1.orig/kuickshow/src/Makefile.in 2005-05-23 18:01:25.000000000 +0200
++++ kdegraphics-3.4.1/kuickshow/src/Makefile.in 2005-05-25 08:29:52.658328593 +0200
+@@ -262,6 +262,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21882,7 +11068,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -479,7 +482,7 @@
+@@ -474,7 +477,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21891,7 +11077,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -517,9 +520,9 @@
+@@ -512,9 +515,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21903,116 +11089,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -687,7 +690,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -699,7 +708,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -707,7 +716,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -728,7 +743,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1014,17 +1029,17 @@
-
- #>+ 13
- install-kde-icons:
-- $(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/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kview.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/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
-+ $(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
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kview.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kview.png
- -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
-
- #>+ 15
- force-reedit:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kview/config/Makefile.in kdegraphics-3.4.0/kview/config/Makefile.in
---- kdegraphics-3.4.0.orig/kview/config/Makefile.in 2005-03-04 13:27:35.000000000 +0100
-+++ kdegraphics-3.4.0/kview/config/Makefile.in 2005-03-05 02:51:51.689715619 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -79,18 +79,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_kviewgeneralconfig_la_SOURCES)
- DIST_SOURCES = $(kcm_kviewgeneralconfig_la_SOURCES)
+diff -rua kdegraphics-3.4.1.orig/kview/config/Makefile.in kdegraphics-3.4.1/kview/config/Makefile.in
+--- kdegraphics-3.4.1.orig/kview/config/Makefile.in 2005-05-23 18:01:25.000000000 +0200
++++ kdegraphics-3.4.1/kview/config/Makefile.in 2005-05-25 08:29:52.708324059 +0200
@@ -261,6 +261,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -22023,7 +11102,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -459,7 +462,7 @@
+@@ -460,7 +463,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22032,7 +11111,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -497,9 +500,9 @@
+@@ -498,9 +501,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22044,92 +11123,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -614,7 +617,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -626,7 +635,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -634,7 +643,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -655,7 +670,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kview/config/plugins/Makefile.in kdegraphics-3.4.0/kview/config/plugins/Makefile.in
---- kdegraphics-3.4.0.orig/kview/config/plugins/Makefile.in 2005-03-04 13:27:35.000000000 +0100
-+++ kdegraphics-3.4.0/kview/config/plugins/Makefile.in 2005-03-05 02:51:51.706712705 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -78,18 +78,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_kviewpluginsconfig_la_SOURCES)
- DIST_SOURCES = $(kcm_kviewpluginsconfig_la_SOURCES)
+diff -rua kdegraphics-3.4.1.orig/kview/config/plugins/Makefile.in kdegraphics-3.4.1/kview/config/plugins/Makefile.in
+--- kdegraphics-3.4.1.orig/kview/config/plugins/Makefile.in 2005-05-23 18:01:25.000000000 +0200
++++ kdegraphics-3.4.1/kview/config/plugins/Makefile.in 2005-05-25 08:29:52.726322427 +0200
@@ -245,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -22140,7 +11136,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -440,7 +443,7 @@
+@@ -441,7 +444,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22149,7 +11145,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -478,9 +481,9 @@
+@@ -479,9 +482,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22161,44 +11157,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kview/kimageviewer/Makefile.in kdegraphics-3.4.0/kview/kimageviewer/Makefile.in
---- kdegraphics-3.4.0.orig/kview/kimageviewer/Makefile.in 2005-03-04 13:27:35.000000000 +0100
-+++ kdegraphics-3.4.0/kview/kimageviewer/Makefile.in 2005-03-05 02:51:51.720710304 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -82,18 +82,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkimageviewer_la_SOURCES)
- DIST_SOURCES = $(libkimageviewer_la_SOURCES)
+diff -rua kdegraphics-3.4.1.orig/kview/kimageviewer/Makefile.in kdegraphics-3.4.1/kview/kimageviewer/Makefile.in
+--- kdegraphics-3.4.1.orig/kview/kimageviewer/Makefile.in 2005-05-23 18:01:25.000000000 +0200
++++ kdegraphics-3.4.1/kview/kimageviewer/Makefile.in 2005-05-25 08:29:52.744320795 +0200
@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -22209,7 +11170,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -448,7 +451,7 @@
+@@ -449,7 +452,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22218,7 +11179,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -486,9 +489,9 @@
+@@ -487,9 +490,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22230,45 +11191,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kview/kviewcanvas/Makefile.in kdegraphics-3.4.0/kview/kviewcanvas/Makefile.in
---- kdegraphics-3.4.0.orig/kview/kviewcanvas/Makefile.in 2005-03-04 13:27:35.000000000 +0100
-+++ kdegraphics-3.4.0/kview/kviewcanvas/Makefile.in 2005-03-05 02:51:51.745706018 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -82,18 +82,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkviewcanvas_la_SOURCES)
- DIST_SOURCES = $(libkviewcanvas_la_SOURCES)
-@@ -263,6 +263,9 @@
+diff -rua kdegraphics-3.4.1.orig/kview/kviewcanvas/config/Makefile.in kdegraphics-3.4.1/kview/kviewcanvas/config/Makefile.in
+--- kdegraphics-3.4.1.orig/kview/kviewcanvas/config/Makefile.in 2005-05-23 18:01:25.000000000 +0200
++++ kdegraphics-3.4.1/kview/kviewcanvas/config/Makefile.in 2005-05-25 08:29:52.793316352 +0200
+@@ -248,6 +248,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22278,7 +11204,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -462,7 +465,7 @@
+@@ -446,7 +449,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22287,7 +11213,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -500,9 +503,9 @@
+@@ -484,9 +487,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22299,93 +11225,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -601,7 +604,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -613,7 +622,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -621,7 +630,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -642,7 +657,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kview/kviewcanvas/config/Makefile.in kdegraphics-3.4.0/kview/kviewcanvas/config/Makefile.in
---- kdegraphics-3.4.0.orig/kview/kviewcanvas/config/Makefile.in 2005-03-04 13:27:35.000000000 +0100
-+++ kdegraphics-3.4.0/kview/kviewcanvas/config/Makefile.in 2005-03-05 02:51:51.759703618 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -81,18 +81,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_kviewcanvasconfig_la_SOURCES)
- DIST_SOURCES = $(kcm_kviewcanvasconfig_la_SOURCES)
-@@ -248,6 +248,9 @@
+diff -rua kdegraphics-3.4.1.orig/kview/kviewcanvas/Makefile.in kdegraphics-3.4.1/kview/kviewcanvas/Makefile.in
+--- kdegraphics-3.4.1.orig/kview/kviewcanvas/Makefile.in 2005-05-23 18:01:25.000000000 +0200
++++ kdegraphics-3.4.1/kview/kviewcanvas/Makefile.in 2005-05-25 08:29:52.775317984 +0200
+@@ -263,6 +263,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22395,7 +11238,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -445,7 +448,7 @@
+@@ -463,7 +466,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22404,7 +11247,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -483,9 +486,9 @@
+@@ -501,9 +504,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22416,44 +11259,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kview/kviewcanvas/test/Makefile.in kdegraphics-3.4.0/kview/kviewcanvas/test/Makefile.in
---- kdegraphics-3.4.0.orig/kview/kviewcanvas/test/Makefile.in 2005-03-04 13:27:35.000000000 +0100
-+++ kdegraphics-3.4.0/kview/kviewcanvas/test/Makefile.in 2005-03-05 02:51:51.770701732 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -68,18 +68,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(test_SOURCES)
- DIST_SOURCES = $(test_SOURCES)
+diff -rua kdegraphics-3.4.1.orig/kview/kviewcanvas/test/Makefile.in kdegraphics-3.4.1/kview/kviewcanvas/test/Makefile.in
+--- kdegraphics-3.4.1.orig/kview/kviewcanvas/test/Makefile.in 2005-05-23 18:01:25.000000000 +0200
++++ kdegraphics-3.4.1/kview/kviewcanvas/test/Makefile.in 2005-05-25 08:29:52.809314901 +0200
@@ -232,6 +232,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -22464,7 +11272,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -423,7 +426,7 @@
+@@ -424,7 +427,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22473,7 +11281,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -461,9 +464,9 @@
+@@ -462,9 +465,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22485,45 +11293,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kview/kviewviewer/Makefile.in kdegraphics-3.4.0/kview/kviewviewer/Makefile.in
---- kdegraphics-3.4.0.orig/kview/kviewviewer/Makefile.in 2005-03-04 13:27:35.000000000 +0100
-+++ kdegraphics-3.4.0/kview/kviewviewer/Makefile.in 2005-03-05 02:51:51.800696589 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -84,18 +84,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkviewviewer_la_SOURCES)
- DIST_SOURCES = $(libkviewviewer_la_SOURCES)
-@@ -266,6 +266,9 @@
+diff -rua kdegraphics-3.4.1.orig/kview/kviewviewer/config/Makefile.in kdegraphics-3.4.1/kview/kviewviewer/config/Makefile.in
+--- kdegraphics-3.4.1.orig/kview/kviewviewer/config/Makefile.in 2005-05-23 18:01:25.000000000 +0200
++++ kdegraphics-3.4.1/kview/kviewviewer/config/Makefile.in 2005-05-25 08:29:52.859310367 +0200
+@@ -246,6 +246,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22533,7 +11306,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -469,7 +472,7 @@
+@@ -442,7 +445,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22542,7 +11315,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -507,9 +510,9 @@
+@@ -480,9 +483,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22554,93 +11327,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -626,7 +629,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -638,7 +647,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -646,7 +655,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -667,7 +682,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kview/kviewviewer/config/Makefile.in kdegraphics-3.4.0/kview/kviewviewer/config/Makefile.in
---- kdegraphics-3.4.0.orig/kview/kviewviewer/config/Makefile.in 2005-03-04 13:27:35.000000000 +0100
-+++ kdegraphics-3.4.0/kview/kviewviewer/config/Makefile.in 2005-03-05 02:51:51.813694360 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -79,18 +79,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_kviewviewerpluginsconfig_la_SOURCES)
- DIST_SOURCES = $(kcm_kviewviewerpluginsconfig_la_SOURCES)
-@@ -246,6 +246,9 @@
+diff -rua kdegraphics-3.4.1.orig/kview/kviewviewer/Makefile.in kdegraphics-3.4.1/kview/kviewviewer/Makefile.in
+--- kdegraphics-3.4.1.orig/kview/kviewviewer/Makefile.in 2005-05-23 18:01:25.000000000 +0200
++++ kdegraphics-3.4.1/kview/kviewviewer/Makefile.in 2005-05-25 08:29:52.840312090 +0200
+@@ -266,6 +266,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22650,7 +11340,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -441,7 +444,7 @@
+@@ -470,7 +473,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22659,7 +11349,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -479,9 +482,9 @@
+@@ -508,9 +511,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22671,44 +11361,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kview/kviewviewer/test/Makefile.in kdegraphics-3.4.0/kview/kviewviewer/test/Makefile.in
---- kdegraphics-3.4.0.orig/kview/kviewviewer/test/Makefile.in 2005-03-04 13:27:35.000000000 +0100
-+++ kdegraphics-3.4.0/kview/kviewviewer/test/Makefile.in 2005-03-05 02:51:51.824692475 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -67,18 +67,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(test_SOURCES)
- DIST_SOURCES = $(test_SOURCES)
+diff -rua kdegraphics-3.4.1.orig/kview/kviewviewer/test/Makefile.in kdegraphics-3.4.1/kview/kviewviewer/test/Makefile.in
+--- kdegraphics-3.4.1.orig/kview/kviewviewer/test/Makefile.in 2005-05-23 18:01:25.000000000 +0200
++++ kdegraphics-3.4.1/kview/kviewviewer/test/Makefile.in 2005-05-25 08:29:52.874309007 +0200
@@ -231,6 +231,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -22719,7 +11374,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -423,7 +426,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22728,7 +11383,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -461,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22740,22 +11395,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kview/modules/Makefile.in kdegraphics-3.4.0/kview/modules/Makefile.in
---- kdegraphics-3.4.0.orig/kview/modules/Makefile.in 2005-03-04 13:27:35.000000000 +0100
-+++ kdegraphics-3.4.0/kview/modules/Makefile.in 2005-03-05 02:51:51.832691103 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -212,6 +212,9 @@
+diff -rua kdegraphics-3.4.1.orig/kview/Makefile.in kdegraphics-3.4.1/kview/Makefile.in
+--- kdegraphics-3.4.1.orig/kview/Makefile.in 2005-05-23 18:01:25.000000000 +0200
++++ kdegraphics-3.4.1/kview/Makefile.in 2005-05-25 08:29:52.690325692 +0200
+@@ -276,6 +276,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22765,16 +11408,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -398,7 +401,7 @@
- all: docs-am all-recursive
+@@ -480,7 +483,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*) \
-@@ -436,9 +439,9 @@
+@@ -518,9 +521,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22784,94 +11427,11 @@
-$(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:
-@@ -458,7 +461,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -470,7 +479,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -478,7 +487,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -499,7 +514,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kview/modules/browser/Makefile.in kdegraphics-3.4.0/kview/modules/browser/Makefile.in
---- kdegraphics-3.4.0.orig/kview/modules/browser/Makefile.in 2005-03-04 13:27:35.000000000 +0100
-+++ kdegraphics-3.4.0/kview/modules/browser/Makefile.in 2005-03-05 02:51:51.847688531 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -78,18 +78,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kview_browserplugin_la_SOURCES)
- DIST_SOURCES = $(kview_browserplugin_la_SOURCES)
+ install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+diff -rua kdegraphics-3.4.1.orig/kview/modules/browser/Makefile.in kdegraphics-3.4.1/kview/modules/browser/Makefile.in
+--- kdegraphics-3.4.1.orig/kview/modules/browser/Makefile.in 2005-05-23 18:01:25.000000000 +0200
++++ kdegraphics-3.4.1/kview/modules/browser/Makefile.in 2005-05-25 08:29:52.904306287 +0200
@@ -244,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -22882,7 +11442,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -438,7 +441,7 @@
+@@ -439,7 +442,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22891,7 +11451,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -476,9 +479,9 @@
+@@ -477,9 +480,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22903,44 +11463,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kview/modules/effects/Makefile.in kdegraphics-3.4.0/kview/modules/effects/Makefile.in
---- kdegraphics-3.4.0.orig/kview/modules/effects/Makefile.in 2005-03-04 13:27:35.000000000 +0100
-+++ kdegraphics-3.4.0/kview/modules/effects/Makefile.in 2005-03-05 02:51:51.861686131 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -75,18 +75,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kview_effectsplugin_la_SOURCES)
- DIST_SOURCES = $(kview_effectsplugin_la_SOURCES)
+diff -rua kdegraphics-3.4.1.orig/kview/modules/effects/Makefile.in kdegraphics-3.4.1/kview/modules/effects/Makefile.in
+--- kdegraphics-3.4.1.orig/kview/modules/effects/Makefile.in 2005-05-23 18:01:25.000000000 +0200
++++ kdegraphics-3.4.1/kview/modules/effects/Makefile.in 2005-05-25 08:29:52.921304746 +0200
@@ -241,6 +241,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -22951,7 +11476,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -435,7 +438,7 @@
+@@ -436,7 +439,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22960,7 +11485,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -473,9 +476,9 @@
+@@ -474,9 +477,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22972,45 +11497,44 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kview/modules/presenter/Makefile.in kdegraphics-3.4.0/kview/modules/presenter/Makefile.in
---- kdegraphics-3.4.0.orig/kview/modules/presenter/Makefile.in 2005-03-04 13:27:35.000000000 +0100
-+++ kdegraphics-3.4.0/kview/modules/presenter/Makefile.in 2005-03-05 02:51:51.878683217 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
+diff -rua kdegraphics-3.4.1.orig/kview/modules/Makefile.in kdegraphics-3.4.1/kview/modules/Makefile.in
+--- kdegraphics-3.4.1.orig/kview/modules/Makefile.in 2005-05-23 18:01:25.000000000 +0200
++++ kdegraphics-3.4.1/kview/modules/Makefile.in 2005-05-25 08:29:52.886307919 +0200
+@@ -212,6 +212,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-recursive
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -81,18 +81,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kview_presenterplugin_la_SOURCES)
- DIST_SOURCES = $(kview_presenterplugin_la_SOURCES)
-@@ -261,6 +261,9 @@
+ .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 -rua kdegraphics-3.4.1.orig/kview/modules/presenter/config/Makefile.in kdegraphics-3.4.1/kview/modules/presenter/config/Makefile.in
+--- kdegraphics-3.4.1.orig/kview/modules/presenter/config/Makefile.in 2005-05-23 18:01:25.000000000 +0200
++++ kdegraphics-3.4.1/kview/modules/presenter/config/Makefile.in 2005-05-25 08:29:52.962301028 +0200
+@@ -245,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23020,7 +11544,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -458,7 +461,7 @@
+@@ -441,7 +444,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23029,7 +11553,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -496,9 +499,9 @@
+@@ -479,9 +482,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23041,93 +11565,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -597,7 +600,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -609,7 +618,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -617,7 +626,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -638,7 +653,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kview/modules/presenter/config/Makefile.in kdegraphics-3.4.0/kview/modules/presenter/config/Makefile.in
---- kdegraphics-3.4.0.orig/kview/modules/presenter/config/Makefile.in 2005-03-04 13:27:35.000000000 +0100
-+++ kdegraphics-3.4.0/kview/modules/presenter/config/Makefile.in 2005-03-05 02:51:51.891680988 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -78,18 +78,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_kviewpresenterconfig_la_SOURCES)
- DIST_SOURCES = $(kcm_kviewpresenterconfig_la_SOURCES)
-@@ -245,6 +245,9 @@
+diff -rua kdegraphics-3.4.1.orig/kview/modules/presenter/Makefile.in kdegraphics-3.4.1/kview/modules/presenter/Makefile.in
+--- kdegraphics-3.4.1.orig/kview/modules/presenter/Makefile.in 2005-05-23 18:01:25.000000000 +0200
++++ kdegraphics-3.4.1/kview/modules/presenter/Makefile.in 2005-05-25 08:29:52.944302660 +0200
+@@ -261,6 +261,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23137,7 +11578,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -440,7 +443,7 @@
+@@ -459,7 +462,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23146,7 +11587,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -478,9 +481,9 @@
+@@ -497,9 +500,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23158,44 +11599,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kview/modules/scale/Makefile.in kdegraphics-3.4.0/kview/modules/scale/Makefile.in
---- kdegraphics-3.4.0.orig/kview/modules/scale/Makefile.in 2005-03-04 13:27:35.000000000 +0100
-+++ kdegraphics-3.4.0/kview/modules/scale/Makefile.in 2005-03-05 02:51:51.922675673 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -80,18 +80,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kview_scale_la_SOURCES)
- DIST_SOURCES = $(kview_scale_la_SOURCES)
+diff -rua kdegraphics-3.4.1.orig/kview/modules/scale/Makefile.in kdegraphics-3.4.1/kview/modules/scale/Makefile.in
+--- kdegraphics-3.4.1.orig/kview/modules/scale/Makefile.in 2005-05-23 18:01:25.000000000 +0200
++++ kdegraphics-3.4.1/kview/modules/scale/Makefile.in 2005-05-25 08:29:52.983299124 +0200
@@ -246,6 +246,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -23206,7 +11612,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -440,7 +443,7 @@
+@@ -441,7 +444,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23215,7 +11621,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -478,9 +481,9 @@
+@@ -479,9 +482,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23227,44 +11633,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kview/modules/scanner/Makefile.in kdegraphics-3.4.0/kview/modules/scanner/Makefile.in
---- kdegraphics-3.4.0.orig/kview/modules/scanner/Makefile.in 2005-03-04 13:27:35.000000000 +0100
-+++ kdegraphics-3.4.0/kview/modules/scanner/Makefile.in 2005-03-05 02:51:51.945671730 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -75,18 +75,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kview_scannerplugin_la_SOURCES)
- DIST_SOURCES = $(kview_scannerplugin_la_SOURCES)
+diff -rua kdegraphics-3.4.1.orig/kview/modules/scanner/Makefile.in kdegraphics-3.4.1/kview/modules/scanner/Makefile.in
+--- kdegraphics-3.4.1.orig/kview/modules/scanner/Makefile.in 2005-05-23 18:01:25.000000000 +0200
++++ kdegraphics-3.4.1/kview/modules/scanner/Makefile.in 2005-05-25 08:29:53.003297310 +0200
@@ -241,6 +241,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -23275,7 +11646,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -435,7 +438,7 @@
+@@ -436,7 +439,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23284,7 +11655,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -473,9 +476,9 @@
+@@ -474,9 +477,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23296,44 +11667,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kview/modules/template/Makefile.in kdegraphics-3.4.0/kview/modules/template/Makefile.in
---- kdegraphics-3.4.0.orig/kview/modules/template/Makefile.in 2005-03-04 13:27:35.000000000 +0100
-+++ kdegraphics-3.4.0/kview/modules/template/Makefile.in 2005-03-05 02:51:51.958669502 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -76,18 +76,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kview_templateplugin_la_SOURCES)
- DIST_SOURCES = $(kview_templateplugin_la_SOURCES)
+diff -rua kdegraphics-3.4.1.orig/kview/modules/template/Makefile.in kdegraphics-3.4.1/kview/modules/template/Makefile.in
+--- kdegraphics-3.4.1.orig/kview/modules/template/Makefile.in 2005-05-23 18:01:25.000000000 +0200
++++ kdegraphics-3.4.1/kview/modules/template/Makefile.in 2005-05-25 08:29:53.020295769 +0200
@@ -242,6 +242,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -23344,7 +11680,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -436,7 +439,7 @@
+@@ -437,7 +440,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23353,7 +11689,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -474,9 +477,9 @@
+@@ -475,9 +478,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23365,44 +11701,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kview/photobook/Makefile.in kdegraphics-3.4.0/kview/photobook/Makefile.in
---- kdegraphics-3.4.0.orig/kview/photobook/Makefile.in 2005-03-04 13:27:35.000000000 +0100
-+++ kdegraphics-3.4.0/kview/photobook/Makefile.in 2005-03-05 02:51:51.972667101 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -76,18 +76,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libphotobook_la_SOURCES)
- DIST_SOURCES = $(libphotobook_la_SOURCES)
+diff -rua kdegraphics-3.4.1.orig/kview/photobook/Makefile.in kdegraphics-3.4.1/kview/photobook/Makefile.in
+--- kdegraphics-3.4.1.orig/kview/photobook/Makefile.in 2005-05-23 18:01:25.000000000 +0200
++++ kdegraphics-3.4.1/kview/photobook/Makefile.in 2005-05-25 08:29:53.039294046 +0200
@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -23413,7 +11714,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -442,7 +445,7 @@
+@@ -443,7 +446,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23422,7 +11723,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -480,9 +483,9 @@
+@@ -481,9 +484,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23434,62 +11735,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -808,14 +811,14 @@
-
- #>+ 10
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-photobook.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/photobook.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
- $(INSTALL_DATA) $(srcdir)/cr22-app-photobook.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/photobook.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-photobook.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/photobook.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/photobook.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/photobook.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/photobook.png
-
- #>+ 15
- force-reedit:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kviewshell/Makefile.in kdegraphics-3.4.0/kviewshell/Makefile.in
---- kdegraphics-3.4.0.orig/kviewshell/Makefile.in 2005-03-04 13:27:35.000000000 +0100
-+++ kdegraphics-3.4.0/kviewshell/Makefile.in 2005-03-05 02:51:52.030657158 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -132,18 +132,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(emptymultipagepart_la_SOURCES) $(kviewerpart_la_SOURCES) \
- $(libifaces_la_SOURCES) $(libkmultipage_la_SOURCES) \
+diff -rua kdegraphics-3.4.1.orig/kviewshell/Makefile.in kdegraphics-3.4.1/kviewshell/Makefile.in
+--- kdegraphics-3.4.1.orig/kviewshell/Makefile.in 2005-05-23 18:01:25.000000000 +0200
++++ kdegraphics-3.4.1/kviewshell/Makefile.in 2005-05-25 08:29:53.184280898 +0200
@@ -310,6 +310,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -23500,7 +11748,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -542,7 +545,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23509,7 +11757,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -580,9 +583,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23521,151 +11769,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1106,18 +1109,18 @@
- mocs: emptyRenderer.moc
-
- #>+ 3
--selection.moc: $(srcdir)/selection.h
-- $(MOC) $(srcdir)/selection.h -o selection.moc
-+pageSizeDialog.moc: $(srcdir)/pageSizeDialog.h
-+ $(MOC) $(srcdir)/pageSizeDialog.h -o pageSizeDialog.moc
-
- #>+ 2
--mocs: selection.moc
-+mocs: pageSizeDialog.moc
-
- #>+ 3
--pageSizeDialog.moc: $(srcdir)/pageSizeDialog.h
-- $(MOC) $(srcdir)/pageSizeDialog.h -o pageSizeDialog.moc
-+selection.moc: $(srcdir)/selection.h
-+ $(MOC) $(srcdir)/selection.h -o selection.moc
-
- #>+ 2
--mocs: pageSizeDialog.moc
-+mocs: selection.moc
-
- #>+ 3
- documentRenderer.moc: $(srcdir)/documentRenderer.h
-@@ -1127,18 +1130,18 @@
- mocs: documentRenderer.moc
-
- #>+ 3
--kviewshell.moc: $(srcdir)/kviewshell.h
-- $(MOC) $(srcdir)/kviewshell.h -o kviewshell.moc
-+sizePreview.moc: $(srcdir)/sizePreview.h
-+ $(MOC) $(srcdir)/sizePreview.h -o sizePreview.moc
-
- #>+ 2
--mocs: kviewshell.moc
-+mocs: sizePreview.moc
-
- #>+ 3
--sizePreview.moc: $(srcdir)/sizePreview.h
-- $(MOC) $(srcdir)/sizePreview.h -o sizePreview.moc
-+kviewshell.moc: $(srcdir)/kviewshell.h
-+ $(MOC) $(srcdir)/kviewshell.h -o kviewshell.moc
-
- #>+ 2
--mocs: sizePreview.moc
-+mocs: kviewshell.moc
-
- #>+ 3
- history.moc: $(srcdir)/history.h
-@@ -1162,18 +1165,18 @@
- mocs: zoom.moc
-
- #>+ 3
--marklist.moc: $(srcdir)/marklist.h
-- $(MOC) $(srcdir)/marklist.h -o marklist.moc
-+pageSize.moc: $(srcdir)/pageSize.h
-+ $(MOC) $(srcdir)/pageSize.h -o pageSize.moc
-
- #>+ 2
--mocs: marklist.moc
-+mocs: pageSize.moc
-
- #>+ 3
--pageSize.moc: $(srcdir)/pageSize.h
-- $(MOC) $(srcdir)/pageSize.h -o pageSize.moc
-+marklist.moc: $(srcdir)/marklist.h
-+ $(MOC) $(srcdir)/marklist.h -o marklist.moc
-
- #>+ 2
--mocs: pageSize.moc
-+mocs: marklist.moc
-
- #>+ 3
- empty_multipage.moc: $(srcdir)/empty_multipage.h
-@@ -1220,10 +1223,10 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f kviewpart_iface.moc kviewpart.moc documentWidget.moc emptyRenderer.moc selection.moc pageSizeDialog.moc documentRenderer.moc kviewshell.moc sizePreview.moc history.moc kmultipage.moc zoom.moc marklist.moc pageSize.moc empty_multipage.moc pageSizeWidget.moc centeringScrollview.moc documentPageCache.moc
-+ -rm -f kviewpart_iface.moc kviewpart.moc documentWidget.moc emptyRenderer.moc pageSizeDialog.moc selection.moc documentRenderer.moc sizePreview.moc kviewshell.moc history.moc kmultipage.moc zoom.moc pageSize.moc marklist.moc empty_multipage.moc pageSizeWidget.moc centeringScrollview.moc documentPageCache.moc
-
- #>+ 2
--KDE_DIST=optionDialogGUIWidget_base.ui kviewshell.h documentPagePixmap.h DESIGN emptymultipage.desktop kvsprefs.kcfgc documentWidget.h zoom.h pageSizeWidget_base.ui documentPage.h cr16-app-kviewshell.png history.h pageNumber.h centeringScrollview.h cr32-app-kviewshell.png simplePageSize.h kmultipage.h documentRenderer.h kviewshell.kcfg kviewpart.h Makefile.am pageSize.h empty_multipage.h pageSizeWidget.h kmultipage.desktop Makefile.in kviewerpart.rc sizePreview.h documentPageCache.h emptyRenderer.h anchor.h zoomlimits.h units.h marklist.h cr48-app-kviewshell.png kviewpart_iface.h pageSizeDialog.h kviewshell.rc selection.h
-+KDE_DIST=kviewshell.h optionDialogGUIWidget_base.ui documentPagePixmap.h DESIGN emptymultipage.desktop kvsprefs.kcfgc documentWidget.h zoom.h pageSizeWidget_base.ui documentPage.h cr16-app-kviewshell.png history.h pageNumber.h centeringScrollview.h cr32-app-kviewshell.png simplePageSize.h kmultipage.h documentRenderer.h kviewshell.kcfg kviewpart.h Makefile.am pageSize.h empty_multipage.h pageSizeWidget.h kmultipage.desktop Makefile.in kviewerpart.rc sizePreview.h documentPageCache.h emptyRenderer.h anchor.h zoomlimits.h units.h marklist.h cr48-app-kviewshell.png kviewpart_iface.h pageSizeDialog.h kviewshell.rc selection.h
-
- #>+ 4
- clean-idl:
-@@ -1326,7 +1329,7 @@
- rm -f kviewerpart_la.all_cpp.final kviewerpart_la.all_cpp.files
-
- #>+ 11
--libkmultipage_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmultipage.cpp $(srcdir)/centeringScrollview.cpp $(srcdir)/marklist.cpp $(srcdir)/units.cpp $(srcdir)/pageSize.cpp $(srcdir)/simplePageSize.cpp $(srcdir)/documentPage.cpp $(srcdir)/documentPageCache.cpp $(srcdir)/documentWidget.cpp $(srcdir)/selection.cpp $(srcdir)/documentRenderer.cpp $(srcdir)/history.cpp kmultipageInterface_skel.cpp kvsprefs.cpp documentWidget.moc selection.moc documentRenderer.moc history.moc kmultipage.moc marklist.moc pageSize.moc centeringScrollview.moc documentPageCache.moc
-+libkmultipage_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmultipage.cpp $(srcdir)/centeringScrollview.cpp $(srcdir)/marklist.cpp $(srcdir)/units.cpp $(srcdir)/pageSize.cpp $(srcdir)/simplePageSize.cpp $(srcdir)/documentPage.cpp $(srcdir)/documentPageCache.cpp $(srcdir)/documentWidget.cpp $(srcdir)/selection.cpp $(srcdir)/documentRenderer.cpp $(srcdir)/history.cpp kmultipageInterface_skel.cpp kvsprefs.cpp documentWidget.moc selection.moc documentRenderer.moc history.moc kmultipage.moc pageSize.moc marklist.moc centeringScrollview.moc documentPageCache.moc
- @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; \
-@@ -1409,8 +1412,8 @@
- pageSize.o: pageSize.moc
- nmcheck:
- $(srcdir)/simplePageSize.cpp: pageSizeWidget_base.h optionDialogGUIWidget_base.h kvsprefs.h kvsprefs.h
--selection.lo: selection.moc
- sizePreview.lo: sizePreview.moc
-+selection.lo: selection.moc
- $(srcdir)/sizePreview.cpp: pageSizeWidget_base.h optionDialogGUIWidget_base.h kvsprefs.h
- $(srcdir)/selection.cpp: kvsprefs.h
- history.lo: history.moc
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/libkscan/Makefile.in kdegraphics-3.4.0/libkscan/Makefile.in
---- kdegraphics-3.4.0.orig/libkscan/Makefile.in 2005-03-04 13:27:35.000000000 +0100
-+++ kdegraphics-3.4.0/libkscan/Makefile.in 2005-03-05 02:51:52.145637442 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -87,18 +87,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkscan_la_SOURCES)
- DIST_SOURCES = $(libkscan_la_SOURCES)
+diff -rua kdegraphics-3.4.1.orig/libkscan/Makefile.in kdegraphics-3.4.1/libkscan/Makefile.in
+--- kdegraphics-3.4.1.orig/libkscan/Makefile.in 2005-05-23 18:01:25.000000000 +0200
++++ kdegraphics-3.4.1/libkscan/Makefile.in 2005-05-25 08:29:53.285271740 +0200
@@ -268,6 +268,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -23676,7 +11782,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -478,7 +481,7 @@
+@@ -479,7 +482,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23685,7 +11791,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -516,9 +519,9 @@
+@@ -517,9 +520,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23697,112 +11803,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -632,7 +635,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -644,7 +653,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -652,7 +661,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -673,7 +688,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -946,18 +961,18 @@
- mocs: scanparams.moc
-
- #>+ 3
--massscandialog.moc: $(srcdir)/massscandialog.h
-- $(MOC) $(srcdir)/massscandialog.h -o massscandialog.moc
-+kscanoption.moc: $(srcdir)/kscanoption.h
-+ $(MOC) $(srcdir)/kscanoption.h -o kscanoption.moc
-
- #>+ 2
--mocs: massscandialog.moc
-+mocs: kscanoption.moc
-
- #>+ 3
--kscanoption.moc: $(srcdir)/kscanoption.h
-- $(MOC) $(srcdir)/kscanoption.h -o kscanoption.moc
-+massscandialog.moc: $(srcdir)/massscandialog.h
-+ $(MOC) $(srcdir)/massscandialog.h -o massscandialog.moc
-
- #>+ 2
--mocs: kscanoption.moc
-+mocs: massscandialog.moc
-
- #>+ 3
- dispgamma.moc: $(srcdir)/dispgamma.h
-@@ -1017,7 +1032,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f scandialog.moc kgammatable.moc scansourcedialog.moc previewer.moc scanparams.moc massscandialog.moc kscanoption.moc dispgamma.moc imgscaledialog.moc devselector.moc img_canvas.moc sizeindicator.moc gammadialog.moc kscanslider.moc kscandevice.moc
-+ -rm -f scandialog.moc kgammatable.moc scansourcedialog.moc previewer.moc scanparams.moc kscanoption.moc massscandialog.moc dispgamma.moc imgscaledialog.moc devselector.moc img_canvas.moc sizeindicator.moc gammadialog.moc kscanslider.moc kscandevice.moc
-
- #>+ 2
- KDE_DIST=scanservice.desktop Makefile.am scandialog.h Makefile.in configure.in.in configure.in.bot kscandoc.h
-@@ -1068,7 +1083,7 @@
-
-
- #>+ 11
--libkscan_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kscandevice.cpp $(srcdir)/kscanslider.cpp $(srcdir)/kgammatable.cpp $(srcdir)/kscanoption.cpp $(srcdir)/kscanoptset.cpp $(srcdir)/gammadialog.cpp $(srcdir)/dispgamma.cpp $(srcdir)/scansourcedialog.cpp $(srcdir)/scanparams.cpp $(srcdir)/massscandialog.cpp $(srcdir)/devselector.cpp $(srcdir)/scandialog.cpp $(srcdir)/img_canvas.cpp $(srcdir)/previewer.cpp $(srcdir)/imgscaledialog.cpp $(srcdir)/sizeindicator.cpp $(srcdir)/imgscaninfo.cpp kgammatable.moc scandialog.moc scansourcedialog.moc previewer.moc scanparams.moc kscanoption.moc massscandialog.moc imgscaledialog.moc dispgamma.moc img_canvas.moc devselector.moc sizeindicator.moc gammadialog.moc kscanslider.moc kscandevice.moc
-+libkscan_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kscandevice.cpp $(srcdir)/kscanslider.cpp $(srcdir)/kgammatable.cpp $(srcdir)/kscanoption.cpp $(srcdir)/kscanoptset.cpp $(srcdir)/gammadialog.cpp $(srcdir)/dispgamma.cpp $(srcdir)/scansourcedialog.cpp $(srcdir)/scanparams.cpp $(srcdir)/massscandialog.cpp $(srcdir)/devselector.cpp $(srcdir)/scandialog.cpp $(srcdir)/img_canvas.cpp $(srcdir)/previewer.cpp $(srcdir)/imgscaledialog.cpp $(srcdir)/sizeindicator.cpp $(srcdir)/imgscaninfo.cpp kgammatable.moc scandialog.moc scansourcedialog.moc previewer.moc scanparams.moc massscandialog.moc kscanoption.moc imgscaledialog.moc dispgamma.moc img_canvas.moc devselector.moc sizeindicator.moc gammadialog.moc kscanslider.moc kscandevice.moc
- @echo 'creating libkscan_la.all_cpp.cpp ...'; \
- rm -f libkscan_la.all_cpp.files libkscan_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libkscan_la.all_cpp.final; \
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/libkscan/pics/Makefile.in kdegraphics-3.4.0/libkscan/pics/Makefile.in
---- kdegraphics-3.4.0.orig/libkscan/pics/Makefile.in 2005-03-04 13:27:35.000000000 +0100
-+++ kdegraphics-3.4.0/libkscan/pics/Makefile.in 2005-03-05 02:51:52.154635899 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdegraphics-3.4.1.orig/libkscan/pics/Makefile.in kdegraphics-3.4.1/libkscan/pics/Makefile.in
+--- kdegraphics-3.4.1.orig/libkscan/pics/Makefile.in 2005-05-23 18:01:25.000000000 +0200
++++ kdegraphics-3.4.1/libkscan/pics/Makefile.in 2005-05-25 08:29:53.298270561 +0200
@@ -196,6 +196,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -23813,7 +11816,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -382,7 +385,7 @@
+@@ -383,7 +386,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23822,7 +11825,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -420,9 +423,9 @@
+@@ -421,9 +424,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23834,24 +11837,58 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -573,16 +576,16 @@
- #>+ 13
- install-kde-icons:
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
-- $(INSTALL_DATA) $(srcdir)/cr16-action-palette_color.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_color.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-palette_gray.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_gray.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-palette_halftone.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_halftone.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-palette_color.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_color.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-palette_lineart.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_lineart.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-palette_gray.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_gray.png
+diff -rua kdegraphics-3.4.1.orig/Makefile.in kdegraphics-3.4.1/Makefile.in
+--- kdegraphics-3.4.1.orig/Makefile.in 2005-05-23 18:01:22.000000000 +0200
++++ kdegraphics-3.4.1/Makefile.in 2005-05-25 08:29:49.152646499 +0200
+@@ -229,6 +229,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@
+@@ -428,7 +431,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*) \
+@@ -470,12 +473,12 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ $(SHELL) ./config.status --recheck
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_color.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_gray.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_halftone.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_color.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_lineart.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_gray.png
+-$(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)
- #>+ 15
- force-reedit:
+ config.h: stamp-h1
+@@ -487,7 +490,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 $@
+@@ -910,7 +913,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 configure acinclude.m4 Makefile.am Makefile.am.in
+
+ #>+ 2
+ docs-am: