[Pkg-kde-commits] rev 1986 -
branches/kde-3.4.0/packages/kdeadmin/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Sun Oct 16 18:32:19 UTC 2005
Author: chrsmrtn
Date: 2005-10-16 18:32:17 +0000 (Sun, 16 Oct 2005)
New Revision: 1986
Modified:
branches/kde-3.4.0/packages/kdeadmin/debian/patches/98_buildprep.diff
Log:
Buildprep update for kdeadmin 3.4.3.
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-10-16 18:26:45 UTC (rev 1985)
+++ branches/kde-3.4.0/packages/kdeadmin/debian/patches/98_buildprep.diff 2005-10-16 18:32:17 UTC (rev 1986)
@@ -1,6 +1,7 @@
-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
+#DPATCHLEVEL=0
+# vi: ft=diff
+--- acinclude.m4
++++ acinclude.m4
@@ -1688,15 +1688,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
@@ -100,7 +101,7 @@
fi
])
-@@ -5799,6 +5787,7 @@
+@@ -5795,6 +5783,7 @@
## the same distribution terms that you use for the rest of that program.
# serial 47 AC_PROG_LIBTOOL
@@ -108,7 +109,7 @@
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -5858,7 +5847,7 @@
+@@ -5854,7 +5843,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -117,7 +118,7 @@
AC_SUBST(LIBTOOL)dnl
# Prevent multiple expansion
-@@ -6272,12 +6261,11 @@
+@@ -6268,12 +6257,11 @@
if AC_TRY_EVAL(ac_compile); then
case "`/usr/bin/file conftest.o`" in
*32-bit*)
@@ -131,7 +132,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -6289,7 +6277,6 @@
+@@ -6285,7 +6273,6 @@
esac
;;
*64-bit*)
@@ -139,7 +140,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -6419,7 +6406,7 @@
+@@ -6415,7 +6402,7 @@
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
@@ -148,7 +149,7 @@
case $build_os in
msdosdjgpp*)
-@@ -6448,20 +6435,26 @@
+@@ -6444,20 +6431,26 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -180,7 +181,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.
-@@ -6611,7 +6604,7 @@
+@@ -6607,7 +6600,7 @@
lt_cv_dlopen_self=yes
])
;;
@@ -189,7 +190,7 @@
*)
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
-@@ -6700,13 +6693,6 @@
+@@ -6696,13 +6689,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -203,7 +204,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.
-@@ -6730,8 +6716,11 @@
+@@ -6726,8 +6712,11 @@
fi
fi
chmod u+w .
@@ -217,7 +218,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -6848,7 +6837,7 @@
+@@ -6844,7 +6833,7 @@
*)
AC_MSG_RESULT([no])
;;
@@ -226,7 +227,7 @@
fi
])# AC_LIBTOOL_SYS_LIB_STRIP
-@@ -6861,7 +6850,7 @@
+@@ -6857,7 +6846,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -235,7 +236,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -6871,7 +6860,20 @@
+@@ -6867,7 +6856,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -257,7 +258,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -6936,7 +6938,7 @@
+@@ -6932,7 +6934,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -266,7 +267,7 @@
;;
beos*)
-@@ -6961,7 +6963,7 @@
+@@ -6957,7 +6959,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -275,7 +276,7 @@
need_version=no
need_lib_prefix=no
-@@ -7026,7 +7028,7 @@
+@@ -7022,7 +7024,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -284,7 +285,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"`
-@@ -7049,7 +7051,7 @@
+@@ -7045,7 +7047,7 @@
dynamic_linker=no
;;
@@ -293,7 +294,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -7109,7 +7111,7 @@
+@@ -7105,7 +7107,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -302,7 +303,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -7124,7 +7126,7 @@
+@@ -7120,7 +7122,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -311,7 +312,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7135,7 +7137,7 @@
+@@ -7131,7 +7133,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -320,7 +321,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7197,22 +7199,19 @@
+@@ -7193,22 +7195,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'
@@ -349,7 +350,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,
-@@ -7222,6 +7221,30 @@
+@@ -7218,6 +7217,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -380,7 +381,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -7231,7 +7254,7 @@
+@@ -7227,7 +7250,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -389,7 +390,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -7260,7 +7283,7 @@
+@@ -7256,7 +7279,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -398,7 +399,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
-@@ -7280,7 +7303,7 @@
+@@ -7276,7 +7299,7 @@
os2*)
libname_spec='$name'
@@ -407,7 +408,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -7871,31 +7894,23 @@
+@@ -7867,31 +7890,23 @@
;;
cygwin*)
@@ -448,7 +449,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -7934,42 +7949,21 @@
+@@ -7930,42 +7945,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -498,7 +499,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
-@@ -7998,9 +7992,6 @@
+@@ -7994,9 +7988,6 @@
;;
osf3* | osf4* | osf5*)
@@ -508,7 +509,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -8010,7 +8001,6 @@
+@@ -8006,7 +7997,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -516,7 +517,7 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -8276,7 +8266,7 @@
+@@ -8272,7 +8262,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])
@@ -525,7 +526,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
-@@ -8326,7 +8316,7 @@
+@@ -8322,7 +8312,7 @@
fi
;;
@@ -534,7 +535,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -8336,29 +8326,29 @@
+@@ -8332,29 +8322,29 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -578,7 +579,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8366,8 +8356,8 @@
+@@ -8362,8 +8352,8 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -589,7 +590,7 @@
esac
AC_MSG_RESULT([$enable_shared])
-@@ -8475,8 +8465,8 @@
+@@ -8471,8 +8461,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
@@ -600,7 +601,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -8502,7 +8492,7 @@
+@@ -8498,7 +8488,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.
@@ -609,7 +610,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -8532,8 +8522,22 @@
+@@ -8528,8 +8518,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -634,7 +635,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -8579,15 +8583,16 @@
+@@ -8575,15 +8579,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -655,7 +656,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.
-@@ -8596,13 +8601,12 @@
+@@ -8592,13 +8597,12 @@
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -671,7 +672,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -8617,7 +8621,7 @@
+@@ -8613,7 +8617,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.
@@ -680,7 +681,7 @@
fi
fi
;;
-@@ -8634,12 +8638,12 @@
+@@ -8630,12 +8634,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'
@@ -695,7 +696,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
-@@ -8648,7 +8652,7 @@
+@@ -8644,7 +8648,7 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -704,7 +705,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -8659,20 +8663,20 @@
+@@ -8655,20 +8659,20 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -735,7 +736,7 @@
fi
;;
esac
-@@ -8682,19 +8686,19 @@
+@@ -8678,19 +8682,19 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -761,7 +762,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8729,7 +8733,7 @@
+@@ -8725,7 +8729,7 @@
freebsd-elf*)
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
;;
@@ -770,7 +771,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8751,7 +8755,7 @@
+@@ -8747,7 +8751,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
aCC)
@@ -779,7 +780,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8760,11 +8764,11 @@
+@@ -8756,11 +8760,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.
@@ -793,7 +794,7 @@
else
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8821,7 +8825,7 @@
+@@ -8817,7 +8821,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -802,7 +803,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -8842,7 +8846,7 @@
+@@ -8838,7 +8842,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -811,7 +812,7 @@
;;
esac
fi
-@@ -8857,7 +8861,7 @@
+@@ -8853,7 +8857,7 @@
case $cc_basename in
CC)
# SGI C++
@@ -820,7 +821,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -8868,9 +8872,9 @@
+@@ -8864,9 +8868,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -832,7 +833,7 @@
fi
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -8887,8 +8891,8 @@
+@@ -8883,8 +8887,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.
@@ -843,7 +844,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8910,16 +8914,16 @@
+@@ -8906,16 +8910,16 @@
# Intel C++
with_gnu_ld=yes
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -864,7 +865,7 @@
runpath_var=LD_RUN_PATH
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -8957,7 +8961,7 @@
+@@ -8953,7 +8957,7 @@
;;
esac
;;
@@ -873,7 +874,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=
-@@ -8976,7 +8980,7 @@
+@@ -8972,7 +8976,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.
@@ -882,7 +883,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8993,7 +8997,7 @@
+@@ -8989,7 +8993,7 @@
;;
cxx)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -891,7 +892,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9011,7 +9015,7 @@
+@@ -9007,7 +9011,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -900,7 +901,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9036,7 +9040,7 @@
+@@ -9032,7 +9036,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.
@@ -909,7 +910,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9052,10 +9056,10 @@
+@@ -9048,10 +9052,10 @@
;;
cxx)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
@@ -922,7 +923,7 @@
$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9074,7 +9078,7 @@
+@@ -9070,7 +9074,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -931,7 +932,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9131,9 +9135,9 @@
+@@ -9127,9 +9131,9 @@
CC)
# Sun C++ 4.2, 5.x and Centerline C++
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -943,7 +944,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -9167,7 +9171,7 @@
+@@ -9163,7 +9167,7 @@
;;
gcx)
# Green Hills C++ Compiler
@@ -952,7 +953,7 @@
# The C++ compiler must be used to create the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9177,9 +9181,9 @@
+@@ -9173,9 +9177,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
@@ -964,7 +965,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9188,9 +9192,9 @@
+@@ -9184,9 +9188,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -976,7 +977,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9358,7 +9362,7 @@
+@@ -9354,7 +9358,7 @@
fi
;;
@@ -985,7 +986,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -9467,7 +9471,7 @@
+@@ -9463,7 +9467,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -994,7 +995,7 @@
test "$enable_shared" = yes && enable_static=no
;;
esac
-@@ -9609,11 +9613,12 @@
+@@ -9605,11 +9609,12 @@
# without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
@@ -1009,7 +1010,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 \
-@@ -9663,7 +9668,7 @@
+@@ -9659,7 +9664,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \
@@ -1018,7 +1019,7 @@
_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
_LT_AC_TAGVAR(export_symbols_cmds, $1) | \
extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9794,7 +9799,7 @@
+@@ -9790,7 +9795,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -1027,7 +1028,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -9825,7 +9830,7 @@
+@@ -9821,7 +9826,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -1036,7 +1037,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -10069,7 +10074,10 @@
+@@ -10065,7 +10070,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.
@@ -1048,7 +1049,7 @@
fi
])# AC_LIBTOOL_CONFIG
-@@ -10142,7 +10150,7 @@
+@@ -10138,7 +10146,7 @@
symcode='[[BCDEGQRST]]'
;;
solaris* | sysv5*)
@@ -1057,7 +1058,7 @@
;;
sysv4)
symcode='[[DFNSTU]]'
-@@ -10160,7 +10168,7 @@
+@@ -10156,7 +10164,7 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -1066,7 +1067,7 @@
esac
# Try without a prefix undercore, then with it.
-@@ -10375,7 +10383,7 @@
+@@ -10371,7 +10379,7 @@
;;
esac
;;
@@ -1075,7 +1076,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -10426,7 +10434,7 @@
+@@ -10422,7 +10430,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'
@@ -1084,7 +1085,7 @@
cxx)
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -10451,7 +10459,7 @@
+@@ -10447,7 +10455,7 @@
;;
esac
;;
@@ -1093,7 +1094,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -10762,6 +10770,9 @@
+@@ -10758,6 +10766,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'
;;
@@ -1103,7 +1104,7 @@
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -10786,7 +10797,7 @@
+@@ -10782,7 +10793,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
@@ -1112,7 +1113,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*
-@@ -10860,7 +10871,7 @@
+@@ -10856,7 +10867,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
@@ -1121,7 +1122,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10870,13 +10881,13 @@
+@@ -10866,13 +10877,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'
@@ -1137,7 +1138,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
-@@ -10885,19 +10896,19 @@
+@@ -10881,19 +10892,19 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -1161,7 +1162,7 @@
fi
;;
-@@ -10915,8 +10926,8 @@
+@@ -10911,8 +10922,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -1172,7 +1173,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10929,10 +10940,36 @@
+@@ -10925,10 +10936,36 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
@@ -1211,7 +1212,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10982,9 +11019,20 @@
+@@ -10978,9 +11015,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
@@ -1234,7 +1235,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -11030,29 +11078,29 @@
+@@ -11026,29 +11074,29 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -1273,7 +1274,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -11067,7 +11115,7 @@
+@@ -11063,7 +11111,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.
@@ -1282,7 +1283,7 @@
fi
fi
;;
-@@ -11090,13 +11138,13 @@
+@@ -11086,13 +11134,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -1299,7 +1300,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.
-@@ -11110,21 +11158,21 @@
+@@ -11106,21 +11154,21 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -1334,7 +1335,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -11133,26 +11181,26 @@
+@@ -11129,26 +11177,26 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -1369,7 +1370,7 @@
;;
dgux*)
-@@ -11185,8 +11233,8 @@
+@@ -11181,8 +11229,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -1380,7 +1381,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
-@@ -11194,7 +11242,7 @@
+@@ -11190,7 +11238,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -1389,7 +1390,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
-@@ -11212,10 +11260,10 @@
+@@ -11208,10 +11256,10 @@
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case "$host_cpu" in
hppa*64*|ia64*)
@@ -1402,7 +1403,7 @@
;;
esac
else
-@@ -11262,7 +11310,7 @@
+@@ -11258,7 +11306,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -1411,7 +1412,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'
-@@ -11272,7 +11320,7 @@
+@@ -11268,7 +11316,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -1420,7 +1421,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
-@@ -11295,7 +11343,7 @@
+@@ -11291,7 +11339,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
@@ -1429,7 +1430,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
else
-@@ -11305,7 +11353,7 @@
+@@ -11301,7 +11349,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
;;
*)
@@ -1438,7 +1439,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
;;
esac
-@@ -11316,14 +11364,14 @@
+@@ -11312,14 +11360,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
@@ -1455,7 +1456,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'
-@@ -11335,7 +11383,7 @@
+@@ -11331,7 +11379,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}\*'
@@ -1464,7 +1465,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
else
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-@@ -11360,9 +11408,9 @@
+@@ -11356,9 +11404,9 @@
solaris*)
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
if test "$GCC" = yes; then
@@ -1476,7 +1477,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~
-@@ -11382,7 +11430,7 @@
+@@ -11378,7 +11426,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.
@@ -1485,7 +1486,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -11442,9 +11490,9 @@
+@@ -11438,9 +11486,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
_LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -1497,7 +1498,7 @@
fi
runpath_var='LD_RUN_PATH'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11502,7 +11550,7 @@
+@@ -11498,7 +11546,7 @@
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -1506,7 +1507,7 @@
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest
lib=conftest
-@@ -11661,8 +11709,8 @@
+@@ -11657,8 +11705,8 @@
fi
done
done
@@ -1516,9 +1517,8 @@
AC_MSG_RESULT([$SED])
])
-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
+--- aclocal.m4
++++ aclocal.m4
@@ -501,6 +501,35 @@
rmdir .tst 2>/dev/null
AC_SUBST([am__leading_dot])])
@@ -1555,9 +1555,8 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-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
+--- configure
++++ configure
@@ -464,7 +464,7 @@
# include <unistd.h>
#endif"
@@ -7004,21 +7003,19 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
-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
+--- configure.in
++++ configure.in
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdeadmin, "3.4.2") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdeadmin, "3.4.3") dnl searches for some needed programs
+AM_MAINTAINER_MODE
+
KDE_SET_PREFIX
dnl generate the config header
-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
+--- doc/kcron/Makefile.in
++++ doc/kcron/Makefile.in
@@ -167,6 +167,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7054,7 +7051,7 @@
.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
@@ -7087,9 +7084,8 @@
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
+--- doc/kdat/Makefile.in
++++ doc/kdat/Makefile.in
@@ -167,6 +167,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7121,18 +7117,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -505,7 +508,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=index.docbook Makefile.in Makefile.am index.cache.bz2
-+KDE_DIST=Makefile.in index.docbook Makefile.am index.cache.bz2
-
- #>+ 24
- index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
-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
+--- doc/kpackage/Makefile.in
++++ doc/kpackage/Makefile.in
@@ -167,6 +167,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7168,7 +7154,7 @@
.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
@@ -7201,9 +7187,8 @@
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
+--- doc/ksysv/Makefile.in
++++ doc/ksysv/Makefile.in
@@ -167,6 +167,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7235,9 +7220,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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
+--- doc/kuser/Makefile.in
++++ doc/kuser/Makefile.in
@@ -167,6 +167,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7302,9 +7286,8 @@
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
+--- doc/Makefile.in
++++ doc/Makefile.in
@@ -183,6 +183,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7343,10 +7326,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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 @@
+--- kcron/Makefile.in
++++ kcron/Makefile.in
+@@ -241,6 +241,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7356,7 +7338,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -500,7 +503,7 @@
+@@ -498,7 +501,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -7365,7 +7347,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -538,9 +541,9 @@
+@@ -536,9 +539,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7377,7 +7359,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -861,18 +864,18 @@
+@@ -859,18 +862,18 @@
mocs: ktvariable.moc
#>+ 3
@@ -7402,7 +7384,7 @@
#>+ 3
ktprintopt.moc: $(srcdir)/ktprintopt.h
-@@ -890,7 +893,7 @@
+@@ -888,7 +891,7 @@
#>+ 3
clean-metasources:
@@ -7411,7 +7393,7 @@
#>+ 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 @@
+@@ -946,7 +949,7 @@
#>+ 11
@@ -7420,10 +7402,9 @@
@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 @@
+--- kdat/Makefile.in
++++ kdat/Makefile.in
+@@ -269,6 +269,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7433,7 +7414,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -548,7 +551,7 @@
+@@ -546,7 +549,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -7442,7 +7423,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -586,9 +589,9 @@
+@@ -584,9 +587,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7454,7 +7435,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1002,11 +1005,11 @@
+@@ -1000,11 +1003,11 @@
mocs: TapeInfoWidget.moc
#>+ 3
@@ -7469,7 +7450,7 @@
#>+ 3
InfoShellWidget.moc: $(srcdir)/InfoShellWidget.h
-@@ -1016,11 +1019,11 @@
+@@ -1014,11 +1017,11 @@
mocs: InfoShellWidget.moc
#>+ 3
@@ -7484,7 +7465,7 @@
#>+ 3
VerifyOptDlg.moc: $(srcdir)/VerifyOptDlg.h
-@@ -1030,13 +1033,6 @@
+@@ -1028,13 +1031,6 @@
mocs: VerifyOptDlg.moc
#>+ 3
@@ -7498,7 +7479,7 @@
VerifyDlg.moc: $(srcdir)/VerifyDlg.h
$(MOC) $(srcdir)/VerifyDlg.h -o VerifyDlg.moc
-@@ -1044,11 +1040,11 @@
+@@ -1042,11 +1038,11 @@
mocs: VerifyDlg.moc
#>+ 3
@@ -7513,7 +7494,7 @@
#>+ 3
FormatOptDlg.moc: $(srcdir)/FormatOptDlg.h
-@@ -1058,6 +1054,13 @@
+@@ -1056,6 +1052,13 @@
mocs: FormatOptDlg.moc
#>+ 3
@@ -7527,7 +7508,7 @@
FileInfoWidget.moc: $(srcdir)/FileInfoWidget.h
$(MOC) $(srcdir)/FileInfoWidget.h -o FileInfoWidget.moc
-@@ -1157,7 +1160,7 @@
+@@ -1155,7 +1158,7 @@
#>+ 3
clean-metasources:
@@ -7536,7 +7517,7 @@
#>+ 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 @@
+@@ -1207,7 +1210,7 @@
#>+ 11
@@ -7545,9 +7526,8 @@
@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
+--- kdat/pics/Makefile.in
++++ kdat/pics/Makefile.in
@@ -167,6 +167,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7721,10 +7701,9 @@
#>+ 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 @@
+--- kfile-plugins/deb/Makefile.in
++++ kfile-plugins/deb/Makefile.in
+@@ -213,6 +213,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7734,7 +7713,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -382,7 +385,7 @@
+@@ -380,7 +383,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -7743,7 +7722,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -420,9 +423,9 @@
+@@ -418,9 +421,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7755,9 +7734,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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
+--- kfile-plugins/Makefile.in
++++ kfile-plugins/Makefile.in
@@ -183,6 +183,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7789,10 +7767,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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 @@
+--- kfile-plugins/rpm/Makefile.in
++++ kfile-plugins/rpm/Makefile.in
+@@ -213,6 +213,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7802,7 +7779,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -382,7 +385,7 @@
+@@ -380,7 +383,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -7811,7 +7788,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -420,9 +423,9 @@
+@@ -418,9 +421,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7823,9 +7800,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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
+--- kpackage/icon/Makefile.in
++++ kpackage/icon/Makefile.in
@@ -167,6 +167,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7882,10 +7858,9 @@
#>+ 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 @@
+--- kpackage/Makefile.in
++++ kpackage/Makefile.in
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7895,7 +7870,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -430,7 +433,7 @@
+@@ -428,7 +431,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -7904,7 +7879,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -468,9 +471,9 @@
+@@ -466,9 +469,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7916,7 +7891,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -891,18 +894,18 @@
+@@ -889,18 +892,18 @@
.NOEXPORT:
#>+ 3
@@ -7941,7 +7916,7 @@
#>+ 3
options.moc: $(srcdir)/options.h
-@@ -933,13 +936,6 @@
+@@ -931,13 +934,6 @@
mocs: slackInterface.moc
#>+ 3
@@ -7955,7 +7930,7 @@
kpackage.moc: $(srcdir)/kpackage.h
$(MOC) $(srcdir)/kpackage.h -o kpackage.moc
-@@ -947,11 +943,11 @@
+@@ -945,11 +941,11 @@
mocs: kpackage.moc
#>+ 3
@@ -7970,7 +7945,7 @@
#>+ 3
packageProperties.moc: $(srcdir)/packageProperties.h
-@@ -961,6 +957,13 @@
+@@ -959,6 +955,13 @@
mocs: packageProperties.moc
#>+ 3
@@ -7984,7 +7959,7 @@
kissInterface.moc: $(srcdir)/kissInterface.h
$(MOC) $(srcdir)/kissInterface.h -o kissInterface.moc
-@@ -996,18 +999,18 @@
+@@ -994,18 +997,18 @@
mocs: managementWidget.moc
#>+ 3
@@ -8009,7 +7984,7 @@
#>+ 3
findf.moc: $(srcdir)/findf.h
-@@ -1031,18 +1034,18 @@
+@@ -1029,18 +1032,18 @@
mocs: packageDisplay.moc
#>+ 3
@@ -8034,7 +8009,7 @@
#>+ 3
pkgOptions.moc: $(srcdir)/pkgOptions.h
-@@ -1053,10 +1056,10 @@
+@@ -1051,10 +1054,10 @@
#>+ 3
clean-metasources:
@@ -8047,7 +8022,7 @@
#>+ 2
docs-am:
-@@ -1100,7 +1103,7 @@
+@@ -1098,7 +1101,7 @@
#>+ 11
@@ -8056,7 +8031,7 @@
@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 @@
+@@ -1171,13 +1174,13 @@
slackInterface.lo: slackInterface.moc
pkgOptions.lo: pkgOptions.moc
kpTerm.o: kpTerm.moc
@@ -8072,9 +8047,8 @@
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
+--- kpackage/pics/Makefile.in
++++ kpackage/pics/Makefile.in
@@ -177,6 +177,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8115,9 +8089,8 @@
#>+ 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
+--- kpackage/toolbar/Makefile.in
++++ kpackage/toolbar/Makefile.in
@@ -177,6 +177,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8149,10 +8122,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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 @@
+--- ksysv/Makefile.in
++++ ksysv/Makefile.in
+@@ -265,6 +265,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8162,7 +8134,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -526,7 +529,7 @@
+@@ -524,7 +527,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -8171,7 +8143,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -564,9 +567,9 @@
+@@ -562,9 +565,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8183,7 +8155,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1101,18 +1104,18 @@
+@@ -1099,18 +1102,18 @@
mocs: ServiceDlg.moc
#>+ 3
@@ -8208,7 +8180,7 @@
#>+ 3
RunlevelAuthIcon.moc: $(srcdir)/RunlevelAuthIcon.h
-@@ -1172,10 +1175,10 @@
+@@ -1170,10 +1173,10 @@
#>+ 3
clean-metasources:
@@ -8221,7 +8193,7 @@
#>+ 7
clean-ui:
-@@ -1190,17 +1193,17 @@
+@@ -1188,17 +1191,17 @@
#>+ 13
install-kde-icons:
@@ -8242,7 +8214,7 @@
#>+ 15
force-reedit:
-@@ -1241,7 +1244,7 @@
+@@ -1239,7 +1242,7 @@
#>+ 11
@@ -8251,7 +8223,7 @@
@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 @@
+@@ -1292,11 +1295,11 @@
nmcheck-am: nmcheck
ksvmiscconfig.lo: ksvmiscconfig.moc
ServiceDlg.lo: ServiceDlg.moc
@@ -8265,9 +8237,8 @@
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
+--- ksysv/pics/Makefile.in
++++ ksysv/pics/Makefile.in
@@ -177,6 +177,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8299,9 +8270,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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
+--- ksysv/toolbar/Makefile.in
++++ ksysv/toolbar/Makefile.in
@@ -167,6 +167,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8333,9 +8303,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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
+--- kuser/icon/Makefile.in
++++ kuser/icon/Makefile.in
@@ -167,6 +167,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8408,10 +8377,9 @@
#>+ 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 @@
+--- kuser/Makefile.in
++++ kuser/Makefile.in
+@@ -261,6 +261,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8421,7 +8389,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -467,7 +470,7 @@
+@@ -465,7 +468,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -8430,7 +8398,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -505,9 +508,9 @@
+@@ -503,9 +506,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8442,7 +8410,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1037,18 +1040,18 @@
+@@ -1035,18 +1038,18 @@
mocs: mainView.moc
#>+ 3
@@ -8467,7 +8435,7 @@
#>+ 3
editDefaults.moc: $(srcdir)/editDefaults.h
-@@ -1066,10 +1069,10 @@
+@@ -1064,10 +1067,10 @@
#>+ 3
clean-metasources:
@@ -8480,9 +8448,8 @@
#>+ 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
+--- kuser/pic/Makefile.in
++++ kuser/pic/Makefile.in
@@ -177,6 +177,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8514,9 +8481,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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
+--- kuser/toolbar/Makefile.in
++++ kuser/toolbar/Makefile.in
@@ -167,6 +167,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8575,10 +8541,9 @@
#>+ 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 @@
+--- lilo-config/common/Makefile.in
++++ lilo-config/common/Makefile.in
+@@ -207,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8588,7 +8553,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -369,7 +372,7 @@
+@@ -367,7 +370,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -8597,7 +8562,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -407,9 +410,9 @@
+@@ -405,9 +408,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8609,10 +8574,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-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 @@
+--- lilo-config/common/tests/Makefile.in
++++ lilo-config/common/tests/Makefile.in
+@@ -198,6 +198,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8622,7 +8586,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -357,7 +360,7 @@
+@@ -355,7 +358,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -8631,7 +8595,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -395,9 +398,9 @@
+@@ -393,9 +396,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8643,10 +8607,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstPROGRAMS:
-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 @@
+--- lilo-config/kde/Makefile.in
++++ lilo-config/kde/Makefile.in
+@@ -217,6 +217,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8656,7 +8619,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -382,7 +385,7 @@
+@@ -380,7 +383,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8665,7 +8628,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -420,9 +423,9 @@
+@@ -418,9 +421,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8677,10 +8640,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-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 @@
+--- lilo-config/kde-qt-common/Makefile.in
++++ lilo-config/kde-qt-common/Makefile.in
+@@ -207,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8690,7 +8652,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -374,7 +377,7 @@
+@@ -372,7 +375,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8699,7 +8661,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -412,9 +415,9 @@
+@@ -410,9 +413,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8711,7 +8673,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -647,18 +650,18 @@
+@@ -645,18 +648,18 @@
.NOEXPORT:
#>+ 3
@@ -8736,7 +8698,7 @@
#>+ 3
images.moc: $(srcdir)/images.h
-@@ -683,7 +686,7 @@
+@@ -681,7 +684,7 @@
#>+ 3
clean-metasources:
@@ -8745,7 +8707,7 @@
#>+ 2
KDE_DIST=Makefile.in Makefile.am
-@@ -730,7 +733,7 @@
+@@ -728,7 +731,7 @@
#>+ 11
@@ -8754,9 +8716,8 @@
@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
+--- lilo-config/Makefile.in
++++ lilo-config/Makefile.in
@@ -184,6 +184,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8788,10 +8749,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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 @@
+--- lilo-config/qt/Makefile.in
++++ lilo-config/qt/Makefile.in
+@@ -206,6 +206,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8801,7 +8761,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -367,7 +370,7 @@
+@@ -365,7 +368,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8810,7 +8770,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -405,9 +408,9 @@
+@@ -403,9 +406,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8822,9 +8782,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-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
+--- Makefile.in
++++ Makefile.in
@@ -200,6 +200,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8872,15 +8831,14 @@
.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 Makefile.am configure acinclude.m4 Makefile.am.in
+-KDE_DIST=subdirs Makefile.in configure.files config.h.in configure.in kdeadmin.lsm Makefile.cvs aclocal.m4 configure.in.in acinclude.m4 Makefile.am Makefile.am.in
++KDE_DIST=stamp-h.in subdirs Makefile.in configure.files config.h.in configure.in kdeadmin.lsm Makefile.cvs aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in
#>+ 2
docs-am:
-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 @@
+--- secpolicy/Makefile.in
++++ secpolicy/Makefile.in
+@@ -209,6 +209,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8890,7 +8848,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -370,7 +373,7 @@
+@@ -368,7 +371,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8899,7 +8857,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -408,9 +411,9 @@
+@@ -406,9 +409,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