[Pkg-kde-commits] rev 1962 - in
branches/kde-3.4.0/packages/arts/debian: . patches
Christopher Martin
chrsmrtn at costa.debian.org
Sat Oct 15 17:47:25 UTC 2005
Author: chrsmrtn
Date: 2005-10-15 17:47:23 +0000 (Sat, 15 Oct 2005)
New Revision: 1962
Modified:
branches/kde-3.4.0/packages/arts/debian/changelog
branches/kde-3.4.0/packages/arts/debian/patches/98_buildprep.diff
Log:
Getting arts ready for an experimental upload.
Modified: branches/kde-3.4.0/packages/arts/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/arts/debian/changelog 2005-10-13 20:35:39 UTC (rev 1961)
+++ branches/kde-3.4.0/packages/arts/debian/changelog 2005-10-15 17:47:23 UTC (rev 1962)
@@ -1,8 +1,8 @@
-arts (1.4.3-1) UNRELEASED; urgency=low
+arts (1.4.3-1) experimental; urgency=low
* New upstream release.
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Date
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 15 Oct 2005 13:45:44 -0400
arts (1.4.2-4) unstable; urgency=low
Modified: branches/kde-3.4.0/packages/arts/debian/patches/98_buildprep.diff
===================================================================
--- branches/kde-3.4.0/packages/arts/debian/patches/98_buildprep.diff 2005-10-13 20:35:39 UTC (rev 1961)
+++ branches/kde-3.4.0/packages/arts/debian/patches/98_buildprep.diff 2005-10-15 17:47:23 UTC (rev 1962)
@@ -1,6 +1,7 @@
-diff -Nru arts-1.4.2.orig/acinclude.m4 arts-1.4.2/acinclude.m4
---- arts-1.4.2.orig/acinclude.m4 2005-07-20 19:48:22.000000000 +0000
-+++ arts-1.4.2/acinclude.m4 2005-07-26 18:26:38.715703168 +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 arts-1.4.2.orig/aclocal.m4 arts-1.4.2/aclocal.m4
---- arts-1.4.2.orig/aclocal.m4 2005-07-20 19:48:36.000000000 +0000
-+++ arts-1.4.2/aclocal.m4 2005-07-26 18:27:00.904329984 +0000
+--- aclocal.m4
++++ aclocal.m4
@@ -501,6 +501,35 @@
rmdir .tst 2>/dev/null
AC_SUBST([am__leading_dot])])
@@ -1555,10 +1555,9 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-diff -Nru arts-1.4.2.orig/artsc/Makefile.in arts-1.4.2/artsc/Makefile.in
---- arts-1.4.2.orig/artsc/Makefile.in 2005-07-20 19:48:59.000000000 +0000
-+++ arts-1.4.2/artsc/Makefile.in 2005-07-26 18:27:37.508765264 +0000
-@@ -262,6 +262,9 @@
+--- artsc/Makefile.in
++++ artsc/Makefile.in
+@@ -260,6 +260,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -1568,7 +1567,7 @@
MAKEINFO = @MAKEINFO@
MAS_CFLAGS = @MAS_CFLAGS@
MAS_CONFIG = @MAS_CONFIG@
-@@ -425,7 +428,7 @@
+@@ -423,7 +426,7 @@
.SUFFIXES:
.SUFFIXES: .c .cc .lo .o .obj
@@ -1577,7 +1576,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -463,9 +466,9 @@
+@@ -461,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1589,7 +1588,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
artsc_export.h: stamp-h3
-@@ -477,7 +480,7 @@
+@@ -475,7 +478,7 @@
stamp-h3: $(srcdir)/artsc_export.h.in $(top_builddir)/config.status
@rm -f stamp-h3
cd $(top_builddir) && $(SHELL) ./config.status artsc/artsc_export.h
@@ -1598,9 +1597,8 @@
cd $(top_srcdir) && $(AUTOHEADER)
rm -f stamp-h3
touch $@
-diff -Nru arts-1.4.2.orig/config.h.in arts-1.4.2/config.h.in
---- arts-1.4.2.orig/config.h.in 2005-07-20 19:48:43.000000000 +0000
-+++ arts-1.4.2/config.h.in 2005-07-26 18:27:10.597856344 +0000
+--- config.h.in
++++ config.h.in
@@ -651,9 +651,6 @@
#endif
@@ -1611,9 +1609,8 @@
#if defined(__SVR4) && !defined(__svr4__)
#define __svr4__ 1
-diff -Nru arts-1.4.2.orig/configure arts-1.4.2/configure
---- arts-1.4.2.orig/configure 2005-07-20 19:49:02.000000000 +0000
-+++ arts-1.4.2/configure 2005-07-26 18:27:43.703823472 +0000
+--- configure
++++ configure
@@ -464,7 +464,7 @@
# include <unistd.h>
#endif"
@@ -7922,9 +7919,8 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
-diff -Nru arts-1.4.2.orig/configure.in arts-1.4.2/configure.in
---- arts-1.4.2.orig/configure.in 2005-07-20 19:48:23.000000000 +0000
-+++ arts-1.4.2/configure.in 2005-07-26 18:26:39.424595400 +0000
+--- configure.in
++++ configure.in
@@ -27,6 +27,8 @@
dnl Automake doc recommends to do this only here. (Janos)
AM_INIT_AUTOMAKE(arts, $ARTS_VERSION) dnl searches for some needed programs
@@ -7934,9 +7930,8 @@
AC_PROG_INSTALL
dnl generate the config header
-diff -Nru arts-1.4.2.orig/doc/Makefile.in arts-1.4.2/doc/Makefile.in
---- arts-1.4.2.orig/doc/Makefile.in 2005-07-20 19:48:59.000000000 +0000
-+++ arts-1.4.2/doc/Makefile.in 2005-07-26 18:27:37.519763592 +0000
+--- doc/Makefile.in
++++ doc/Makefile.in
@@ -183,6 +183,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7968,10 +7963,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru arts-1.4.2.orig/examples/Makefile.in arts-1.4.2/examples/Makefile.in
---- arts-1.4.2.orig/examples/Makefile.in 2005-07-20 19:48:59.000000000 +0000
-+++ arts-1.4.2/examples/Makefile.in 2005-07-26 18:27:37.593752344 +0000
-@@ -401,6 +401,9 @@
+--- examples/Makefile.in
++++ examples/Makefile.in
+@@ -399,6 +399,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7981,7 +7975,7 @@
MAKEINFO = @MAKEINFO@
MAS_CFLAGS = @MAS_CFLAGS@
MAS_CONFIG = @MAS_CONFIG@
-@@ -594,7 +597,7 @@
+@@ -592,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .c .cc .lo .o .obj
@@ -7990,7 +7984,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -632,9 +635,9 @@
+@@ -630,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8002,7 +7996,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-@@ -988,7 +991,7 @@
+@@ -986,7 +989,7 @@
.NOEXPORT:
#>+ 2
@@ -8011,10 +8005,9 @@
#>+ 2
docs-am:
-diff -Nru arts-1.4.2.orig/flow/gsl/Makefile.in arts-1.4.2/flow/gsl/Makefile.in
---- arts-1.4.2.orig/flow/gsl/Makefile.in 2005-07-20 19:48:59.000000000 +0000
-+++ arts-1.4.2/flow/gsl/Makefile.in 2005-07-26 18:27:37.667741096 +0000
-@@ -262,6 +262,9 @@
+--- flow/gsl/Makefile.in
++++ flow/gsl/Makefile.in
+@@ -260,6 +260,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8024,7 +8017,7 @@
MAKEINFO = @MAKEINFO@
MAS_CFLAGS = @MAS_CFLAGS@
MAS_CONFIG = @MAS_CONFIG@
-@@ -446,7 +449,7 @@
+@@ -444,7 +447,7 @@
.SUFFIXES:
.SUFFIXES: .c .cc .lo .o .obj
@@ -8033,7 +8026,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -484,9 +487,9 @@
+@@ -482,9 +485,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8045,7 +8038,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
gslconfig.h: $(top_builddir)/config.status $(srcdir)/gslconfig.h.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-@@ -839,7 +842,7 @@
+@@ -837,7 +840,7 @@
#>+ 2
@@ -8054,10 +8047,9 @@
#>+ 3
clean-closures:
-diff -Nru arts-1.4.2.orig/flow/gslpp/Makefile.in arts-1.4.2/flow/gslpp/Makefile.in
---- arts-1.4.2.orig/flow/gslpp/Makefile.in 2005-07-20 19:48:59.000000000 +0000
-+++ arts-1.4.2/flow/gslpp/Makefile.in 2005-07-26 18:27:37.685738360 +0000
-@@ -214,6 +214,9 @@
+--- flow/gslpp/Makefile.in
++++ flow/gslpp/Makefile.in
+@@ -212,6 +212,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8067,7 +8059,7 @@
MAKEINFO = @MAKEINFO@
MAS_CFLAGS = @MAS_CFLAGS@
MAS_CONFIG = @MAS_CONFIG@
-@@ -352,7 +355,7 @@
+@@ -350,7 +353,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8076,7 +8068,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -390,9 +393,9 @@
+@@ -388,9 +391,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8088,10 +8080,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru arts-1.4.2.orig/flow/Makefile.in arts-1.4.2/flow/Makefile.in
---- arts-1.4.2.orig/flow/Makefile.in 2005-07-20 19:48:59.000000000 +0000
-+++ arts-1.4.2/flow/Makefile.in 2005-07-26 18:27:37.639745352 +0000
-@@ -295,6 +295,9 @@
+--- flow/Makefile.in
++++ flow/Makefile.in
+@@ -293,6 +293,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8101,7 +8092,7 @@
MAKEINFO = @MAKEINFO@
MAS_CFLAGS = @MAS_CFLAGS@
MAS_CONFIG = @MAS_CONFIG@
-@@ -473,7 +476,7 @@
+@@ -471,7 +474,7 @@
.SUFFIXES:
.SUFFIXES: .c .cc .lo .o .obj
@@ -8110,7 +8101,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -511,9 +514,9 @@
+@@ -509,9 +512,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8122,9 +8113,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru arts-1.4.2.orig/flow/mcopclass/Makefile.in arts-1.4.2/flow/mcopclass/Makefile.in
---- arts-1.4.2.orig/flow/mcopclass/Makefile.in 2005-07-20 19:48:59.000000000 +0000
-+++ arts-1.4.2/flow/mcopclass/Makefile.in 2005-07-26 18:27:37.698736384 +0000
+--- flow/mcopclass/Makefile.in
++++ flow/mcopclass/Makefile.in
@@ -192,6 +192,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8156,10 +8146,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru arts-1.4.2.orig/gmcop/Makefile.in arts-1.4.2/gmcop/Makefile.in
---- arts-1.4.2.orig/gmcop/Makefile.in 2005-07-20 19:48:59.000000000 +0000
-+++ arts-1.4.2/gmcop/Makefile.in 2005-07-26 18:27:37.717733496 +0000
-@@ -228,6 +228,9 @@
+--- gmcop/Makefile.in
++++ gmcop/Makefile.in
+@@ -226,6 +226,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8169,7 +8158,7 @@
MAKEINFO = @MAKEINFO@
MAS_CFLAGS = @MAS_CFLAGS@
MAS_CONFIG = @MAS_CONFIG@
-@@ -372,7 +375,7 @@
+@@ -370,7 +373,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -8178,7 +8167,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -410,9 +413,9 @@
+@@ -408,9 +411,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8190,10 +8179,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru arts-1.4.2.orig/libltdl/Makefile.in arts-1.4.2/libltdl/Makefile.in
---- arts-1.4.2.orig/libltdl/Makefile.in 2005-07-20 19:48:59.000000000 +0000
-+++ arts-1.4.2/libltdl/Makefile.in 2005-07-26 18:27:37.734730912 +0000
-@@ -208,6 +208,9 @@
+--- libltdl/Makefile.in
++++ libltdl/Makefile.in
+@@ -206,6 +206,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8203,7 +8191,7 @@
MAKEINFO = @MAKEINFO@
MAS_CFLAGS = @MAS_CFLAGS@
MAS_CONFIG = @MAS_CONFIG@
-@@ -348,7 +351,7 @@
+@@ -346,7 +349,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -8212,7 +8200,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -386,9 +389,9 @@
+@@ -384,9 +387,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8224,9 +8212,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru arts-1.4.2.orig/Makefile.in arts-1.4.2/Makefile.in
---- arts-1.4.2.orig/Makefile.in 2005-07-20 19:48:59.000000000 +0000
-+++ arts-1.4.2/Makefile.in 2005-07-26 18:27:37.476770128 +0000
+--- Makefile.in
++++ Makefile.in
@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8274,15 +8261,14 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=subdirs Makefile.in configure.in.bot configure.files config.h.in Makefile.am.in.wo configure.in aclocal.m4 configure.in.in acinclude.m4 Makefile.am arts.lsm Makefile.am.in
-+KDE_DIST=stamp-h.in subdirs Makefile.in configure.in.bot configure.files config.h.in Makefile.am.in.wo configure.in aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 arts.lsm Makefile.am.in
+-KDE_DIST=subdirs Makefile.in configure.in.bot configure.files config.h.in Makefile.am.in.wo configure.in Makefile.cvs aclocal.m4 configure.in.in acinclude.m4 Makefile.am arts.lsm Makefile.am.in
++KDE_DIST=stamp-h.in subdirs Makefile.in configure.in.bot configure.files config.h.in Makefile.am.in.wo configure.in Makefile.cvs aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 arts.lsm Makefile.am.in
#>+ 2
docs-am:
-diff -Nru arts-1.4.2.orig/mcop/Makefile.in arts-1.4.2/mcop/Makefile.in
---- arts-1.4.2.orig/mcop/Makefile.in 2005-07-20 19:48:59.000000000 +0000
-+++ arts-1.4.2/mcop/Makefile.in 2005-07-26 18:27:37.765726200 +0000
-@@ -256,6 +256,9 @@
+--- mcop/Makefile.in
++++ mcop/Makefile.in
+@@ -254,6 +254,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8292,7 +8278,7 @@
MAKEINFO = @MAKEINFO@
MAS_CFLAGS = @MAS_CFLAGS@
MAS_CONFIG = @MAS_CONFIG@
-@@ -422,7 +425,7 @@
+@@ -420,7 +423,7 @@
.SUFFIXES:
.SUFFIXES: .c .cc .lo .o .obj
@@ -8301,7 +8287,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -458,9 +461,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8313,7 +8299,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
arts_export.h: stamp-h2
-@@ -474,7 +477,7 @@
+@@ -472,7 +475,7 @@
stamp-h2: $(srcdir)/arts_export.h.in $(top_builddir)/config.status
@rm -f stamp-h2
cd $(top_builddir) && $(SHELL) ./config.status mcop/arts_export.h
@@ -8322,10 +8308,9 @@
cd $(top_srcdir) && $(AUTOHEADER)
rm -f stamp-h2
touch $@
-diff -Nru arts-1.4.2.orig/mcopidl/Makefile.in arts-1.4.2/mcopidl/Makefile.in
---- arts-1.4.2.orig/mcopidl/Makefile.in 2005-07-20 19:48:59.000000000 +0000
-+++ arts-1.4.2/mcopidl/Makefile.in 2005-07-26 18:27:37.803720424 +0000
-@@ -226,6 +226,9 @@
+--- mcopidl/Makefile.in
++++ mcopidl/Makefile.in
+@@ -224,6 +224,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8335,7 +8320,7 @@
MAKEINFO = @MAKEINFO@
MAS_CFLAGS = @MAS_CFLAGS@
MAS_CONFIG = @MAS_CONFIG@
-@@ -367,7 +370,7 @@
+@@ -365,7 +368,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -8344,7 +8329,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
@@ -8356,10 +8341,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru arts-1.4.2.orig/mcop_mt/Makefile.in arts-1.4.2/mcop_mt/Makefile.in
---- arts-1.4.2.orig/mcop_mt/Makefile.in 2005-07-20 19:48:59.000000000 +0000
-+++ arts-1.4.2/mcop_mt/Makefile.in 2005-07-26 18:27:37.785723160 +0000
-@@ -225,6 +225,9 @@
+--- mcop_mt/Makefile.in
++++ mcop_mt/Makefile.in
+@@ -223,6 +223,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8369,7 +8353,7 @@
MAKEINFO = @MAKEINFO@
MAS_CFLAGS = @MAS_CFLAGS@
MAS_CONFIG = @MAS_CONFIG@
-@@ -370,7 +373,7 @@
+@@ -368,7 +371,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -8378,7 +8362,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
@@ -8390,10 +8374,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru arts-1.4.2.orig/qtmcop/Makefile.in arts-1.4.2/qtmcop/Makefile.in
---- arts-1.4.2.orig/qtmcop/Makefile.in 2005-07-20 19:48:59.000000000 +0000
-+++ arts-1.4.2/qtmcop/Makefile.in 2005-07-26 18:27:37.825717080 +0000
-@@ -228,6 +228,9 @@
+--- qtmcop/Makefile.in
++++ qtmcop/Makefile.in
+@@ -226,6 +226,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8403,7 +8386,7 @@
MAKEINFO = @MAKEINFO@
MAS_CFLAGS = @MAS_CFLAGS@
MAS_CONFIG = @MAS_CONFIG@
-@@ -377,7 +380,7 @@
+@@ -375,7 +378,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -8412,7 +8395,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -415,9 +418,9 @@
+@@ -413,9 +416,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8424,10 +8407,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru arts-1.4.2.orig/soundserver/Makefile.in arts-1.4.2/soundserver/Makefile.in
---- arts-1.4.2.orig/soundserver/Makefile.in 2005-07-20 19:48:59.000000000 +0000
-+++ arts-1.4.2/soundserver/Makefile.in 2005-07-26 18:27:37.914703552 +0000
-@@ -336,6 +336,9 @@
+--- soundserver/Makefile.in
++++ soundserver/Makefile.in
+@@ -334,6 +334,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8437,7 +8419,7 @@
MAKEINFO = @MAKEINFO@
MAS_CFLAGS = @MAS_CFLAGS@
MAS_CONFIG = @MAS_CONFIG@
-@@ -568,7 +571,7 @@
+@@ -566,7 +569,7 @@
.SUFFIXES:
.SUFFIXES: .c .cc .lo .o .obj
@@ -8446,7 +8428,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -606,9 +609,9 @@
+@@ -604,9 +607,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8458,10 +8440,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
artsversion-new.h: $(top_builddir)/config.status $(srcdir)/artsversion-new.h.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-diff -Nru arts-1.4.2.orig/tests/Makefile.in arts-1.4.2/tests/Makefile.in
---- arts-1.4.2.orig/tests/Makefile.in 2005-07-20 19:48:59.000000000 +0000
-+++ arts-1.4.2/tests/Makefile.in 2005-07-26 18:27:37.953697624 +0000
-@@ -290,6 +290,9 @@
+--- tests/Makefile.in
++++ tests/Makefile.in
+@@ -288,6 +288,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8471,7 +8452,7 @@
MAKEINFO = @MAKEINFO@
MAS_CFLAGS = @MAS_CFLAGS@
MAS_CONFIG = @MAS_CONFIG@
-@@ -449,7 +452,7 @@
+@@ -447,7 +450,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -8480,7 +8461,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -487,9 +490,9 @@
+@@ -485,9 +488,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8492,10 +8473,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-diff -Nru arts-1.4.2.orig/x11/Makefile.in arts-1.4.2/x11/Makefile.in
---- arts-1.4.2.orig/x11/Makefile.in 2005-07-20 19:48:59.000000000 +0000
-+++ arts-1.4.2/x11/Makefile.in 2005-07-26 18:27:37.972694736 +0000
-@@ -238,6 +238,9 @@
+--- x11/Makefile.in
++++ x11/Makefile.in
+@@ -236,6 +236,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8505,7 +8485,7 @@
MAKEINFO = @MAKEINFO@
MAS_CFLAGS = @MAS_CFLAGS@
MAS_CONFIG = @MAS_CONFIG@
-@@ -387,7 +390,7 @@
+@@ -385,7 +388,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -8514,7 +8494,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -425,9 +428,9 @@
+@@ -423,9 +426,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