[Pkg-kde-commits] rev 1395 -
branches/kde-3.4.0/packages/kdeadmin/debian/patches
Christopher Martin
chrsmrtn-guest at costa.debian.org
Sun Jul 31 18:24:48 UTC 2005
Author: chrsmrtn-guest
Date: 2005-07-31 18:24:47 +0000 (Sun, 31 Jul 2005)
New Revision: 1395
Modified:
branches/kde-3.4.0/packages/kdeadmin/debian/patches/98_buildprep.diff
Log:
Uodated buildprep for kdeadmin 3.4.2.
Modified: branches/kde-3.4.0/packages/kdeadmin/debian/patches/98_buildprep.diff
===================================================================
--- branches/kde-3.4.0/packages/kdeadmin/debian/patches/98_buildprep.diff 2005-07-31 18:22:59 UTC (rev 1394)
+++ branches/kde-3.4.0/packages/kdeadmin/debian/patches/98_buildprep.diff 2005-07-31 18:24:47 UTC (rev 1395)
@@ -1,7 +1,7 @@
-diff -rua kdeadmin-3.4.1.orig/acinclude.m4 kdeadmin-3.4.1/acinclude.m4
---- kdeadmin-3.4.1.orig/acinclude.m4 2005-05-23 17:44:37.000000000 +0200
-+++ kdeadmin-3.4.1/acinclude.m4 2005-05-25 00:37:40.291834171 +0200
-@@ -1690,15 +1690,6 @@
+diff -Nru kdeadmin-3.4.2.orig/acinclude.m4 kdeadmin-3.4.2/acinclude.m4
+--- kdeadmin-3.4.2.orig/acinclude.m4 2005-07-20 19:53:51.000000000 +0000
++++ kdeadmin-3.4.2/acinclude.m4 2005-07-31 17:57:31.748630728 +0000
+@@ -1688,15 +1688,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -17,7 +17,7 @@
fi
AC_SUBST(KDE_USE_CLOSURE_TRUE)
AC_SUBST(KDE_USE_CLOSURE_FALSE)
-@@ -2139,9 +2130,6 @@
+@@ -2138,9 +2129,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -27,7 +27,80 @@
AC_TRY_COMPILE([
$2
],
-@@ -5770,6 +5758,7 @@
+@@ -3288,39 +3276,39 @@
+
+ if test "x$GXX" = "xyes"; then
+ kde_have_gcc_visibility=no
+- KDE_CHECK_COMPILER_FLAG(fvisibility=hidden,
+- [
+- kde_have_gcc_visibility=yes
+- AC_CACHE_CHECK([if Qt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched,
+- [
+- AC_LANG_SAVE
+- AC_LANG_CPLUSPLUS
+-
+- safe_CXXFLAGS=$CXXFLAGS
+- CXXFLAGS="$CXXFLAGS $all_includes"
+-
+- AC_TRY_COMPILE(
+- [
+-#include <qglobal.h>
+-#if Q_EXPORT - 0 != 0
+-/* if this compiles, then Q_EXPORT is undefined */
+-/* if Q_EXPORT is nonempty, this will break compilation */
+-#endif
+- ], [/* elvis is alive */],
+- kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
+-
+- CXXFLAGS=$safe_CXXFLAGS
+- AC_LANG_RESTORE
+- ]
+- )
+-
+- if test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
+- CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+- KDE_CHECK_VISIBILITY_GCC_BUG
+- HAVE_GCC_VISIBILITY=1
+- AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
+- fi
+- ])
++dnl KDE_CHECK_COMPILER_FLAG(fvisibility=hidden,
++dnl [
++dnl kde_have_gcc_visibility=yes
++dnl AC_CACHE_CHECK([if Qt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched,
++dnl [
++dnl AC_LANG_SAVE
++dnl AC_LANG_CPLUSPLUS
++dnl
++dnl safe_CXXFLAGS=$CXXFLAGS
++dnl CXXFLAGS="$CXXFLAGS $all_includes"
++dnl
++dnl AC_TRY_COMPILE(
++dnl [
++dnl #include <qglobal.h>
++dnl #if Q_EXPORT - 0 != 0
++dnl /* if this compiles, then Q_EXPORT is undefined */
++dnl /* if Q_EXPORT is nonempty, this will break compilation */
++dnl #endif
++dnl ], [/* elvis is alive */],
++dnl kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
++dnl
++dnl CXXFLAGS=$safe_CXXFLAGS
++dnl AC_LANG_RESTORE
++dnl ]
++dnl )
++dnl
++dnl if test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
++dnl CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
++dnl KDE_CHECK_VISIBILITY_GCC_BUG
++dnl HAVE_GCC_VISIBILITY=1
++dnl AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
++dnl fi
++dnl ])
+ fi
+ ])
+
+@@ -5799,6 +5787,7 @@
## the same distribution terms that you use for the rest of that program.
# serial 47 AC_PROG_LIBTOOL
@@ -35,7 +108,7 @@
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -5829,7 +5818,7 @@
+@@ -5858,7 +5847,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -44,7 +117,7 @@
AC_SUBST(LIBTOOL)dnl
# Prevent multiple expansion
-@@ -6243,12 +6232,11 @@
+@@ -6272,12 +6261,11 @@
if AC_TRY_EVAL(ac_compile); then
case "`/usr/bin/file conftest.o`" in
*32-bit*)
@@ -58,7 +131,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -6260,7 +6248,6 @@
+@@ -6289,7 +6277,6 @@
esac
;;
*64-bit*)
@@ -66,7 +139,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -6390,7 +6377,7 @@
+@@ -6419,7 +6406,7 @@
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
@@ -75,7 +148,7 @@
case $build_os in
msdosdjgpp*)
-@@ -6419,20 +6406,26 @@
+@@ -6448,20 +6435,26 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -107,7 +180,7 @@
# Add a significant safety factor because C++ compilers can tack on massive
# amounts of additional arguments before passing them to the linker.
# It appears as though 1/2 is a usable value.
-@@ -6582,7 +6575,7 @@
+@@ -6611,7 +6604,7 @@
lt_cv_dlopen_self=yes
])
;;
@@ -116,7 +189,7 @@
*)
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
-@@ -6671,13 +6664,6 @@
+@@ -6700,13 +6693,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -130,7 +203,7 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -6701,8 +6687,11 @@
+@@ -6730,8 +6716,11 @@
fi
fi
chmod u+w .
@@ -144,7 +217,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -6819,7 +6808,7 @@
+@@ -6848,7 +6837,7 @@
*)
AC_MSG_RESULT([no])
;;
@@ -153,7 +226,7 @@
fi
])# AC_LIBTOOL_SYS_LIB_STRIP
-@@ -6832,7 +6821,7 @@
+@@ -6861,7 +6850,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -162,7 +235,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -6842,7 +6831,20 @@
+@@ -6871,7 +6860,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -184,7 +257,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -6907,7 +6909,7 @@
+@@ -6936,7 +6938,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -193,7 +266,7 @@
;;
beos*)
-@@ -6932,7 +6934,7 @@
+@@ -6961,7 +6963,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -202,7 +275,7 @@
need_version=no
need_lib_prefix=no
-@@ -6997,7 +6999,7 @@
+@@ -7026,7 +7028,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -211,7 +284,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -7020,7 +7022,7 @@
+@@ -7049,7 +7051,7 @@
dynamic_linker=no
;;
@@ -220,7 +293,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -7080,7 +7082,7 @@
+@@ -7109,7 +7111,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -229,7 +302,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -7095,7 +7097,7 @@
+@@ -7124,7 +7126,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -238,7 +311,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7106,7 +7108,7 @@
+@@ -7135,7 +7137,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -247,7 +320,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7168,22 +7170,19 @@
+@@ -7197,22 +7199,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -276,7 +349,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -7193,6 +7192,30 @@
+@@ -7222,6 +7221,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -307,7 +380,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -7202,7 +7225,7 @@
+@@ -7231,7 +7254,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -316,7 +389,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -7231,7 +7254,7 @@
+@@ -7260,7 +7283,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -325,7 +398,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -7251,7 +7274,7 @@
+@@ -7280,7 +7303,7 @@
os2*)
libname_spec='$name'
@@ -334,7 +407,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -7842,31 +7865,23 @@
+@@ -7871,31 +7894,23 @@
;;
cygwin*)
@@ -375,7 +448,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -7905,42 +7920,21 @@
+@@ -7934,42 +7949,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -425,7 +498,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
-@@ -7969,9 +7963,6 @@
+@@ -7998,9 +7992,6 @@
;;
osf3* | osf4* | osf5*)
@@ -435,7 +508,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -7981,7 +7972,6 @@
+@@ -8010,7 +8001,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -443,7 +516,7 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -8247,7 +8237,7 @@
+@@ -8276,7 +8266,7 @@
fi
if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
@@ -452,7 +525,7 @@
else
AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
_LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
-@@ -8297,7 +8287,7 @@
+@@ -8326,7 +8316,7 @@
fi
;;
@@ -461,7 +534,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -8307,29 +8297,29 @@
+@@ -8336,29 +8326,29 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -505,7 +578,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8337,8 +8327,8 @@
+@@ -8366,8 +8356,8 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -516,7 +589,7 @@
esac
AC_MSG_RESULT([$enable_shared])
-@@ -8446,8 +8436,8 @@
+@@ -8475,8 +8465,8 @@
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
if test "$with_gnu_ld" = yes; then
@@ -527,7 +600,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -8473,7 +8463,7 @@
+@@ -8502,7 +8492,7 @@
# linker, instead of GNU ld. If possible, this setting should
# overridden to take advantage of the native linker features on
# the platform it is being used on.
@@ -536,7 +609,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -8503,8 +8493,22 @@
+@@ -8532,8 +8522,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -561,7 +634,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -8550,15 +8554,16 @@
+@@ -8579,15 +8583,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -582,7 +655,7 @@
if test "$aix_use_runtimelinking" = yes; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
-@@ -8567,13 +8572,12 @@
+@@ -8596,13 +8601,12 @@
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -598,7 +671,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -8588,7 +8592,7 @@
+@@ -8617,7 +8621,7 @@
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -607,7 +680,7 @@
fi
fi
;;
-@@ -8605,12 +8609,12 @@
+@@ -8634,12 +8638,12 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -622,7 +695,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -8619,7 +8623,7 @@
+@@ -8648,7 +8652,7 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -631,7 +704,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -8630,20 +8634,20 @@
+@@ -8659,20 +8663,20 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -662,7 +735,7 @@
fi
;;
esac
-@@ -8653,19 +8657,19 @@
+@@ -8682,19 +8686,19 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -688,7 +761,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8700,7 +8704,7 @@
+@@ -8729,7 +8733,7 @@
freebsd-elf*)
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
;;
@@ -697,7 +770,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8722,7 +8726,7 @@
+@@ -8751,7 +8755,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
aCC)
@@ -706,7 +779,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8731,11 +8735,11 @@
+@@ -8760,11 +8764,11 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -720,7 +793,7 @@
else
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8792,7 +8796,7 @@
+@@ -8821,7 +8825,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -729,7 +802,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -8813,7 +8817,7 @@
+@@ -8842,7 +8846,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -738,7 +811,7 @@
;;
esac
fi
-@@ -8828,7 +8832,7 @@
+@@ -8857,7 +8861,7 @@
case $cc_basename in
CC)
# SGI C++
@@ -747,7 +820,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -8839,9 +8843,9 @@
+@@ -8868,9 +8872,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -759,7 +832,7 @@
fi
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -8858,8 +8862,8 @@
+@@ -8887,8 +8891,8 @@
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -770,7 +843,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8881,16 +8885,16 @@
+@@ -8910,16 +8914,16 @@
# Intel C++
with_gnu_ld=yes
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -791,7 +864,7 @@
runpath_var=LD_RUN_PATH
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -8928,7 +8932,7 @@
+@@ -8957,7 +8961,7 @@
;;
esac
;;
@@ -800,7 +873,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -8947,7 +8951,7 @@
+@@ -8976,7 +8980,7 @@
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -809,7 +882,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8964,7 +8968,7 @@
+@@ -8993,7 +8997,7 @@
;;
cxx)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -818,7 +891,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8982,7 +8986,7 @@
+@@ -9011,7 +9015,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -827,7 +900,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9007,7 +9011,7 @@
+@@ -9036,7 +9040,7 @@
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -836,7 +909,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9023,10 +9027,10 @@
+@@ -9052,10 +9056,10 @@
;;
cxx)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
@@ -849,7 +922,7 @@
$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9045,7 +9049,7 @@
+@@ -9074,7 +9078,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -858,7 +931,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9102,9 +9106,9 @@
+@@ -9131,9 +9135,9 @@
CC)
# Sun C++ 4.2, 5.x and Centerline C++
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -870,7 +943,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -9138,7 +9142,7 @@
+@@ -9167,7 +9171,7 @@
;;
gcx)
# Green Hills C++ Compiler
@@ -879,7 +952,7 @@
# The C++ compiler must be used to create the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9148,9 +9152,9 @@
+@@ -9177,9 +9181,9 @@
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -891,7 +964,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9159,9 +9163,9 @@
+@@ -9188,9 +9192,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -903,7 +976,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9329,7 +9333,7 @@
+@@ -9358,7 +9362,7 @@
fi
;;
@@ -912,7 +985,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -9438,7 +9442,7 @@
+@@ -9467,7 +9471,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -921,7 +994,7 @@
test "$enable_shared" = yes && enable_static=no
;;
esac
-@@ -9580,11 +9584,12 @@
+@@ -9609,11 +9613,12 @@
# without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
@@ -936,7 +1009,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -9634,7 +9639,7 @@
+@@ -9663,7 +9668,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \
@@ -945,7 +1018,7 @@
_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
_LT_AC_TAGVAR(export_symbols_cmds, $1) | \
extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9765,7 +9770,7 @@
+@@ -9794,7 +9799,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -954,7 +1027,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -9796,7 +9801,7 @@
+@@ -9825,7 +9830,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -963,7 +1036,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -10040,7 +10045,10 @@
+@@ -10069,7 +10074,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -975,7 +1048,7 @@
fi
])# AC_LIBTOOL_CONFIG
-@@ -10113,7 +10121,7 @@
+@@ -10142,7 +10150,7 @@
symcode='[[BCDEGQRST]]'
;;
solaris* | sysv5*)
@@ -984,7 +1057,7 @@
;;
sysv4)
symcode='[[DFNSTU]]'
-@@ -10131,7 +10139,7 @@
+@@ -10160,7 +10168,7 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -993,7 +1066,7 @@
esac
# Try without a prefix undercore, then with it.
-@@ -10346,7 +10354,7 @@
+@@ -10375,7 +10383,7 @@
;;
esac
;;
@@ -1002,7 +1075,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -10397,7 +10405,7 @@
+@@ -10426,7 +10434,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
@@ -1011,7 +1084,7 @@
cxx)
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -10422,7 +10430,7 @@
+@@ -10451,7 +10459,7 @@
;;
esac
;;
@@ -1020,7 +1093,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -10733,6 +10741,9 @@
+@@ -10762,6 +10770,9 @@
cygwin* | mingw*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -1030,7 +1103,7 @@
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -10757,7 +10768,7 @@
+@@ -10786,7 +10797,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
@@ -1039,7 +1112,7 @@
_LT_AC_TAGVAR(always_export_symbols, $1)=no
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
# include_expsyms should be a list of space-separated symbols to be *always*
-@@ -10831,7 +10842,7 @@
+@@ -10860,7 +10871,7 @@
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -1048,7 +1121,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10841,13 +10852,13 @@
+@@ -10870,13 +10881,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -1064,7 +1137,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -10856,19 +10867,19 @@
+@@ -10885,19 +10896,19 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -1088,7 +1161,7 @@
fi
;;
-@@ -10886,8 +10897,8 @@
+@@ -10915,8 +10926,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -1099,7 +1172,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10900,10 +10911,36 @@
+@@ -10929,10 +10940,36 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
@@ -1138,7 +1211,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10953,9 +10990,20 @@
+@@ -10982,9 +11019,20 @@
else
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
fi
@@ -1161,7 +1234,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -11001,29 +11049,29 @@
+@@ -11030,29 +11078,29 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -1200,7 +1273,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -11038,7 +11086,7 @@
+@@ -11067,7 +11115,7 @@
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -1209,7 +1282,7 @@
fi
fi
;;
-@@ -11061,13 +11109,13 @@
+@@ -11090,13 +11138,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -1226,7 +1299,7 @@
# The linker will automatically build a .lib file if we build a DLL.
_LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
# FIXME: Should let the user specify the lib program.
-@@ -11081,21 +11129,21 @@
+@@ -11110,21 +11158,21 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -1261,7 +1334,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -11104,26 +11152,26 @@
+@@ -11133,26 +11181,26 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -1296,7 +1369,7 @@
;;
dgux*)
-@@ -11156,8 +11204,8 @@
+@@ -11185,8 +11233,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -1307,7 +1380,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11165,7 +11213,7 @@
+@@ -11194,7 +11242,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -1316,7 +1389,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -11183,10 +11231,10 @@
+@@ -11212,10 +11260,10 @@
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case "$host_cpu" in
hppa*64*|ia64*)
@@ -1329,7 +1402,7 @@
;;
esac
else
-@@ -11233,7 +11281,7 @@
+@@ -11262,7 +11310,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -1338,7 +1411,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-@@ -11243,7 +11291,7 @@
+@@ -11272,7 +11320,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -1347,7 +1420,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -11266,7 +11314,7 @@
+@@ -11295,7 +11343,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -1356,7 +1429,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
else
-@@ -11276,7 +11324,7 @@
+@@ -11305,7 +11353,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
;;
*)
@@ -1365,7 +1438,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
;;
esac
-@@ -11287,14 +11335,14 @@
+@@ -11316,14 +11364,14 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -1382,7 +1455,7 @@
else
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -11306,7 +11354,7 @@
+@@ -11335,7 +11383,7 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1391,7 +1464,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
else
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-@@ -11331,9 +11379,9 @@
+@@ -11360,9 +11408,9 @@
solaris*)
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
if test "$GCC" = yes; then
@@ -1403,7 +1476,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -11353,7 +11401,7 @@
+@@ -11382,7 +11430,7 @@
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
@@ -1412,7 +1485,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -11413,9 +11461,9 @@
+@@ -11442,9 +11490,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
_LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -1424,7 +1497,7 @@
fi
runpath_var='LD_RUN_PATH'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11473,7 +11521,7 @@
+@@ -11502,7 +11550,7 @@
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -1433,7 +1506,7 @@
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest
lib=conftest
-@@ -11632,8 +11680,8 @@
+@@ -11661,8 +11709,8 @@
fi
done
done
@@ -1443,9 +1516,9 @@
AC_MSG_RESULT([$SED])
])
-diff -rua kdeadmin-3.4.1.orig/aclocal.m4 kdeadmin-3.4.1/aclocal.m4
---- kdeadmin-3.4.1.orig/aclocal.m4 2005-05-23 17:44:47.000000000 +0200
-+++ kdeadmin-3.4.1/aclocal.m4 2005-05-25 00:37:47.962142748 +0200
+diff -Nru kdeadmin-3.4.2.orig/aclocal.m4 kdeadmin-3.4.2/aclocal.m4
+--- kdeadmin-3.4.2.orig/aclocal.m4 2005-07-20 19:54:02.000000000 +0000
++++ kdeadmin-3.4.2/aclocal.m4 2005-07-31 17:58:01.245146576 +0000
@@ -501,6 +501,35 @@
rmdir .tst 2>/dev/null
AC_SUBST([am__leading_dot])])
@@ -1482,15 +1555,15 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-diff -rua kdeadmin-3.4.1.orig/configure kdeadmin-3.4.1/configure
---- kdeadmin-3.4.1.orig/configure 2005-05-23 17:45:09.000000000 +0200
-+++ kdeadmin-3.4.1/configure 2005-05-25 00:38:06.899435655 +0200
+diff -Nru kdeadmin-3.4.2.orig/configure kdeadmin-3.4.2/configure
+--- kdeadmin-3.4.2.orig/configure 2005-07-20 19:54:30.000000000 +0000
++++ kdeadmin-3.4.2/configure 2005-07-31 17:58:59.773248952 +0000
@@ -464,7 +464,7 @@
# include <unistd.h>
#endif"
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KSYCOCA LIB_KFILE LIB_KFM PAMLIBS LIBSHADOW LIBGEN SETUIDFLAGS KU_FIRSTUID KU_FIRSTGID KU_HOMEDIR_PERM KU_MAILBOX_PERM KU_MAILBOX_GID TOPSUBDIRS doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kcron_SUBDIR_included_TRUE kcron_SUBDIR_included_FALSE kdat_SUBDIR_included_TRUE kdat_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kpackage_SUBDIR_included_TRUE kpackage_SUBDIR_included_FALSE ksysv_SUBDIR_included_TRUE ksysv_SUBDIR_included_FALSE kuser_SUBDIR_included_TRUE kuser_SUBDIR_included_FALSE lilo_config_SUBDIR_included_TRUE lilo_config_SUBDIR_included_FALSE secpolicy_SUBDIR_included_TRUE secpolicy_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KSYCOCA LIB_KFILE LIB_KFM PAMLIBS LIBSHADOW LIBGEN SETUIDFLAGS KU_FIRSTUID KU_FIRSTGID KU_HOMEDIR_PERM KU_MAILBOX_PERM KU_MAILBOX_GID TOPSUBDIRS doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kcron_SUBDIR_included_TRUE kcron_SUBDIR_included_FALSE kdat_SUBDIR_included_TRUE kdat_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kpackage_SUBDIR_included_TRUE kpackage_SUBDIR_included_FALSE ksysv_SUBDIR_included_TRUE ksysv_SUBDIR_included_FALSE kuser_SUBDIR_included_TRUE kuser_SUBDIR_included_FALSE lilo_config_SUBDIR_included_TRUE lilo_config_SUBDIR_included_FALSE secpolicy_SUBDIR_included_TRUE secpolicy_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM PAMLIBS LIBSHADOW LIBGEN SETUIDFLAGS KU_FIRSTUID KU_FIRSTGID KU_HOMEDIR_PERM KU_MAILBOX_PERM KU_MAILBOX_GID TOPSUBDIRS doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kcron_SUBDIR_included_TRUE kcron_SUBDIR_included_FALSE kdat_SUBDIR_included_TRUE kdat_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kpackage_SUBDIR_included_TRUE kpackage_SUBDIR_included_FALSE ksysv_SUBDIR_included_TRUE ksysv_SUBDIR_included_FALSE kuser_SUBDIR_included_TRUE kuser_SUBDIR_included_FALSE lilo_config_SUBDIR_included_TRUE lilo_config_SUBDIR_included_FALSE secpolicy_SUBDIR_included_TRUE secpolicy_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM PAMLIBS LIBSHADOW LIBGEN SETUIDFLAGS KU_FIRSTUID KU_FIRSTGID KU_HOMEDIR_PERM KU_MAILBOX_PERM KU_MAILBOX_GID TOPSUBDIRS doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kcron_SUBDIR_included_TRUE kcron_SUBDIR_included_FALSE kdat_SUBDIR_included_TRUE kdat_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kpackage_SUBDIR_included_TRUE kpackage_SUBDIR_included_FALSE ksysv_SUBDIR_included_TRUE ksysv_SUBDIR_included_FALSE kuser_SUBDIR_included_TRUE kuser_SUBDIR_included_FALSE lilo_config_SUBDIR_included_TRUE lilo_config_SUBDIR_included_FALSE secpolicy_SUBDIR_included_TRUE secpolicy_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -6358,7 +6431,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28596,8 +28519,7 @@
+@@ -28599,8 +28522,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6368,7 +6441,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28672,8 +28594,7 @@
+@@ -28675,8 +28597,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6378,7 +6451,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28733,8 +28654,7 @@
+@@ -28736,8 +28657,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6388,7 +6461,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28817,8 +28737,7 @@
+@@ -28820,8 +28740,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6398,7 +6471,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28911,8 +28830,7 @@
+@@ -28914,8 +28833,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6408,7 +6481,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29086,8 +29004,7 @@
+@@ -29089,8 +29007,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6418,7 +6491,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29185,8 +29102,7 @@
+@@ -29188,8 +29105,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6428,7 +6501,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29279,8 +29195,7 @@
+@@ -29282,8 +29198,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6438,7 +6511,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29363,8 +29278,7 @@
+@@ -29366,8 +29281,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6448,25 +6521,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29417,7 +29331,7 @@
+@@ -29420,7 +29334,7 @@
do
for j in jpeglib.h;
do
-- echo "configure: 29420: $i/$j" >&5
-+ echo "configure: 29334: $i/$j" >&5
+- echo "configure: 29423: $i/$j" >&5
++ echo "configure: 29337: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -29725,7 +29639,7 @@
+@@ -29723,7 +29637,7 @@
do
for j in $kde_qt_header;
do
-- echo "configure: 29728: $i/$j" >&5
-+ echo "configure: 29642: $i/$j" >&5
+- echo "configure: 29726: $i/$j" >&5
++ echo "configure: 29640: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -30402,8 +30316,7 @@
+@@ -30400,8 +30314,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6476,39 +6549,39 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30562,7 +30475,7 @@
+@@ -30560,7 +30473,7 @@
do
for j in $kde_check_header;
do
-- echo "configure: 30565: $i/$j" >&5
-+ echo "configure: 30478: $i/$j" >&5
+- echo "configure: 30563: $i/$j" >&5
++ echo "configure: 30476: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -30592,7 +30505,7 @@
+@@ -30590,7 +30503,7 @@
do
for j in $kde_check_lib;
do
-- echo "configure: 30595: $i/$j" >&5
-+ echo "configure: 30508: $i/$j" >&5
+- echo "configure: 30593: $i/$j" >&5
++ echo "configure: 30506: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -30610,7 +30523,7 @@
+@@ -30608,7 +30521,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
-- echo "configure: 30613: $i/$j" >&5
-+ echo "configure: 30526: $i/$j" >&5
+- echo "configure: 30611: $i/$j" >&5
++ echo "configure: 30524: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -32128,7 +32041,7 @@
+@@ -32126,7 +32039,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
-- echo "configure: 32131: $i/$j" >&5
-+ echo "configure: 32044: $i/$j" >&5
+- echo "configure: 32129: $i/$j" >&5
++ echo "configure: 32042: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
@@ -6742,7 +6815,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34626,8 +34512,7 @@
+@@ -34625,8 +34511,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6752,7 +6825,17 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34887,9 +34772,6 @@
+@@ -34772,8 +34657,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=$?
+@@ -34950,9 +34834,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -6762,7 +6845,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34918,8 +34800,7 @@
+@@ -34981,8 +34862,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6772,7 +6855,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35018,8 +34899,7 @@
+@@ -35081,8 +34961,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6782,7 +6865,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35096,9 +34976,6 @@
+@@ -35159,9 +35038,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -6792,7 +6875,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35127,8 +35004,7 @@
+@@ -35190,8 +35066,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6802,7 +6885,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35227,8 +35103,7 @@
+@@ -35290,8 +35165,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6812,7 +6895,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35305,9 +35180,6 @@
+@@ -35368,9 +35242,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -6822,7 +6905,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35336,8 +35208,7 @@
+@@ -35399,8 +35270,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6832,7 +6915,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35436,8 +35307,7 @@
+@@ -35499,8 +35369,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6842,7 +6925,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35531,8 +35401,7 @@
+@@ -35594,8 +35463,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6852,7 +6935,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35574,8 +35443,7 @@
+@@ -35637,8 +35505,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6862,7 +6945,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35632,8 +35500,7 @@
+@@ -35695,8 +35562,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6872,7 +6955,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36093,6 +35960,13 @@
+@@ -36154,6 +36020,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -6886,7 +6969,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
-@@ -36795,6 +36669,9 @@
+@@ -36855,6 +36728,9 @@
s, at AMTAR@,$AMTAR,;t t
s, at am__tar@,$am__tar,;t t
s, at am__untar@,$am__untar,;t t
@@ -6896,7 +6979,7 @@
s, at KDECONFIG@,$KDECONFIG,;t t
s, at kde_libs_prefix@,$kde_libs_prefix,;t t
s, at kde_libs_htmldir@,$kde_libs_htmldir,;t t
-@@ -37158,11 +37035,6 @@
+@@ -37219,11 +37095,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
@@ -6908,7 +6991,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. */
-@@ -37201,6 +37073,12 @@
+@@ -37262,6 +37133,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
@@ -6921,23 +7004,22 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
-diff -rua kdeadmin-3.4.1.orig/configure.in kdeadmin-3.4.1/configure.in
---- kdeadmin-3.4.1.orig/configure.in 2005-05-23 17:44:38.000000000 +0200
-+++ kdeadmin-3.4.1/configure.in 2005-05-25 00:37:40.667800281 +0200
+diff -Nru kdeadmin-3.4.2.orig/configure.in kdeadmin-3.4.2/configure.in
+--- kdeadmin-3.4.2.orig/configure.in 2005-07-20 19:53:52.000000000 +0000
++++ kdeadmin-3.4.2/configure.in 2005-07-31 17:57:32.478519768 +0000
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdeadmin, "3.4.1") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdeadmin, "3.4.2") dnl searches for some needed programs
+AM_MAINTAINER_MODE
+
KDE_SET_PREFIX
dnl generate the config header
-Seulement dans kdeadmin-3.4.1: debian
-diff -rua kdeadmin-3.4.1.orig/doc/kcron/Makefile.in kdeadmin-3.4.1/doc/kcron/Makefile.in
---- kdeadmin-3.4.1.orig/doc/kcron/Makefile.in 2005-05-23 17:45:07.000000000 +0200
-+++ kdeadmin-3.4.1/doc/kcron/Makefile.in 2005-05-25 00:38:04.863619175 +0200
-@@ -166,6 +166,9 @@
+diff -Nru kdeadmin-3.4.2.orig/doc/kcron/Makefile.in kdeadmin-3.4.2/doc/kcron/Makefile.in
+--- kdeadmin-3.4.2.orig/doc/kcron/Makefile.in 2005-07-20 19:54:27.000000000 +0000
++++ kdeadmin-3.4.2/doc/kcron/Makefile.in 2005-07-31 17:58:46.920202912 +0000
+@@ -167,6 +167,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -6947,7 +7029,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -319,7 +322,7 @@
+@@ -320,7 +323,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -6956,7 +7038,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -357,9 +360,9 @@
+@@ -358,9 +361,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -6968,19 +7050,47 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -504,7 +507,7 @@
+@@ -505,10 +508,10 @@
.NOEXPORT:
#>+ 2
-KDE_DIST=index.docbook Makefile.in print.png newvariable.png kcron.png newtask.png Makefile.am index.cache.bz2 kcronstart.png
-+KDE_DIST=Makefile.in print.png newvariable.png kcron.png index.docbook newtask.png Makefile.am index.cache.bz2 kcronstart.png
++KDE_DIST=print.png Makefile.in newvariable.png kcron.png index.docbook newtask.png Makefile.am kcronstart.png index.cache.bz2
#>+ 24
- index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) newvariable.png kcron.png newtask.png print.png index.docbook kcronstart.png
-diff -rua kdeadmin-3.4.1.orig/doc/kdat/Makefile.in kdeadmin-3.4.1/doc/kdat/Makefile.in
---- kdeadmin-3.4.1.orig/doc/kdat/Makefile.in 2005-05-23 17:45:07.000000000 +0200
-+++ kdeadmin-3.4.1/doc/kdat/Makefile.in 2005-05-25 00:38:04.869618634 +0200
-@@ -166,6 +166,9 @@
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) newvariable.png kcron.png newtask.png print.png index.docbook kcronstart.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kcron.png newvariable.png kcronstart.png index.docbook newtask.png print.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
+@@ -535,20 +538,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcron
+- @for base in newvariable.png kcron.png newtask.png print.png index.docbook kcronstart.png ; do \
++ @for base in kcron.png newvariable.png kcronstart.png index.docbook newtask.png print.png ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcron/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcron/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in newvariable.png kcron.png newtask.png print.png index.docbook kcronstart.png ; do \
++ for base in kcron.png newvariable.png kcronstart.png index.docbook newtask.png print.png ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcron/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in newvariable.png kcron.png newtask.png print.png index.docbook kcronstart.png ; do \
++ for file in kcron.png newvariable.png kcronstart.png index.docbook newtask.png print.png ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
+diff -Nru kdeadmin-3.4.2.orig/doc/kdat/Makefile.in kdeadmin-3.4.2/doc/kdat/Makefile.in
+--- kdeadmin-3.4.2.orig/doc/kdat/Makefile.in 2005-07-20 19:54:27.000000000 +0000
++++ kdeadmin-3.4.2/doc/kdat/Makefile.in 2005-07-31 17:58:46.934200784 +0000
+@@ -167,6 +167,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -6990,7 +7100,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -319,7 +322,7 @@
+@@ -320,7 +323,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -6999,7 +7109,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -357,9 +360,9 @@
+@@ -358,9 +361,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7011,7 +7121,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -504,7 +507,7 @@
+@@ -505,7 +508,7 @@
.NOEXPORT:
#>+ 2
@@ -7020,10 +7130,10 @@
#>+ 24
index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
-diff -rua kdeadmin-3.4.1.orig/doc/kpackage/Makefile.in kdeadmin-3.4.1/doc/kpackage/Makefile.in
---- kdeadmin-3.4.1.orig/doc/kpackage/Makefile.in 2005-05-23 17:45:07.000000000 +0200
-+++ kdeadmin-3.4.1/doc/kpackage/Makefile.in 2005-05-25 00:38:04.875618093 +0200
-@@ -166,6 +166,9 @@
+diff -Nru kdeadmin-3.4.2.orig/doc/kpackage/Makefile.in kdeadmin-3.4.2/doc/kpackage/Makefile.in
+--- kdeadmin-3.4.2.orig/doc/kpackage/Makefile.in 2005-07-20 19:54:27.000000000 +0000
++++ kdeadmin-3.4.2/doc/kpackage/Makefile.in 2005-07-31 17:58:46.972195008 +0000
+@@ -167,6 +167,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7033,7 +7143,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -319,7 +322,7 @@
+@@ -320,7 +323,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7042,7 +7152,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -357,9 +360,9 @@
+@@ -358,9 +361,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7054,19 +7164,47 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -504,7 +507,7 @@
+@@ -505,10 +508,10 @@
.NOEXPORT:
#>+ 2
-KDE_DIST=searchl.png Makefile.in search.png right-prop.png slackloc.png right-change.png install.png left.png debloc.png right-files.png searchf.png bsdloc.png rpmloc.png index.docbook debaptloc.png handle.png Makefile.am uninstall.png index.cache.bz2
-+KDE_DIST=searchl.png Makefile.in search.png right-prop.png slackloc.png right-change.png install.png left.png debloc.png right-files.png searchf.png bsdloc.png index.docbook rpmloc.png debaptloc.png handle.png Makefile.am uninstall.png index.cache.bz2
++KDE_DIST=searchl.png Makefile.in search.png right-prop.png slackloc.png right-change.png install.png debloc.png left.png right-files.png searchf.png bsdloc.png index.docbook rpmloc.png debaptloc.png Makefile.am handle.png uninstall.png index.cache.bz2
#>+ 24
- index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) debaptloc.png rpmloc.png right-change.png index.docbook search.png install.png bsdloc.png uninstall.png searchf.png right-files.png searchl.png debloc.png left.png slackloc.png right-prop.png handle.png
-diff -rua kdeadmin-3.4.1.orig/doc/ksysv/Makefile.in kdeadmin-3.4.1/doc/ksysv/Makefile.in
---- kdeadmin-3.4.1.orig/doc/ksysv/Makefile.in 2005-05-23 17:45:07.000000000 +0200
-+++ kdeadmin-3.4.1/doc/ksysv/Makefile.in 2005-05-25 00:38:04.881617553 +0200
-@@ -166,6 +166,9 @@
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) debaptloc.png rpmloc.png right-change.png index.docbook search.png install.png bsdloc.png uninstall.png searchf.png right-files.png searchl.png debloc.png left.png slackloc.png right-prop.png handle.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) debaptloc.png install.png slackloc.png rpmloc.png left.png right-change.png handle.png bsdloc.png right-files.png uninstall.png search.png debloc.png searchf.png searchl.png right-prop.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
+@@ -535,20 +538,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpackage
+- @for base in debaptloc.png rpmloc.png right-change.png index.docbook search.png install.png bsdloc.png uninstall.png searchf.png right-files.png searchl.png debloc.png left.png slackloc.png right-prop.png handle.png ; do \
++ @for base in debaptloc.png install.png slackloc.png rpmloc.png left.png right-change.png handle.png bsdloc.png right-files.png uninstall.png search.png debloc.png searchf.png searchl.png right-prop.png index.docbook ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpackage/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpackage/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in debaptloc.png rpmloc.png right-change.png index.docbook search.png install.png bsdloc.png uninstall.png searchf.png right-files.png searchl.png debloc.png left.png slackloc.png right-prop.png handle.png ; do \
++ for base in debaptloc.png install.png slackloc.png rpmloc.png left.png right-change.png handle.png bsdloc.png right-files.png uninstall.png search.png debloc.png searchf.png searchl.png right-prop.png index.docbook ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpackage/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in debaptloc.png rpmloc.png right-change.png index.docbook search.png install.png bsdloc.png uninstall.png searchf.png right-files.png searchl.png debloc.png left.png slackloc.png right-prop.png handle.png ; do \
++ for file in debaptloc.png install.png slackloc.png rpmloc.png left.png right-change.png handle.png bsdloc.png right-files.png uninstall.png search.png debloc.png searchf.png searchl.png right-prop.png index.docbook ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
+diff -Nru kdeadmin-3.4.2.orig/doc/ksysv/Makefile.in kdeadmin-3.4.2/doc/ksysv/Makefile.in
+--- kdeadmin-3.4.2.orig/doc/ksysv/Makefile.in 2005-07-20 19:54:27.000000000 +0000
++++ kdeadmin-3.4.2/doc/ksysv/Makefile.in 2005-07-31 17:58:46.997191208 +0000
+@@ -167,6 +167,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7076,7 +7214,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -319,7 +322,7 @@
+@@ -320,7 +323,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7085,7 +7223,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -357,9 +360,9 @@
+@@ -358,9 +361,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7097,10 +7235,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeadmin-3.4.1.orig/doc/kuser/Makefile.in kdeadmin-3.4.1/doc/kuser/Makefile.in
---- kdeadmin-3.4.1.orig/doc/kuser/Makefile.in 2005-05-23 17:45:07.000000000 +0200
-+++ kdeadmin-3.4.1/doc/kuser/Makefile.in 2005-05-25 00:38:04.887617012 +0200
-@@ -166,6 +166,9 @@
+diff -Nru kdeadmin-3.4.2.orig/doc/kuser/Makefile.in kdeadmin-3.4.2/doc/kuser/Makefile.in
+--- kdeadmin-3.4.2.orig/doc/kuser/Makefile.in 2005-07-20 19:54:27.000000000 +0000
++++ kdeadmin-3.4.2/doc/kuser/Makefile.in 2005-07-31 17:58:47.010189232 +0000
+@@ -167,6 +167,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7110,7 +7248,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -319,7 +322,7 @@
+@@ -320,7 +323,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7119,7 +7257,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -357,9 +360,9 @@
+@@ -358,9 +361,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7131,10 +7269,43 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeadmin-3.4.1.orig/doc/Makefile.in kdeadmin-3.4.1/doc/Makefile.in
---- kdeadmin-3.4.1.orig/doc/Makefile.in 2005-05-23 17:45:07.000000000 +0200
-+++ kdeadmin-3.4.1/doc/Makefile.in 2005-05-25 00:38:04.857619716 +0200
-@@ -182,6 +182,9 @@
+@@ -508,7 +511,7 @@
+ KDE_DIST=Makefile.in kuser.png index.docbook Makefile.am index.cache.bz2
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook kuser.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kuser.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
+@@ -535,20 +538,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kuser
+- @for base in index.docbook kuser.png ; do \
++ @for base in kuser.png index.docbook ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kuser/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kuser/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in index.docbook kuser.png ; do \
++ for base in kuser.png index.docbook ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kuser/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in index.docbook kuser.png ; do \
++ for file in kuser.png index.docbook ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
+diff -Nru kdeadmin-3.4.2.orig/doc/Makefile.in kdeadmin-3.4.2/doc/Makefile.in
+--- kdeadmin-3.4.2.orig/doc/Makefile.in 2005-07-20 19:54:27.000000000 +0000
++++ kdeadmin-3.4.2/doc/Makefile.in 2005-07-31 17:58:46.907204888 +0000
+@@ -183,6 +183,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7144,7 +7315,14 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -338,7 +341,7 @@
+@@ -333,13 +336,13 @@
+ KDE_DOCS = AUTO
+ #>- SUBDIRS = $(AUTODIRS)
+ #>+ 1
+-SUBDIRS =. ksysv kdat kpackage kuser kcron
++SUBDIRS =. kdat kcron ksysv kuser kpackage
+ #>- all: all-recursive
+ #>+ 1
all: docs-am all-recursive
.SUFFIXES:
@@ -7153,7 +7331,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -376,9 +379,9 @@
+@@ -377,9 +380,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7165,10 +7343,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeadmin-3.4.1.orig/kcron/Makefile.in kdeadmin-3.4.1/kcron/Makefile.in
---- kdeadmin-3.4.1.orig/kcron/Makefile.in 2005-05-23 17:45:07.000000000 +0200
-+++ kdeadmin-3.4.1/kcron/Makefile.in 2005-05-25 00:38:04.919614127 +0200
-@@ -242,6 +242,9 @@
+diff -Nru kdeadmin-3.4.2.orig/kcron/Makefile.in kdeadmin-3.4.2/kcron/Makefile.in
+--- kdeadmin-3.4.2.orig/kcron/Makefile.in 2005-07-20 19:54:27.000000000 +0000
++++ kdeadmin-3.4.2/kcron/Makefile.in 2005-07-31 17:58:47.077179048 +0000
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7178,7 +7356,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -499,7 +502,7 @@
+@@ -500,7 +503,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -7187,7 +7365,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -537,9 +540,9 @@
+@@ -538,9 +541,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7199,10 +7377,53 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -rua kdeadmin-3.4.1.orig/kdat/Makefile.in kdeadmin-3.4.1/kdat/Makefile.in
---- kdeadmin-3.4.1.orig/kdat/Makefile.in 2005-05-23 17:45:07.000000000 +0200
-+++ kdeadmin-3.4.1/kdat/Makefile.in 2005-05-25 00:38:04.950611333 +0200
-@@ -270,6 +270,9 @@
+@@ -861,18 +864,18 @@
+ mocs: ktvariable.moc
+
+ #>+ 3
+-kttask.moc: $(srcdir)/kttask.h
+- $(MOC) $(srcdir)/kttask.h -o kttask.moc
++ktapp.moc: $(srcdir)/ktapp.h
++ $(MOC) $(srcdir)/ktapp.h -o ktapp.moc
+
+ #>+ 2
+-mocs: kttask.moc
++mocs: ktapp.moc
+
+ #>+ 3
+-ktapp.moc: $(srcdir)/ktapp.h
+- $(MOC) $(srcdir)/ktapp.h -o ktapp.moc
++kttask.moc: $(srcdir)/kttask.h
++ $(MOC) $(srcdir)/kttask.h -o kttask.moc
+
+ #>+ 2
+-mocs: ktapp.moc
++mocs: kttask.moc
+
+ #>+ 3
+ ktprintopt.moc: $(srcdir)/ktprintopt.h
+@@ -890,7 +893,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f ktvariable.moc kttask.moc ktapp.moc ktprintopt.moc ktview.moc
++ -rm -f ktvariable.moc ktapp.moc kttask.moc ktprintopt.moc ktview.moc
+
+ #>+ 2
+ KDE_DIST=README.hacking README.translators cr16-app-kcron.png kcronui.rc cr32-app-kcron.png configure.in.in Makefile.in
+@@ -948,7 +951,7 @@
+
+
+ #>+ 11
+-kcron.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cthost.cpp $(srcdir)/ctcron.cpp $(srcdir)/ctmonth.cpp $(srcdir)/ctdom.cpp $(srcdir)/ctdow.cpp $(srcdir)/cttask.cpp $(srcdir)/ctvariable.cpp $(srcdir)/kticon.cpp $(srcdir)/ktapp.cpp $(srcdir)/ktview.cpp $(srcdir)/ktlistitem.cpp $(srcdir)/ktlistcron.cpp $(srcdir)/ktlisttask.cpp $(srcdir)/ktlisttasks.cpp $(srcdir)/ktlistvar.cpp $(srcdir)/ktlistvars.cpp $(srcdir)/kttask.cpp $(srcdir)/ktvariable.cpp $(srcdir)/ktprint.cpp $(srcdir)/ktprintopt.cpp $(srcdir)/main.cpp ktvariable.moc ktapp.moc kttask.moc ktprintopt.moc ktview.moc
++kcron.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cthost.cpp $(srcdir)/ctcron.cpp $(srcdir)/ctmonth.cpp $(srcdir)/ctdom.cpp $(srcdir)/ctdow.cpp $(srcdir)/cttask.cpp $(srcdir)/ctvariable.cpp $(srcdir)/kticon.cpp $(srcdir)/ktapp.cpp $(srcdir)/ktview.cpp $(srcdir)/ktlistitem.cpp $(srcdir)/ktlistcron.cpp $(srcdir)/ktlisttask.cpp $(srcdir)/ktlisttasks.cpp $(srcdir)/ktlistvar.cpp $(srcdir)/ktlistvars.cpp $(srcdir)/kttask.cpp $(srcdir)/ktvariable.cpp $(srcdir)/ktprint.cpp $(srcdir)/ktprintopt.cpp $(srcdir)/main.cpp ktvariable.moc kttask.moc ktapp.moc ktprintopt.moc ktview.moc
+ @echo 'creating kcron.all_cpp.cpp ...'; \
+ rm -f kcron.all_cpp.files kcron.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kcron.all_cpp.final; \
+diff -Nru kdeadmin-3.4.2.orig/kdat/Makefile.in kdeadmin-3.4.2/kdat/Makefile.in
+--- kdeadmin-3.4.2.orig/kdat/Makefile.in 2005-07-20 19:54:27.000000000 +0000
++++ kdeadmin-3.4.2/kdat/Makefile.in 2005-07-31 17:58:47.169165064 +0000
+@@ -271,6 +271,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7212,7 +7433,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -547,7 +550,7 @@
+@@ -548,7 +551,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -7221,7 +7442,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -585,9 +588,9 @@
+@@ -586,9 +589,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7233,10 +7454,101 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -rua kdeadmin-3.4.1.orig/kdat/pics/Makefile.in kdeadmin-3.4.1/kdat/pics/Makefile.in
---- kdeadmin-3.4.1.orig/kdat/pics/Makefile.in 2005-05-23 17:45:07.000000000 +0200
-+++ kdeadmin-3.4.1/kdat/pics/Makefile.in 2005-05-25 00:38:04.961610342 +0200
-@@ -166,6 +166,9 @@
+@@ -1002,11 +1005,11 @@
+ mocs: TapeInfoWidget.moc
+
+ #>+ 3
+-Options.moc: $(srcdir)/Options.h
+- $(MOC) $(srcdir)/Options.h -o Options.moc
++BackupProfileManager.moc: $(srcdir)/BackupProfileManager.h
++ $(MOC) $(srcdir)/BackupProfileManager.h -o BackupProfileManager.moc
+
+ #>+ 2
+-mocs: Options.moc
++mocs: BackupProfileManager.moc
+
+ #>+ 3
+ InfoShellWidget.moc: $(srcdir)/InfoShellWidget.h
+@@ -1016,11 +1019,11 @@
+ mocs: InfoShellWidget.moc
+
+ #>+ 3
+-BackupProfileManager.moc: $(srcdir)/BackupProfileManager.h
+- $(MOC) $(srcdir)/BackupProfileManager.h -o BackupProfileManager.moc
++Options.moc: $(srcdir)/Options.h
++ $(MOC) $(srcdir)/Options.h -o Options.moc
+
+ #>+ 2
+-mocs: BackupProfileManager.moc
++mocs: Options.moc
+
+ #>+ 3
+ VerifyOptDlg.moc: $(srcdir)/VerifyOptDlg.h
+@@ -1030,13 +1033,6 @@
+ mocs: VerifyOptDlg.moc
+
+ #>+ 3
+-BackupProfileWidget.moc: $(srcdir)/BackupProfileWidget.h
+- $(MOC) $(srcdir)/BackupProfileWidget.h -o BackupProfileWidget.moc
+-
+-#>+ 2
+-mocs: BackupProfileWidget.moc
+-
+-#>+ 3
+ VerifyDlg.moc: $(srcdir)/VerifyDlg.h
+ $(MOC) $(srcdir)/VerifyDlg.h -o VerifyDlg.moc
+
+@@ -1044,11 +1040,11 @@
+ mocs: VerifyDlg.moc
+
+ #>+ 3
+-TapeManager.moc: $(srcdir)/TapeManager.h
+- $(MOC) $(srcdir)/TapeManager.h -o TapeManager.moc
++BackupProfileWidget.moc: $(srcdir)/BackupProfileWidget.h
++ $(MOC) $(srcdir)/BackupProfileWidget.h -o BackupProfileWidget.moc
+
+ #>+ 2
+-mocs: TapeManager.moc
++mocs: BackupProfileWidget.moc
+
+ #>+ 3
+ FormatOptDlg.moc: $(srcdir)/FormatOptDlg.h
+@@ -1058,6 +1054,13 @@
+ mocs: FormatOptDlg.moc
+
+ #>+ 3
++TapeManager.moc: $(srcdir)/TapeManager.h
++ $(MOC) $(srcdir)/TapeManager.h -o TapeManager.moc
++
++#>+ 2
++mocs: TapeManager.moc
++
++#>+ 3
+ FileInfoWidget.moc: $(srcdir)/FileInfoWidget.h
+ $(MOC) $(srcdir)/FileInfoWidget.h -o FileInfoWidget.moc
+
+@@ -1157,7 +1160,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f TapeInfoWidget.moc Options.moc InfoShellWidget.moc BackupProfileManager.moc VerifyOptDlg.moc BackupProfileWidget.moc VerifyDlg.moc TapeManager.moc FormatOptDlg.moc FileInfoWidget.moc BackupDlg.moc ArchiveInfoWidget.moc Node.moc TarParser.moc OptionsDlg.moc IndexDlg.moc TapeDrive.moc LoggerWidget.moc ktreeview.moc BackupOptDlg.moc KDat.moc TapeFileInfoWidget.moc BackupProfileInfoWidget.moc
++ -rm -f TapeInfoWidget.moc BackupProfileManager.moc InfoShellWidget.moc Options.moc VerifyOptDlg.moc VerifyDlg.moc BackupProfileWidget.moc FormatOptDlg.moc TapeManager.moc FileInfoWidget.moc BackupDlg.moc ArchiveInfoWidget.moc Node.moc TarParser.moc OptionsDlg.moc IndexDlg.moc TapeDrive.moc LoggerWidget.moc ktreeview.moc BackupOptDlg.moc KDat.moc TapeFileInfoWidget.moc BackupProfileInfoWidget.moc
+
+ #>+ 2
+ KDE_DIST=OptionsDlgWidget.ui.h large-kdat.png CREDITS KDat.kdoc OptionsDlgWidget.ui RELEASE_NOTES configure.in.in Makefile.in kdat.desktop Makefile.am
+@@ -1209,7 +1212,7 @@
+
+
+ #>+ 11
+-kdat.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/Archive.cpp $(srcdir)/ArchiveInfoWidget.cpp $(srcdir)/BackupDlg.cpp $(srcdir)/BackupOptDlg.cpp $(srcdir)/BackupProfile.cpp $(srcdir)/BackupProfileInfoWidget.cpp $(srcdir)/BackupProfileManager.cpp $(srcdir)/BackupProfileWidget.cpp $(srcdir)/ErrorHandler.cpp $(srcdir)/File.cpp $(srcdir)/FileInfoWidget.cpp $(srcdir)/ImageCache.cpp $(srcdir)/IndexDlg.cpp $(srcdir)/InfoShellWidget.cpp $(srcdir)/KDat.cpp $(srcdir)/LoggerWidget.cpp $(srcdir)/Node.cpp $(srcdir)/Options.cpp $(srcdir)/OptionsDlg.cpp $(srcdir)/Range.cpp $(srcdir)/Tape.cpp $(srcdir)/TapeDrive.cpp $(srcdir)/TapeFileInfoWidget.cpp $(srcdir)/TapeInfoWidget.cpp $(srcdir)/TapeManager.cpp $(srcdir)/FormatOptDlg.cpp $(srcdir)/TarParser.cpp $(srcdir)/Util.cpp $(srcdir)/VerifyDlg.cpp $(srcdir)/VerifyOptDlg.cpp $(srcdir)/ktreeview.cpp $(srcdir)/main.cpp OptionsDlgWidget.cpp TapeInfoWidget.moc BackupProfileManager.moc InfoShellWidget.moc Options.moc VerifyDlg.moc BackupProfileWidget.moc VerifyOptDlg.moc FileInfoWidget.moc FormatOptDlg.moc TapeManager.moc BackupDlg.moc ArchiveInfoWidget.moc Node.moc OptionsDlgWidget.moc TarParser.moc OptionsDlg.moc IndexDlg.moc TapeDrive.moc LoggerWidget.moc ktreeview.moc BackupOptDlg.moc KDat.moc TapeFileInfoWidget.moc BackupProfileInfoWidget.moc
++kdat.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/Archive.cpp $(srcdir)/ArchiveInfoWidget.cpp $(srcdir)/BackupDlg.cpp $(srcdir)/BackupOptDlg.cpp $(srcdir)/BackupProfile.cpp $(srcdir)/BackupProfileInfoWidget.cpp $(srcdir)/BackupProfileManager.cpp $(srcdir)/BackupProfileWidget.cpp $(srcdir)/ErrorHandler.cpp $(srcdir)/File.cpp $(srcdir)/FileInfoWidget.cpp $(srcdir)/ImageCache.cpp $(srcdir)/IndexDlg.cpp $(srcdir)/InfoShellWidget.cpp $(srcdir)/KDat.cpp $(srcdir)/LoggerWidget.cpp $(srcdir)/Node.cpp $(srcdir)/Options.cpp $(srcdir)/OptionsDlg.cpp $(srcdir)/Range.cpp $(srcdir)/Tape.cpp $(srcdir)/TapeDrive.cpp $(srcdir)/TapeFileInfoWidget.cpp $(srcdir)/TapeInfoWidget.cpp $(srcdir)/TapeManager.cpp $(srcdir)/FormatOptDlg.cpp $(srcdir)/TarParser.cpp $(srcdir)/Util.cpp $(srcdir)/VerifyDlg.cpp $(srcdir)/VerifyOptDlg.cpp $(srcdir)/ktreeview.cpp $(srcdir)/main.cpp OptionsDlgWidget.cpp TapeInfoWidget.moc Options.moc InfoShellWidget.moc BackupProfileManager.moc BackupProfileWidget.moc VerifyDlg.moc VerifyOptDlg.moc FileInfoWidget.moc TapeManager.moc FormatOptDlg.moc BackupDlg.moc ArchiveInfoWidget.moc Node.moc OptionsDlgWidget.moc TarParser.moc OptionsDlg.moc IndexDlg.moc TapeDrive.moc LoggerWidget.moc ktreeview.moc BackupOptDlg.moc KDat.moc TapeFileInfoWidget.moc BackupProfileInfoWidget.moc
+ @echo 'creating kdat.all_cpp.cpp ...'; \
+ rm -f kdat.all_cpp.files kdat.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kdat.all_cpp.final; \
+diff -Nru kdeadmin-3.4.2.orig/kdat/pics/Makefile.in kdeadmin-3.4.2/kdat/pics/Makefile.in
+--- kdeadmin-3.4.2.orig/kdat/pics/Makefile.in 2005-07-20 19:54:27.000000000 +0000
++++ kdeadmin-3.4.2/kdat/pics/Makefile.in 2005-07-31 17:58:47.207159288 +0000
+@@ -167,6 +167,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7246,7 +7558,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -320,7 +323,7 @@
+@@ -321,7 +324,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7255,7 +7567,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -358,9 +361,9 @@
+@@ -359,9 +362,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7267,10 +7579,152 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeadmin-3.4.1.orig/kfile-plugins/deb/Makefile.in kdeadmin-3.4.1/kfile-plugins/deb/Makefile.in
---- kdeadmin-3.4.1.orig/kfile-plugins/deb/Makefile.in 2005-05-23 17:45:07.000000000 +0200
-+++ kdeadmin-3.4.1/kfile-plugins/deb/Makefile.in 2005-05-25 00:38:04.977608899 +0200
-@@ -214,6 +214,9 @@
+@@ -504,91 +507,91 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=cr16-app-kdat_select_none.png lo16-app-kdat_select_none.png cr16-app-kdat_select_all.png lo16-app-kdat_restore.png cr16-app-kdat_select_some.png lo16-app-kdat_select_some.png cr48-app-kdat.png lo16-app-kdat_verify.png lo16-app-kdat.png cr16-app-kdat_eject.png cr32-app-kdat_restore.png lo16-app-kdat_mounted.png cr16-app-kdat_verify.png cr32-app-kdat_backup.png lo32-app-kdat.png cr16-app-kdat_mounted.png lo16-app-kdat_archive.png cr16-app-kdat.png lo16-app-kdat_unmounted.png lo16-app-kdat_backup.png cr32-app-kdat_verify.png Makefile.in cr32-app-kdat.png lo16-app-kdat_eject.png cr16-app-kdat_restore.png cr16-app-kdat_unmounted.png cr16-app-kdat_archive.png cr16-app-kdat_backup.png lo16-app-kdat_select_all.png Makefile.am
++KDE_DIST=cr16-app-kdat_select_none.png lo16-app-kdat_select_none.png cr16-app-kdat_select_all.png lo16-app-kdat_restore.png cr16-app-kdat_select_some.png lo16-app-kdat_select_some.png lo16-app-kdat_verify.png cr48-app-kdat.png lo16-app-kdat.png cr16-app-kdat_eject.png cr32-app-kdat_restore.png lo16-app-kdat_mounted.png cr16-app-kdat_verify.png cr32-app-kdat_backup.png lo32-app-kdat.png cr16-app-kdat_mounted.png lo16-app-kdat_archive.png cr16-app-kdat.png lo16-app-kdat_unmounted.png cr32-app-kdat_verify.png lo16-app-kdat_backup.png Makefile.in cr32-app-kdat.png lo16-app-kdat_eject.png cr16-app-kdat_restore.png cr16-app-kdat_unmounted.png cr16-app-kdat_backup.png cr16-app-kdat_archive.png lo16-app-kdat_select_all.png Makefile.am
+
+ #>+ 2
+ docs-am:
+
+ #>+ 80
+ install-kde-icons:
++ $(mkinstalldirs) $(DESTDIR)$(kdaticondir)/locolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/lo16-app-kdat_backup.png $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_backup.png
++ $(mkinstalldirs) $(DESTDIR)$(kdaticondir)/locolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/lo32-app-kdat.png $(DESTDIR)$(kdaticondir)/locolor/32x32/apps/kdat.png
++ $(INSTALL_DATA) $(srcdir)/lo16-app-kdat_select_none.png $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_select_none.png
++ $(INSTALL_DATA) $(srcdir)/lo16-app-kdat_eject.png $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_eject.png
++ $(INSTALL_DATA) $(srcdir)/lo16-app-kdat_select_some.png $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_select_some.png
++ $(mkinstalldirs) $(DESTDIR)$(kdaticondir)/crystalsvg/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kdat.png $(DESTDIR)$(kdaticondir)/crystalsvg/48x48/apps/kdat.png
+ $(mkinstalldirs) $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kdat.png $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat.png
++ $(INSTALL_DATA) $(srcdir)/lo16-app-kdat_unmounted.png $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_unmounted.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kdat_archive.png $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_archive.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-kdat_select_all.png $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_select_all.png
+ $(mkinstalldirs) $(DESTDIR)$(kdaticondir)/crystalsvg/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kdat_restore.png $(DESTDIR)$(kdaticondir)/crystalsvg/32x32/apps/kdat_restore.png
++ $(INSTALL_DATA) $(srcdir)/lo16-app-kdat_archive.png $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_archive.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-kdat_verify.png $(DESTDIR)$(kdaticondir)/crystalsvg/32x32/apps/kdat_verify.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kdat_eject.png $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_eject.png
++ $(INSTALL_DATA) $(srcdir)/lo16-app-kdat.png $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-kdat_backup.png $(DESTDIR)$(kdaticondir)/crystalsvg/32x32/apps/kdat_backup.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kdat_select_some.png $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_select_some.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kdat_unmounted.png $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_unmounted.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kdat_select_none.png $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_select_none.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-kdat_verify.png $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_verify.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kdat_backup.png $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_backup.png
+- $(mkinstalldirs) $(DESTDIR)$(kdaticondir)/locolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/lo16-app-kdat_select_none.png $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_select_none.png
+- $(INSTALL_DATA) $(srcdir)/lo16-app-kdat_select_some.png $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_select_some.png
+- $(INSTALL_DATA) $(srcdir)/lo16-app-kdat_verify.png $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_verify.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kdat_mounted.png $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_mounted.png
+- $(INSTALL_DATA) $(srcdir)/lo16-app-kdat_backup.png $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_backup.png
+ $(INSTALL_DATA) $(srcdir)/lo16-app-kdat_select_all.png $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_select_all.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kdat_select_some.png $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_select_some.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-kdat.png $(DESTDIR)$(kdaticondir)/crystalsvg/32x32/apps/kdat.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kdat_unmounted.png $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_unmounted.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kdat.png $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kdat_restore.png $(DESTDIR)$(kdaticondir)/crystalsvg/32x32/apps/kdat_restore.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kdat_archive.png $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_archive.png
+- $(INSTALL_DATA) $(srcdir)/lo16-app-kdat_mounted.png $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_mounted.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kdat_mounted.png $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_mounted.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kdat_backup.png $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_backup.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-kdat_restore.png $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_restore.png
+- $(INSTALL_DATA) $(srcdir)/lo16-app-kdat_unmounted.png $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_unmounted.png
+- $(mkinstalldirs) $(DESTDIR)$(kdaticondir)/locolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/lo32-app-kdat.png $(DESTDIR)$(kdaticondir)/locolor/32x32/apps/kdat.png
+- $(mkinstalldirs) $(DESTDIR)$(kdaticondir)/crystalsvg/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kdat.png $(DESTDIR)$(kdaticondir)/crystalsvg/48x48/apps/kdat.png
+- $(INSTALL_DATA) $(srcdir)/lo16-app-kdat.png $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat.png
+- $(INSTALL_DATA) $(srcdir)/lo16-app-kdat_archive.png $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_archive.png
++ $(INSTALL_DATA) $(srcdir)/lo16-app-kdat_verify.png $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_verify.png
++ $(INSTALL_DATA) $(srcdir)/lo16-app-kdat_mounted.png $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_mounted.png
+ $(INSTALL_DATA) $(srcdir)/lo16-app-kdat_restore.png $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_restore.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kdat_eject.png $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_eject.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kdat_select_none.png $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_select_none.png
+- $(INSTALL_DATA) $(srcdir)/lo16-app-kdat_eject.png $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_eject.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kdat.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdat.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kdat.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdat.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/lo32-app-kdat.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kdat.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/cr48-app-kdat.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdat.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kdat.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdat.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/lo16-app-kdat.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kdat.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kdat.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdat.png
+
+ uninstall-kde-icons:
++ -rm -f $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_backup.png
++ -rm -f $(DESTDIR)$(kdaticondir)/locolor/32x32/apps/kdat.png
++ -rm -f $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_select_none.png
++ -rm -f $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_eject.png
++ -rm -f $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_select_some.png
++ -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/48x48/apps/kdat.png
++ -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat.png
++ -rm -f $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_unmounted.png
++ -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_archive.png
+ -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_select_all.png
++ -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/32x32/apps/kdat_restore.png
++ -rm -f $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_archive.png
+ -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/32x32/apps/kdat_verify.png
++ -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_eject.png
++ -rm -f $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat.png
+ -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/32x32/apps/kdat_backup.png
+- -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_select_some.png
++ -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_unmounted.png
++ -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_select_none.png
+ -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_verify.png
+- -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_backup.png
+- -rm -f $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_select_none.png
+- -rm -f $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_select_some.png
+- -rm -f $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_verify.png
+- -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_mounted.png
+- -rm -f $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_backup.png
+ -rm -f $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_select_all.png
++ -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_select_some.png
+ -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/32x32/apps/kdat.png
+- -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_unmounted.png
+- -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat.png
+- -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/32x32/apps/kdat_restore.png
+- -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_archive.png
+- -rm -f $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_mounted.png
++ -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_mounted.png
++ -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_backup.png
+ -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_restore.png
+- -rm -f $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_unmounted.png
+- -rm -f $(DESTDIR)$(kdaticondir)/locolor/32x32/apps/kdat.png
+- -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/48x48/apps/kdat.png
+- -rm -f $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat.png
+- -rm -f $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_archive.png
++ -rm -f $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_verify.png
++ -rm -f $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_mounted.png
+ -rm -f $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_restore.png
+- -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_eject.png
+- -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_select_none.png
+- -rm -f $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_eject.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdat.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdat.png
+ -rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kdat.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdat.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdat.png
+ -rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kdat.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdat.png
+
+ #>+ 15
+ force-reedit:
+diff -Nru kdeadmin-3.4.2.orig/kfile-plugins/deb/Makefile.in kdeadmin-3.4.2/kfile-plugins/deb/Makefile.in
+--- kdeadmin-3.4.2.orig/kfile-plugins/deb/Makefile.in 2005-07-20 19:54:27.000000000 +0000
++++ kdeadmin-3.4.2/kfile-plugins/deb/Makefile.in 2005-07-31 17:58:47.248153056 +0000
+@@ -215,6 +215,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7280,7 +7734,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
+@@ -382,7 +385,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -7289,7 +7743,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -420,9 +423,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7301,10 +7755,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -rua kdeadmin-3.4.1.orig/kfile-plugins/Makefile.in kdeadmin-3.4.1/kfile-plugins/Makefile.in
---- kdeadmin-3.4.1.orig/kfile-plugins/Makefile.in 2005-05-23 17:45:07.000000000 +0200
-+++ kdeadmin-3.4.1/kfile-plugins/Makefile.in 2005-05-25 00:38:04.967609801 +0200
-@@ -182,6 +182,9 @@
+diff -Nru kdeadmin-3.4.2.orig/kfile-plugins/Makefile.in kdeadmin-3.4.2/kfile-plugins/Makefile.in
+--- kdeadmin-3.4.2.orig/kfile-plugins/Makefile.in 2005-07-20 19:54:27.000000000 +0000
++++ kdeadmin-3.4.2/kfile-plugins/Makefile.in 2005-07-31 17:58:47.222157008 +0000
+@@ -183,6 +183,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7314,7 +7768,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -334,7 +337,7 @@
+@@ -335,7 +338,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -7323,7 +7777,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -372,9 +375,9 @@
+@@ -373,9 +376,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7335,10 +7789,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeadmin-3.4.1.orig/kfile-plugins/rpm/Makefile.in kdeadmin-3.4.1/kfile-plugins/rpm/Makefile.in
---- kdeadmin-3.4.1.orig/kfile-plugins/rpm/Makefile.in 2005-05-23 17:45:07.000000000 +0200
-+++ kdeadmin-3.4.1/kfile-plugins/rpm/Makefile.in 2005-05-25 00:38:04.986608088 +0200
-@@ -214,6 +214,9 @@
+diff -Nru kdeadmin-3.4.2.orig/kfile-plugins/rpm/Makefile.in kdeadmin-3.4.2/kfile-plugins/rpm/Makefile.in
+--- kdeadmin-3.4.2.orig/kfile-plugins/rpm/Makefile.in 2005-07-20 19:54:27.000000000 +0000
++++ kdeadmin-3.4.2/kfile-plugins/rpm/Makefile.in 2005-07-31 17:58:47.271149560 +0000
+@@ -215,6 +215,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7348,7 +7802,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
+@@ -382,7 +385,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -7357,7 +7811,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -420,9 +423,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7369,10 +7823,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -rua kdeadmin-3.4.1.orig/kpackage/icon/Makefile.in kdeadmin-3.4.1/kpackage/icon/Makefile.in
---- kdeadmin-3.4.1.orig/kpackage/icon/Makefile.in 2005-05-23 17:45:07.000000000 +0200
-+++ kdeadmin-3.4.1/kpackage/icon/Makefile.in 2005-05-25 00:38:05.068600697 +0200
-@@ -166,6 +166,9 @@
+diff -Nru kdeadmin-3.4.2.orig/kpackage/icon/Makefile.in kdeadmin-3.4.2/kpackage/icon/Makefile.in
+--- kdeadmin-3.4.2.orig/kpackage/icon/Makefile.in 2005-07-20 19:54:27.000000000 +0000
++++ kdeadmin-3.4.2/kpackage/icon/Makefile.in 2005-07-31 17:58:47.434124784 +0000
+@@ -167,6 +167,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7382,7 +7836,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -318,7 +321,7 @@
+@@ -319,7 +322,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7391,7 +7845,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -356,9 +359,9 @@
+@@ -357,9 +360,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7403,10 +7857,35 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeadmin-3.4.1.orig/kpackage/Makefile.in kdeadmin-3.4.1/kpackage/Makefile.in
---- kdeadmin-3.4.1.orig/kpackage/Makefile.in 2005-05-23 17:45:07.000000000 +0200
-+++ kdeadmin-3.4.1/kpackage/Makefile.in 2005-05-25 00:38:05.058601598 +0200
-@@ -250,6 +250,9 @@
+@@ -511,21 +514,21 @@
+ install-kde-icons:
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/cr16-app-kpackage.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpackage.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+- $(INSTALL_DATA) $(srcdir)/cr64-app-kpackage.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kpackage.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+ $(INSTALL_DATA) $(srcdir)/cr128-app-kpackage.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kpackage.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/cr48-app-kpackage.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpackage.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/cr32-app-kpackage.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpackage.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
++ $(INSTALL_DATA) $(srcdir)/cr64-app-kpackage.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kpackage.png
+
+ uninstall-kde-icons:
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpackage.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kpackage.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kpackage.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpackage.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpackage.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kpackage.png
+
+ #>+ 15
+ force-reedit:
+diff -Nru kdeadmin-3.4.2.orig/kpackage/Makefile.in kdeadmin-3.4.2/kpackage/Makefile.in
+--- kdeadmin-3.4.2.orig/kpackage/Makefile.in 2005-07-20 19:54:27.000000000 +0000
++++ kdeadmin-3.4.2/kpackage/Makefile.in 2005-07-31 17:58:47.418127216 +0000
+@@ -251,6 +251,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7416,7 +7895,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -429,7 +432,7 @@
+@@ -430,7 +433,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -7425,7 +7904,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -467,9 +470,9 @@
+@@ -468,9 +471,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7437,44 +7916,166 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -rua kdeadmin-3.4.1.orig/kpackage/mimetypes/Makefile.in kdeadmin-3.4.1/kpackage/mimetypes/Makefile.in
---- kdeadmin-3.4.1.orig/kpackage/mimetypes/Makefile.in 2005-05-23 17:45:07.000000000 +0200
-+++ kdeadmin-3.4.1/kpackage/mimetypes/Makefile.in 2005-05-25 00:38:05.076599976 +0200
-@@ -176,6 +176,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@
-@@ -329,7 +332,7 @@
- all: docs-am all-am
+@@ -891,18 +894,18 @@
+ .NOEXPORT:
- .SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -367,9 +370,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ #>+ 3
+-search.moc: $(srcdir)/search.h
+- $(MOC) $(srcdir)/search.h -o search.moc
++procbuf.moc: $(srcdir)/procbuf.h
++ $(MOC) $(srcdir)/procbuf.h -o procbuf.moc
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ #>+ 2
+-mocs: search.moc
++mocs: procbuf.moc
- mostlyclean-libtool:
-diff -rua kdeadmin-3.4.1.orig/kpackage/pics/Makefile.in kdeadmin-3.4.1/kpackage/pics/Makefile.in
---- kdeadmin-3.4.1.orig/kpackage/pics/Makefile.in 2005-05-23 17:45:07.000000000 +0200
-+++ kdeadmin-3.4.1/kpackage/pics/Makefile.in 2005-05-25 00:38:05.085599165 +0200
-@@ -176,6 +176,9 @@
+ #>+ 3
+-procbuf.moc: $(srcdir)/procbuf.h
+- $(MOC) $(srcdir)/procbuf.h -o procbuf.moc
++search.moc: $(srcdir)/search.h
++ $(MOC) $(srcdir)/search.h -o search.moc
+
+ #>+ 2
+-mocs: procbuf.moc
++mocs: search.moc
+
+ #>+ 3
+ options.moc: $(srcdir)/options.h
+@@ -933,13 +936,6 @@
+ mocs: slackInterface.moc
+
+ #>+ 3
+-kpTerm.moc: $(srcdir)/kpTerm.h
+- $(MOC) $(srcdir)/kpTerm.h -o kpTerm.moc
+-
+-#>+ 2
+-mocs: kpTerm.moc
+-
+-#>+ 3
+ kpackage.moc: $(srcdir)/kpackage.h
+ $(MOC) $(srcdir)/kpackage.h -o kpackage.moc
+
+@@ -947,11 +943,11 @@
+ mocs: kpackage.moc
+
+ #>+ 3
+-rpmInterface.moc: $(srcdir)/rpmInterface.h
+- $(MOC) $(srcdir)/rpmInterface.h -o rpmInterface.moc
++kpTerm.moc: $(srcdir)/kpTerm.h
++ $(MOC) $(srcdir)/kpTerm.h -o kpTerm.moc
+
+ #>+ 2
+-mocs: rpmInterface.moc
++mocs: kpTerm.moc
+
+ #>+ 3
+ packageProperties.moc: $(srcdir)/packageProperties.h
+@@ -961,6 +957,13 @@
+ mocs: packageProperties.moc
+
+ #>+ 3
++rpmInterface.moc: $(srcdir)/rpmInterface.h
++ $(MOC) $(srcdir)/rpmInterface.h -o rpmInterface.moc
++
++#>+ 2
++mocs: rpmInterface.moc
++
++#>+ 3
+ kissInterface.moc: $(srcdir)/kissInterface.h
+ $(MOC) $(srcdir)/kissInterface.h -o kissInterface.moc
+
+@@ -996,18 +999,18 @@
+ mocs: managementWidget.moc
+
+ #>+ 3
+-debDpkgInterface.moc: $(srcdir)/debDpkgInterface.h
+- $(MOC) $(srcdir)/debDpkgInterface.h -o debDpkgInterface.moc
++gentooInterface.moc: $(srcdir)/gentooInterface.h
++ $(MOC) $(srcdir)/gentooInterface.h -o gentooInterface.moc
+
+ #>+ 2
+-mocs: debDpkgInterface.moc
++mocs: gentooInterface.moc
+
+ #>+ 3
+-gentooInterface.moc: $(srcdir)/gentooInterface.h
+- $(MOC) $(srcdir)/gentooInterface.h -o gentooInterface.moc
++debDpkgInterface.moc: $(srcdir)/debDpkgInterface.h
++ $(MOC) $(srcdir)/debDpkgInterface.h -o debDpkgInterface.moc
+
+ #>+ 2
+-mocs: gentooInterface.moc
++mocs: debDpkgInterface.moc
+
+ #>+ 3
+ findf.moc: $(srcdir)/findf.h
+@@ -1031,18 +1034,18 @@
+ mocs: packageDisplay.moc
+
+ #>+ 3
+-debInterface.moc: $(srcdir)/debInterface.h
+- $(MOC) $(srcdir)/debInterface.h -o debInterface.moc
++updateLoc.moc: $(srcdir)/updateLoc.h
++ $(MOC) $(srcdir)/updateLoc.h -o updateLoc.moc
+
+ #>+ 2
+-mocs: debInterface.moc
++mocs: updateLoc.moc
+
+ #>+ 3
+-updateLoc.moc: $(srcdir)/updateLoc.h
+- $(MOC) $(srcdir)/updateLoc.h -o updateLoc.moc
++debInterface.moc: $(srcdir)/debInterface.h
++ $(MOC) $(srcdir)/debInterface.h -o debInterface.moc
+
+ #>+ 2
+-mocs: updateLoc.moc
++mocs: debInterface.moc
+
+ #>+ 3
+ pkgOptions.moc: $(srcdir)/pkgOptions.h
+@@ -1053,10 +1056,10 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f search.moc procbuf.moc options.moc kplview.moc fbsdInterface.moc slackInterface.moc kpTerm.moc kpackage.moc rpmInterface.moc packageProperties.moc kissInterface.moc pkgInterface.moc debAptInterface.moc kpPty.moc managementWidget.moc debDpkgInterface.moc gentooInterface.moc findf.moc kio.moc packageDisplay.moc debInterface.moc updateLoc.moc pkgOptions.moc
++ -rm -f procbuf.moc search.moc options.moc kplview.moc fbsdInterface.moc slackInterface.moc kpackage.moc kpTerm.moc packageProperties.moc rpmInterface.moc kissInterface.moc pkgInterface.moc debAptInterface.moc kpPty.moc managementWidget.moc gentooInterface.moc debDpkgInterface.moc findf.moc kio.moc packageDisplay.moc updateLoc.moc debInterface.moc pkgOptions.moc
+
+ #>+ 2
+-KDE_DIST=kpackage.desktop debInterface.h pkgInterface.h kpackage.h findf.h kio.h packageDisplay.h managementWidget.h options.h kplview.h packageProperties.h procbuf.h kpPty.h updateLoc.h kpackageui.rc slackInterface.h CHANGES kpTerm.h rpmInterface.h search.h fbsdInterface.h debAptInterface.h gentooInterface.h pkgOptions.h kissInterface.h cache.h utils.h Makefile.in packageInfo.h debDpkgInterface.h Makefile.am
++KDE_DIST=kpackage.desktop debInterface.h pkgInterface.h kpackage.h findf.h kio.h packageDisplay.h managementWidget.h options.h kplview.h packageProperties.h procbuf.h updateLoc.h kpPty.h slackInterface.h kpackageui.rc CHANGES kpTerm.h rpmInterface.h search.h fbsdInterface.h debAptInterface.h gentooInterface.h pkgOptions.h kissInterface.h cache.h utils.h Makefile.in packageInfo.h debDpkgInterface.h Makefile.am
+
+ #>+ 2
+ docs-am:
+@@ -1100,7 +1103,7 @@
+
+
+ #>+ 11
+-kpackage.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kpackage.cpp $(srcdir)/managementWidget.cpp $(srcdir)/packageDisplay.cpp $(srcdir)/packageProperties.cpp $(srcdir)/findf.cpp $(srcdir)/search.cpp $(srcdir)/options.cpp $(srcdir)/pkgOptions.cpp $(srcdir)/packageInfo.cpp $(srcdir)/cache.cpp $(srcdir)/main.cpp $(srcdir)/utils.cpp $(srcdir)/kio.cpp $(srcdir)/debInterface.cpp $(srcdir)/debDpkgInterface.cpp $(srcdir)/debAptInterface.cpp $(srcdir)/updateLoc.cpp $(srcdir)/procbuf.cpp $(srcdir)/kplview.cpp $(srcdir)/pkgInterface.cpp $(srcdir)/rpmInterface.cpp $(srcdir)/kissInterface.cpp $(srcdir)/slackInterface.cpp $(srcdir)/fbsdInterface.cpp $(srcdir)/gentooInterface.cpp $(srcdir)/kpPty.cpp $(srcdir)/kpTerm.cpp procbuf.moc search.moc options.moc kplview.moc fbsdInterface.moc slackInterface.moc kpTerm.moc kpackage.moc packageProperties.moc rpmInterface.moc kissInterface.moc pkgInterface.moc debAptInterface.moc kpPty.moc managementWidget.moc gentooInterface.moc debDpkgInterface.moc findf.moc packageDisplay.moc kio.moc updateLoc.moc debInterface.moc pkgOptions.moc
++kpackage.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kpackage.cpp $(srcdir)/managementWidget.cpp $(srcdir)/packageDisplay.cpp $(srcdir)/packageProperties.cpp $(srcdir)/findf.cpp $(srcdir)/search.cpp $(srcdir)/options.cpp $(srcdir)/pkgOptions.cpp $(srcdir)/packageInfo.cpp $(srcdir)/cache.cpp $(srcdir)/main.cpp $(srcdir)/utils.cpp $(srcdir)/kio.cpp $(srcdir)/debInterface.cpp $(srcdir)/debDpkgInterface.cpp $(srcdir)/debAptInterface.cpp $(srcdir)/updateLoc.cpp $(srcdir)/procbuf.cpp $(srcdir)/kplview.cpp $(srcdir)/pkgInterface.cpp $(srcdir)/rpmInterface.cpp $(srcdir)/kissInterface.cpp $(srcdir)/slackInterface.cpp $(srcdir)/fbsdInterface.cpp $(srcdir)/gentooInterface.cpp $(srcdir)/kpPty.cpp $(srcdir)/kpTerm.cpp search.moc procbuf.moc options.moc kplview.moc fbsdInterface.moc slackInterface.moc kpackage.moc kpTerm.moc rpmInterface.moc packageProperties.moc kissInterface.moc pkgInterface.moc debAptInterface.moc kpPty.moc managementWidget.moc debDpkgInterface.moc gentooInterface.moc findf.moc packageDisplay.moc kio.moc debInterface.moc updateLoc.moc pkgOptions.moc
+ @echo 'creating kpackage.all_cpp.cpp ...'; \
+ rm -f kpackage.all_cpp.files kpackage.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kpackage.all_cpp.final; \
+@@ -1173,13 +1176,13 @@
+ slackInterface.lo: slackInterface.moc
+ pkgOptions.lo: pkgOptions.moc
+ kpTerm.o: kpTerm.moc
++debDpkgInterface.lo: debDpkgInterface.moc
+ kpackage.o: kpackage.moc
+ packageProperties.o: packageProperties.moc
+-debDpkgInterface.lo: debDpkgInterface.moc
+ kio.o: kio.moc
+ nmcheck:
+-gentooInterface.o: gentooInterface.moc
+ kplview.o: kplview.moc
++gentooInterface.o: gentooInterface.moc
+ kplview.lo: kplview.moc
+ debInterface.lo: debInterface.moc
+ findf.o: findf.moc
+diff -Nru kdeadmin-3.4.2.orig/kpackage/pics/Makefile.in kdeadmin-3.4.2/kpackage/pics/Makefile.in
+--- kdeadmin-3.4.2.orig/kpackage/pics/Makefile.in 2005-07-20 19:54:27.000000000 +0000
++++ kdeadmin-3.4.2/kpackage/pics/Makefile.in 2005-07-31 17:58:47.513112776 +0000
+@@ -177,6 +177,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7484,7 +8085,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -333,7 +336,7 @@
+@@ -334,7 +337,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7493,7 +8094,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -371,9 +374,9 @@
+@@ -372,9 +375,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7505,10 +8106,19 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeadmin-3.4.1.orig/kpackage/toolbar/Makefile.in kdeadmin-3.4.1/kpackage/toolbar/Makefile.in
---- kdeadmin-3.4.1.orig/kpackage/toolbar/Makefile.in 2005-05-23 17:45:07.000000000 +0200
-+++ kdeadmin-3.4.1/kpackage/toolbar/Makefile.in 2005-05-25 00:38:05.094598353 +0200
-@@ -176,6 +176,9 @@
+@@ -533,7 +536,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=dnew.png bupdated.png deb.png snew.png cross.png kupdated.png bnew.png dupdated.png rupdated.png rpm.png rnew.png slack.png ptick.png noball.png supdated.png Makefile.in dbad.png tick.png question.png kiss.png bsd.png knew.png Makefile.am
++KDE_DIST=dnew.png bupdated.png snew.png deb.png cross.png kupdated.png bnew.png dupdated.png rupdated.png rpm.png rnew.png slack.png noball.png ptick.png supdated.png Makefile.in dbad.png tick.png question.png kiss.png bsd.png knew.png Makefile.am
+
+ #>+ 2
+ docs-am:
+diff -Nru kdeadmin-3.4.2.orig/kpackage/toolbar/Makefile.in kdeadmin-3.4.2/kpackage/toolbar/Makefile.in
+--- kdeadmin-3.4.2.orig/kpackage/toolbar/Makefile.in 2005-07-20 19:54:27.000000000 +0000
++++ kdeadmin-3.4.2/kpackage/toolbar/Makefile.in 2005-07-31 17:58:47.526110800 +0000
+@@ -177,6 +177,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7518,7 +8128,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -329,7 +332,7 @@
+@@ -330,7 +333,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7527,7 +8137,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -367,9 +370,9 @@
+@@ -368,9 +371,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7539,10 +8149,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeadmin-3.4.1.orig/ksysv/Makefile.in kdeadmin-3.4.1/ksysv/Makefile.in
---- kdeadmin-3.4.1.orig/ksysv/Makefile.in 2005-05-23 17:45:07.000000000 +0200
-+++ kdeadmin-3.4.1/ksysv/Makefile.in 2005-05-25 00:38:05.150593306 +0200
-@@ -266,6 +266,9 @@
+diff -Nru kdeadmin-3.4.2.orig/ksysv/Makefile.in kdeadmin-3.4.2/ksysv/Makefile.in
+--- kdeadmin-3.4.2.orig/ksysv/Makefile.in 2005-07-20 19:54:27.000000000 +0000
++++ kdeadmin-3.4.2/ksysv/Makefile.in 2005-07-31 17:58:47.947046808 +0000
+@@ -267,6 +267,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7552,7 +8162,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -526,7 +529,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -7561,7 +8171,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -564,9 +567,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7573,10 +8183,92 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -rua kdeadmin-3.4.1.orig/ksysv/pics/Makefile.in kdeadmin-3.4.1/ksysv/pics/Makefile.in
---- kdeadmin-3.4.1.orig/ksysv/pics/Makefile.in 2005-05-23 17:45:07.000000000 +0200
-+++ kdeadmin-3.4.1/ksysv/pics/Makefile.in 2005-05-25 00:38:05.156592765 +0200
-@@ -176,6 +176,9 @@
+@@ -1101,18 +1104,18 @@
+ mocs: ServiceDlg.moc
+
+ #>+ 3
+-ksvdrag.moc: $(srcdir)/ksvdrag.h
+- $(MOC) $(srcdir)/ksvdrag.h -o ksvdrag.moc
++ksvdraglist.moc: $(srcdir)/ksvdraglist.h
++ $(MOC) $(srcdir)/ksvdraglist.h -o ksvdraglist.moc
+
+ #>+ 2
+-mocs: ksvdrag.moc
++mocs: ksvdraglist.moc
+
+ #>+ 3
+-ksvdraglist.moc: $(srcdir)/ksvdraglist.h
+- $(MOC) $(srcdir)/ksvdraglist.h -o ksvdraglist.moc
++ksvdrag.moc: $(srcdir)/ksvdrag.h
++ $(MOC) $(srcdir)/ksvdrag.h -o ksvdrag.moc
+
+ #>+ 2
+-mocs: ksvdraglist.moc
++mocs: ksvdrag.moc
+
+ #>+ 3
+ RunlevelAuthIcon.moc: $(srcdir)/RunlevelAuthIcon.h
+@@ -1172,10 +1175,10 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f ksvconfigwizard.moc ksvmiscconfig.moc OldView.moc Properties.moc ksvapplication.moc SpinBox.moc ServiceDlg.moc ksvdrag.moc ksvdraglist.moc RunlevelAuthIcon.moc ksvpathconfig.moc TopWidget.moc PreferencesDialog.moc trash.moc ActionList.moc ksvlookandfeel.moc kscroller.moc
++ -rm -f ksvconfigwizard.moc ksvmiscconfig.moc OldView.moc Properties.moc ksvapplication.moc SpinBox.moc ServiceDlg.moc ksvdraglist.moc ksvdrag.moc RunlevelAuthIcon.moc ksvpathconfig.moc TopWidget.moc PreferencesDialog.moc trash.moc ActionList.moc ksvlookandfeel.moc kscroller.moc
+
+ #>+ 2
+-KDE_DIST=x-ksysv-log.desktop pathconfig.ui cr16-app-ksysv.png cr48-app-ksysv.png configwizard.ui x-ksysv.desktop miscconfig.ui ksysv.desktop configure.in.in Makefile.in genui.sh cr32-app-ksysv.png lookandfeelconfig.ui Makefile.am ksysvui.rc
++KDE_DIST=x-ksysv-log.desktop pathconfig.ui cr16-app-ksysv.png cr48-app-ksysv.png configwizard.ui x-ksysv.desktop miscconfig.ui ksysv.desktop configure.in.in Makefile.in genui.sh cr32-app-ksysv.png lookandfeelconfig.ui ksysvui.rc Makefile.am
+
+ #>+ 7
+ clean-ui:
+@@ -1190,17 +1193,17 @@
+
+ #>+ 13
+ install-kde-icons:
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/cr48-app-ksysv.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ksysv.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/cr32-app-ksysv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksysv.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/cr16-app-ksysv.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksysv.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/cr48-app-ksysv.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ksysv.png
+
+ uninstall-kde-icons:
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ksysv.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksysv.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksysv.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ksysv.png
+
+ #>+ 15
+ force-reedit:
+@@ -1241,7 +1244,7 @@
+
+
+ #>+ 11
+-ksysv.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/ActionList.cpp $(srcdir)/IOCore.cpp $(srcdir)/ksvdraglist.cpp $(srcdir)/RunlevelAuthIcon.cpp $(srcdir)/OldView.cpp $(srcdir)/Properties.cpp $(srcdir)/SpinBox.cpp $(srcdir)/ServiceDlg.cpp $(srcdir)/TopWidget.cpp $(srcdir)/Data.cpp $(srcdir)/ksv_conf.cpp $(srcdir)/ksvapplication.cpp $(srcdir)/kdltooltip.cpp $(srcdir)/ksv_core.cpp $(srcdir)/ksvdrag.cpp $(srcdir)/kscroller.cpp $(srcdir)/ksv_service.cpp $(srcdir)/PreferencesDialog.cpp $(srcdir)/trash.cpp $(srcdir)/ksvpathconfig.cpp $(srcdir)/ksvmiscconfig.cpp $(srcdir)/ksvlookandfeel.cpp $(srcdir)/ksvconfigwizard.cpp $(srcdir)/kbusymanager.cpp pathconfig.cpp miscconfig.cpp lookandfeelconfig.cpp configwizard.cpp ksvconfigwizard.moc ksvmiscconfig.moc OldView.moc Properties.moc ksvapplication.moc SpinBox.moc lookandfeelconfig.moc ServiceDlg.moc ksvdrag.moc ksvdraglist.moc RunlevelAuthIcon.moc ksvpathconfig.moc miscconfig.moc TopWidget.moc trash.moc PreferencesDialog.moc ksvlookandfeel.moc ActionList.moc pathconfig.moc kscroller.moc configwizard.moc
++ksysv.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/ActionList.cpp $(srcdir)/IOCore.cpp $(srcdir)/ksvdraglist.cpp $(srcdir)/RunlevelAuthIcon.cpp $(srcdir)/OldView.cpp $(srcdir)/Properties.cpp $(srcdir)/SpinBox.cpp $(srcdir)/ServiceDlg.cpp $(srcdir)/TopWidget.cpp $(srcdir)/Data.cpp $(srcdir)/ksv_conf.cpp $(srcdir)/ksvapplication.cpp $(srcdir)/kdltooltip.cpp $(srcdir)/ksv_core.cpp $(srcdir)/ksvdrag.cpp $(srcdir)/kscroller.cpp $(srcdir)/ksv_service.cpp $(srcdir)/PreferencesDialog.cpp $(srcdir)/trash.cpp $(srcdir)/ksvpathconfig.cpp $(srcdir)/ksvmiscconfig.cpp $(srcdir)/ksvlookandfeel.cpp $(srcdir)/ksvconfigwizard.cpp $(srcdir)/kbusymanager.cpp pathconfig.cpp miscconfig.cpp lookandfeelconfig.cpp configwizard.cpp ksvconfigwizard.moc ksvmiscconfig.moc OldView.moc Properties.moc ksvapplication.moc SpinBox.moc lookandfeelconfig.moc ServiceDlg.moc ksvdraglist.moc ksvdrag.moc RunlevelAuthIcon.moc ksvpathconfig.moc miscconfig.moc TopWidget.moc trash.moc PreferencesDialog.moc ksvlookandfeel.moc ActionList.moc pathconfig.moc kscroller.moc configwizard.moc
+ @echo 'creating ksysv.all_cpp.cpp ...'; \
+ rm -f ksysv.all_cpp.files ksysv.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> ksysv.all_cpp.final; \
+@@ -1294,11 +1297,11 @@
+ nmcheck-am: nmcheck
+ ksvmiscconfig.lo: ksvmiscconfig.moc
+ ServiceDlg.lo: ServiceDlg.moc
+-ksvdraglist.o: ksvdraglist.moc
+ SpinBox.lo: SpinBox.moc
++ksvdraglist.o: ksvdraglist.moc
+ TopWidget.lo: TopWidget.moc
+-ksvdraglist.lo: ksvdraglist.moc
+ ServiceDlg.o: ServiceDlg.moc
++ksvdraglist.lo: ksvdraglist.moc
+ ksvlookandfeel.lo: ksvlookandfeel.moc
+ OldView.lo: OldView.moc
+ ksvdrag.lo: ksvdrag.moc
+diff -Nru kdeadmin-3.4.2.orig/ksysv/pics/Makefile.in kdeadmin-3.4.2/ksysv/pics/Makefile.in
+--- kdeadmin-3.4.2.orig/ksysv/pics/Makefile.in 2005-07-20 19:54:27.000000000 +0000
++++ kdeadmin-3.4.2/ksysv/pics/Makefile.in 2005-07-31 17:58:47.960044832 +0000
+@@ -177,6 +177,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7586,7 +8278,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -336,7 +339,7 @@
+@@ -337,7 +340,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7595,7 +8287,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -374,9 +377,9 @@
+@@ -375,9 +378,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7607,10 +8299,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeadmin-3.4.1.orig/ksysv/toolbar/Makefile.in kdeadmin-3.4.1/ksysv/toolbar/Makefile.in
---- kdeadmin-3.4.1.orig/ksysv/toolbar/Makefile.in 2005-05-23 17:45:07.000000000 +0200
-+++ kdeadmin-3.4.1/ksysv/toolbar/Makefile.in 2005-05-25 00:38:05.162592224 +0200
-@@ -166,6 +166,9 @@
+diff -Nru kdeadmin-3.4.2.orig/ksysv/toolbar/Makefile.in kdeadmin-3.4.2/ksysv/toolbar/Makefile.in
+--- kdeadmin-3.4.2.orig/ksysv/toolbar/Makefile.in 2005-07-20 19:54:27.000000000 +0000
++++ kdeadmin-3.4.2/ksysv/toolbar/Makefile.in 2005-07-31 17:58:47.973042856 +0000
+@@ -167,6 +167,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7620,7 +8312,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -318,7 +321,7 @@
+@@ -319,7 +322,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7629,7 +8321,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -356,9 +359,9 @@
+@@ -357,9 +360,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7641,10 +8333,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeadmin-3.4.1.orig/kuser/icon/Makefile.in kdeadmin-3.4.1/kuser/icon/Makefile.in
---- kdeadmin-3.4.1.orig/kuser/icon/Makefile.in 2005-05-23 17:45:07.000000000 +0200
-+++ kdeadmin-3.4.1/kuser/icon/Makefile.in 2005-05-25 00:38:05.208588078 +0200
-@@ -166,6 +166,9 @@
+diff -Nru kdeadmin-3.4.2.orig/kuser/icon/Makefile.in kdeadmin-3.4.2/kuser/icon/Makefile.in
+--- kdeadmin-3.4.2.orig/kuser/icon/Makefile.in 2005-07-20 19:54:27.000000000 +0000
++++ kdeadmin-3.4.2/kuser/icon/Makefile.in 2005-07-31 17:58:48.083026136 +0000
+@@ -167,6 +167,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7654,7 +8346,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -318,7 +321,7 @@
+@@ -319,7 +322,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7663,7 +8355,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -356,9 +359,9 @@
+@@ -357,9 +360,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7675,10 +8367,51 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeadmin-3.4.1.orig/kuser/Makefile.in kdeadmin-3.4.1/kuser/Makefile.in
---- kdeadmin-3.4.1.orig/kuser/Makefile.in 2005-05-23 17:45:07.000000000 +0200
-+++ kdeadmin-3.4.1/kuser/Makefile.in 2005-05-25 00:38:05.202588618 +0200
-@@ -262,6 +262,9 @@
+@@ -502,30 +505,30 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=cr48-app-kuser.png cr16-app-kuser.png cr128-app-kuser.png cr32-app-kuser.png Makefile.in cr64-app-kuser.png Makefile.am
++KDE_DIST=cr16-app-kuser.png cr48-app-kuser.png cr128-app-kuser.png cr32-app-kuser.png Makefile.in cr64-app-kuser.png Makefile.am
+
+ #>+ 2
+ docs-am:
+
+ #>+ 19
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kuser.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kuser.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kuser.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kuser.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/cr64-app-kuser.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kuser.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/cr128-app-kuser.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kuser.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/cr48-app-kuser.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kuser.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/cr128-app-kuser.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kuser.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kuser.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kuser.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kuser.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kuser.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kuser.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kuser.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kuser.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kuser.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kuser.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kuser.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kuser.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kuser.png
+
+ #>+ 15
+ force-reedit:
+diff -Nru kdeadmin-3.4.2.orig/kuser/Makefile.in kdeadmin-3.4.2/kuser/Makefile.in
+--- kdeadmin-3.4.2.orig/kuser/Makefile.in 2005-07-20 19:54:27.000000000 +0000
++++ kdeadmin-3.4.2/kuser/Makefile.in 2005-07-31 17:58:48.065028872 +0000
+@@ -263,6 +263,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7688,7 +8421,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -466,7 +469,7 @@
+@@ -467,7 +470,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -7697,7 +8430,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -504,9 +507,9 @@
+@@ -505,9 +508,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7709,10 +8442,48 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -rua kdeadmin-3.4.1.orig/kuser/pic/Makefile.in kdeadmin-3.4.1/kuser/pic/Makefile.in
---- kdeadmin-3.4.1.orig/kuser/pic/Makefile.in 2005-05-23 17:45:07.000000000 +0200
-+++ kdeadmin-3.4.1/kuser/pic/Makefile.in 2005-05-25 00:38:05.214587537 +0200
-@@ -176,6 +176,9 @@
+@@ -1037,18 +1040,18 @@
+ mocs: mainView.moc
+
+ #>+ 3
+-kgroupvw.moc: $(srcdir)/kgroupvw.h
+- $(MOC) $(srcdir)/kgroupvw.h -o kgroupvw.moc
++selectconn.moc: $(srcdir)/selectconn.h
++ $(MOC) $(srcdir)/selectconn.h -o selectconn.moc
+
+ #>+ 2
+-mocs: kgroupvw.moc
++mocs: selectconn.moc
+
+ #>+ 3
+-selectconn.moc: $(srcdir)/selectconn.h
+- $(MOC) $(srcdir)/selectconn.h -o selectconn.moc
++kgroupvw.moc: $(srcdir)/kgroupvw.h
++ $(MOC) $(srcdir)/kgroupvw.h -o kgroupvw.moc
+
+ #>+ 2
+-mocs: selectconn.moc
++mocs: kgroupvw.moc
+
+ #>+ 3
+ editDefaults.moc: $(srcdir)/editDefaults.h
+@@ -1066,10 +1069,10 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f mainWidget.moc addUser.moc propdlg.moc editGroup.moc pwddlg.moc kuserldap.moc kgroupldap.moc delUser.moc mainView.moc kgroupvw.moc selectconn.moc editDefaults.moc kuservw.moc
++ -rm -f mainWidget.moc addUser.moc propdlg.moc editGroup.moc pwddlg.moc kuserldap.moc kgroupldap.moc delUser.moc mainView.moc selectconn.moc kgroupvw.moc editDefaults.moc kuservw.moc
+
+ #>+ 2
+-KDE_DIST=kuserprefs.kcfgc generalsettings.ui passwordpolicy.ui ldapsamba.ui filessettings.ui configure.in.in stamp-h.in Makefile.in kuserui.rc kuser.kcfg ldapsettings.ui Makefile.am
++KDE_DIST=kuserprefs.kcfgc generalsettings.ui passwordpolicy.ui ldapsamba.ui filessettings.ui configure.in.in stamp-h.in kuserui.rc kuser.kcfg Makefile.in ldapsettings.ui Makefile.am
+
+ #>+ 8
+ clean-ui:
+diff -Nru kdeadmin-3.4.2.orig/kuser/pic/Makefile.in kdeadmin-3.4.2/kuser/pic/Makefile.in
+--- kdeadmin-3.4.2.orig/kuser/pic/Makefile.in 2005-07-20 19:54:27.000000000 +0000
++++ kdeadmin-3.4.2/kuser/pic/Makefile.in 2005-07-31 17:58:48.113021576 +0000
+@@ -177,6 +177,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7722,7 +8493,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -335,7 +338,7 @@
+@@ -336,7 +339,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7731,7 +8502,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -373,9 +376,9 @@
+@@ -374,9 +377,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7743,10 +8514,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeadmin-3.4.1.orig/kuser/toolbar/Makefile.in kdeadmin-3.4.1/kuser/toolbar/Makefile.in
---- kdeadmin-3.4.1.orig/kuser/toolbar/Makefile.in 2005-05-23 17:45:07.000000000 +0200
-+++ kdeadmin-3.4.1/kuser/toolbar/Makefile.in 2005-05-25 00:38:05.221586906 +0200
-@@ -166,6 +166,9 @@
+diff -Nru kdeadmin-3.4.2.orig/kuser/toolbar/Makefile.in kdeadmin-3.4.2/kuser/toolbar/Makefile.in
+--- kdeadmin-3.4.2.orig/kuser/toolbar/Makefile.in 2005-07-20 19:54:27.000000000 +0000
++++ kdeadmin-3.4.2/kuser/toolbar/Makefile.in 2005-07-31 17:58:48.130018992 +0000
+@@ -167,6 +167,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7756,7 +8527,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -319,7 +322,7 @@
+@@ -320,7 +323,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7765,7 +8536,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -357,9 +360,9 @@
+@@ -358,9 +361,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7777,10 +8548,37 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeadmin-3.4.1.orig/lilo-config/common/Makefile.in kdeadmin-3.4.1/lilo-config/common/Makefile.in
---- kdeadmin-3.4.1.orig/lilo-config/common/Makefile.in 2005-05-23 17:45:07.000000000 +0200
-+++ kdeadmin-3.4.1/lilo-config/common/Makefile.in 2005-05-25 00:38:05.235585644 +0200
-@@ -208,6 +208,9 @@
+@@ -511,20 +514,20 @@
+ #>+ 17
+ install-kde-icons:
+ $(mkinstalldirs) $(DESTDIR)$(kusericonsdir)/crystalsvg/22x22/actions
+- $(INSTALL_DATA) $(srcdir)/cr22-action-delete_group.png $(DESTDIR)$(kusericonsdir)/crystalsvg/22x22/actions/delete_group.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-delete_user.png $(DESTDIR)$(kusericonsdir)/crystalsvg/22x22/actions/delete_user.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-add_user.png $(DESTDIR)$(kusericonsdir)/crystalsvg/22x22/actions/add_user.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-add_group.png $(DESTDIR)$(kusericonsdir)/crystalsvg/22x22/actions/add_group.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-edit_group.png $(DESTDIR)$(kusericonsdir)/crystalsvg/22x22/actions/edit_group.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-delete_group.png $(DESTDIR)$(kusericonsdir)/crystalsvg/22x22/actions/delete_group.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-edit_user.png $(DESTDIR)$(kusericonsdir)/crystalsvg/22x22/actions/edit_user.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-add_group.png $(DESTDIR)$(kusericonsdir)/crystalsvg/22x22/actions/add_group.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-add_user.png $(DESTDIR)$(kusericonsdir)/crystalsvg/22x22/actions/add_user.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kusericonsdir)/crystalsvg/22x22/actions/delete_group.png
+ -rm -f $(DESTDIR)$(kusericonsdir)/crystalsvg/22x22/actions/delete_user.png
++ -rm -f $(DESTDIR)$(kusericonsdir)/crystalsvg/22x22/actions/add_user.png
++ -rm -f $(DESTDIR)$(kusericonsdir)/crystalsvg/22x22/actions/add_group.png
+ -rm -f $(DESTDIR)$(kusericonsdir)/crystalsvg/22x22/actions/edit_group.png
++ -rm -f $(DESTDIR)$(kusericonsdir)/crystalsvg/22x22/actions/delete_group.png
+ -rm -f $(DESTDIR)$(kusericonsdir)/crystalsvg/22x22/actions/edit_user.png
+- -rm -f $(DESTDIR)$(kusericonsdir)/crystalsvg/22x22/actions/add_group.png
+- -rm -f $(DESTDIR)$(kusericonsdir)/crystalsvg/22x22/actions/add_user.png
+
+ #>+ 15
+ force-reedit:
+diff -Nru kdeadmin-3.4.2.orig/lilo-config/common/Makefile.in kdeadmin-3.4.2/lilo-config/common/Makefile.in
+--- kdeadmin-3.4.2.orig/lilo-config/common/Makefile.in 2005-07-20 19:54:27.000000000 +0000
++++ kdeadmin-3.4.2/lilo-config/common/Makefile.in 2005-07-31 17:58:48.165013672 +0000
+@@ -209,6 +209,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7790,7 +8588,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -368,7 +371,7 @@
+@@ -369,7 +372,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -7799,7 +8597,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -406,9 +409,9 @@
+@@ -407,9 +410,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7811,10 +8609,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -rua kdeadmin-3.4.1.orig/lilo-config/common/tests/Makefile.in kdeadmin-3.4.1/lilo-config/common/tests/Makefile.in
---- kdeadmin-3.4.1.orig/lilo-config/common/tests/Makefile.in 2005-05-23 17:45:07.000000000 +0200
-+++ kdeadmin-3.4.1/lilo-config/common/tests/Makefile.in 2005-05-25 00:38:05.242585013 +0200
-@@ -199,6 +199,9 @@
+diff -Nru kdeadmin-3.4.2.orig/lilo-config/common/tests/Makefile.in kdeadmin-3.4.2/lilo-config/common/tests/Makefile.in
+--- kdeadmin-3.4.2.orig/lilo-config/common/tests/Makefile.in 2005-07-20 19:54:27.000000000 +0000
++++ kdeadmin-3.4.2/lilo-config/common/tests/Makefile.in 2005-07-31 17:58:48.187010328 +0000
+@@ -200,6 +200,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7824,7 +8622,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -356,7 +359,7 @@
+@@ -357,7 +360,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -7833,7 +8631,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -394,9 +397,9 @@
+@@ -395,9 +398,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7845,10 +8643,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstPROGRAMS:
-diff -rua kdeadmin-3.4.1.orig/lilo-config/kde/Makefile.in kdeadmin-3.4.1/lilo-config/kde/Makefile.in
---- kdeadmin-3.4.1.orig/lilo-config/kde/Makefile.in 2005-05-23 17:45:07.000000000 +0200
-+++ kdeadmin-3.4.1/lilo-config/kde/Makefile.in 2005-05-25 00:38:05.263583120 +0200
-@@ -218,6 +218,9 @@
+diff -Nru kdeadmin-3.4.2.orig/lilo-config/kde/Makefile.in kdeadmin-3.4.2/lilo-config/kde/Makefile.in
+--- kdeadmin-3.4.2.orig/lilo-config/kde/Makefile.in 2005-07-20 19:54:27.000000000 +0000
++++ kdeadmin-3.4.2/lilo-config/kde/Makefile.in 2005-07-31 17:58:48.248001056 +0000
+@@ -219,6 +219,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7858,7 +8656,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
+@@ -382,7 +385,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -7867,7 +8665,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -420,9 +423,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7879,10 +8677,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -rua kdeadmin-3.4.1.orig/lilo-config/kde-qt-common/Makefile.in kdeadmin-3.4.1/lilo-config/kde-qt-common/Makefile.in
---- kdeadmin-3.4.1.orig/lilo-config/kde-qt-common/Makefile.in 2005-05-23 17:45:07.000000000 +0200
-+++ kdeadmin-3.4.1/lilo-config/kde-qt-common/Makefile.in 2005-05-25 00:38:05.253584021 +0200
-@@ -208,6 +208,9 @@
+diff -Nru kdeadmin-3.4.2.orig/lilo-config/kde-qt-common/Makefile.in kdeadmin-3.4.2/lilo-config/kde-qt-common/Makefile.in
+--- kdeadmin-3.4.2.orig/lilo-config/kde-qt-common/Makefile.in 2005-07-20 19:54:27.000000000 +0000
++++ kdeadmin-3.4.2/lilo-config/kde-qt-common/Makefile.in 2005-07-31 17:58:48.223004856 +0000
+@@ -209,6 +209,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7892,7 +8690,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -373,7 +376,7 @@
+@@ -374,7 +377,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -7901,7 +8699,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -411,9 +414,9 @@
+@@ -412,9 +415,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7913,10 +8711,53 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -rua kdeadmin-3.4.1.orig/lilo-config/Makefile.in kdeadmin-3.4.1/lilo-config/Makefile.in
---- kdeadmin-3.4.1.orig/lilo-config/Makefile.in 2005-05-23 17:45:07.000000000 +0200
-+++ kdeadmin-3.4.1/lilo-config/Makefile.in 2005-05-25 00:38:05.227586365 +0200
-@@ -183,6 +183,9 @@
+@@ -647,18 +650,18 @@
+ .NOEXPORT:
+
+ #>+ 3
+-general.moc: $(srcdir)/general.h
+- $(MOC) $(srcdir)/general.h -o general.moc
++EditWidget.moc: $(srcdir)/EditWidget.h
++ $(MOC) $(srcdir)/EditWidget.h -o EditWidget.moc
+
+ #>+ 2
+-mocs: general.moc
++mocs: EditWidget.moc
+
+ #>+ 3
+-EditWidget.moc: $(srcdir)/EditWidget.h
+- $(MOC) $(srcdir)/EditWidget.h -o EditWidget.moc
++general.moc: $(srcdir)/general.h
++ $(MOC) $(srcdir)/general.h -o general.moc
+
+ #>+ 2
+-mocs: EditWidget.moc
++mocs: general.moc
+
+ #>+ 3
+ images.moc: $(srcdir)/images.h
+@@ -683,7 +686,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f general.moc EditWidget.moc images.moc expert.moc mainwidget.moc
++ -rm -f EditWidget.moc general.moc images.moc expert.moc mainwidget.moc
+
+ #>+ 2
+ KDE_DIST=Makefile.in Makefile.am
+@@ -730,7 +733,7 @@
+
+
+ #>+ 11
+-libwidgets_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/mainwidget.cpp $(srcdir)/general.cpp $(srcdir)/images.cpp $(srcdir)/expert.cpp $(srcdir)/EditWidget.cpp EditWidget.moc general.moc images.moc expert.moc mainwidget.moc
++libwidgets_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/mainwidget.cpp $(srcdir)/general.cpp $(srcdir)/images.cpp $(srcdir)/expert.cpp $(srcdir)/EditWidget.cpp general.moc EditWidget.moc images.moc expert.moc mainwidget.moc
+ @echo 'creating libwidgets_la.all_cpp.cpp ...'; \
+ rm -f libwidgets_la.all_cpp.files libwidgets_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libwidgets_la.all_cpp.final; \
+diff -Nru kdeadmin-3.4.2.orig/lilo-config/Makefile.in kdeadmin-3.4.2/lilo-config/Makefile.in
+--- kdeadmin-3.4.2.orig/lilo-config/Makefile.in 2005-07-20 19:54:27.000000000 +0000
++++ kdeadmin-3.4.2/lilo-config/Makefile.in 2005-07-31 17:58:48.144016864 +0000
+@@ -184,6 +184,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7926,7 +8767,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -335,7 +338,7 @@
+@@ -336,7 +339,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -7935,7 +8776,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -373,9 +376,9 @@
+@@ -374,9 +377,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7947,10 +8788,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua kdeadmin-3.4.1.orig/lilo-config/qt/Makefile.in kdeadmin-3.4.1/lilo-config/qt/Makefile.in
---- kdeadmin-3.4.1.orig/lilo-config/qt/Makefile.in 2005-05-23 17:45:07.000000000 +0200
-+++ kdeadmin-3.4.1/lilo-config/qt/Makefile.in 2005-05-25 00:38:05.272582309 +0200
-@@ -207,6 +207,9 @@
+diff -Nru kdeadmin-3.4.2.orig/lilo-config/qt/Makefile.in kdeadmin-3.4.2/lilo-config/qt/Makefile.in
+--- kdeadmin-3.4.2.orig/lilo-config/qt/Makefile.in 2005-07-20 19:54:27.000000000 +0000
++++ kdeadmin-3.4.2/lilo-config/qt/Makefile.in 2005-07-31 17:58:48.456969288 +0000
+@@ -208,6 +208,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7960,7 +8801,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -366,7 +369,7 @@
+@@ -367,7 +370,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -7969,7 +8810,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -404,9 +407,9 @@
+@@ -405,9 +408,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7981,10 +8822,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -rua kdeadmin-3.4.1.orig/Makefile.in kdeadmin-3.4.1/Makefile.in
---- kdeadmin-3.4.1.orig/Makefile.in 2005-05-23 17:45:07.000000000 +0200
-+++ kdeadmin-3.4.1/Makefile.in 2005-05-25 00:38:04.850620347 +0200
-@@ -199,6 +199,9 @@
+diff -Nru kdeadmin-3.4.2.orig/Makefile.in kdeadmin-3.4.2/Makefile.in
+--- kdeadmin-3.4.2.orig/Makefile.in 2005-07-20 19:54:27.000000000 +0000
++++ kdeadmin-3.4.2/Makefile.in 2005-07-31 17:58:46.893207016 +0000
+@@ -200,6 +200,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7994,7 +8835,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -357,7 +360,7 @@
+@@ -358,7 +361,7 @@
.SUFFIXES:
am--refresh:
@:
@@ -8003,7 +8844,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -399,12 +402,12 @@
+@@ -400,12 +403,12 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -8018,7 +8859,7 @@
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
config.h: stamp-h1
-@@ -416,7 +419,7 @@
+@@ -417,7 +420,7 @@
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
@@ -8027,19 +8868,19 @@
cd $(top_srcdir) && $(AUTOHEADER)
rm -f stamp-h1
touch $@
-@@ -833,7 +836,7 @@
+@@ -834,7 +837,7 @@
.NOEXPORT:
#>+ 2
-KDE_DIST=configure.in kdeadmin.lsm subdirs Makefile.in aclocal.m4 configure.files config.h.in configure.in.in Makefile.am acinclude.m4 Makefile.am.in
-+KDE_DIST=stamp-h.in subdirs Makefile.in configure.files config.h.in configure.in kdeadmin.lsm aclocal.m4 configure.in.in acinclude.m4 Makefile.am configure Makefile.am.in
++KDE_DIST=stamp-h.in subdirs Makefile.in configure.files config.h.in configure.in kdeadmin.lsm aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in
#>+ 2
docs-am:
-diff -rua kdeadmin-3.4.1.orig/secpolicy/Makefile.in kdeadmin-3.4.1/secpolicy/Makefile.in
---- kdeadmin-3.4.1.orig/secpolicy/Makefile.in 2005-05-23 17:45:07.000000000 +0200
-+++ kdeadmin-3.4.1/secpolicy/Makefile.in 2005-05-25 00:38:05.281581498 +0200
-@@ -210,6 +210,9 @@
+diff -Nru kdeadmin-3.4.2.orig/secpolicy/Makefile.in kdeadmin-3.4.2/secpolicy/Makefile.in
+--- kdeadmin-3.4.2.orig/secpolicy/Makefile.in 2005-07-20 19:54:27.000000000 +0000
++++ kdeadmin-3.4.2/secpolicy/Makefile.in 2005-07-31 17:58:48.480965640 +0000
+@@ -211,6 +211,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8049,7 +8890,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -369,7 +372,7 @@
+@@ -370,7 +373,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8058,7 +8899,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -407,9 +410,9 @@
+@@ -408,9 +411,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
More information about the Pkg-kde-commits
mailing list