Package: silc-toolkit Version: 0.9.12-4.2 Severity: normal Tags: patch Hi,
Attached is the diff for my silc-toolkit 0.9.12-4.3 NMU. -- Julien Danjou // Λ̊ <[EMAIL PROTECTED]> http://julien.danjou.info // 9A0D 5FD9 EB42 22F6 8974 C95C A462 B51E C2FE E5CD // And thinking so much differently.
reverted:
--- silc-toolkit-0.9.12/debian/libsilc.install
+++ silc-toolkit-0.9.12.orig/debian/libsilc.install
@@ -1,2 +0,0 @@
-usr/lib/*.so*
-usr/lib/silc/*.so*
diff -u silc-toolkit-0.9.12/debian/control silc-toolkit-0.9.12/debian/control
--- silc-toolkit-0.9.12/debian/control
+++ silc-toolkit-0.9.12/debian/control
@@ -3,7 +3,7 @@
Maintainer: Tamas SZERB <[EMAIL PROTECTED]>
Section: devel
Build-Depends: debhelper (>= 4.0.0), autotools-dev
-Standards-Version: 3.6.0
+Standards-Version: 3.7.2
Package: libsilc-1.0-2-dev
Section: libdevel
reverted:
--- silc-toolkit-0.9.12/debian/libsilc-dev.install
+++ silc-toolkit-0.9.12.orig/debian/libsilc-dev.install
@@ -1,5 +0,0 @@
-usr/include/silc/*.h
-usr/lib/*.a
-usr/lib/*.la
-usr/lib/pkgconfig/*.pc
-usr/share/doc/libsilc-dev/toolkit
diff -u silc-toolkit-0.9.12/debian/changelog
silc-toolkit-0.9.12/debian/changelog
--- silc-toolkit-0.9.12/debian/changelog
+++ silc-toolkit-0.9.12/debian/changelog
@@ -1,3 +1,11 @@
+silc-toolkit (0.9.12-4.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix empty packages (Closes: #331630)
+ * Bump standards version
+
+ -- Julien Danjou <[EMAIL PROTECTED]> Tue, 25 Jul 2006 17:50:00 +0200
+
silc-toolkit (0.9.12-4.2) unstable; urgency=low
* 0-day NMU to fix an RC bug.
diff -u silc-toolkit-0.9.12/config.sub silc-toolkit-0.9.12/config.sub
--- silc-toolkit-0.9.12/config.sub
+++ silc-toolkit-0.9.12/config.sub
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-timestamp='2005-07-08'
+timestamp='2006-02-23'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -119,8 +119,9 @@
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
- nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* |
uclinux-gnu* | \
- kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* |
rtmk-nova*)
+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* |
netbsd*-gnu* | \
+ storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
@@ -171,6 +172,10 @@
-hiux*)
os=-hiuxwe2
;;
+ -sco6)
+ os=-sco5v6
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
-sco5)
os=-sco3.2v5
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -187,6 +192,10 @@
# Don't forget version if it is 3.2v4 or newer.
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
+ -sco5v6*)
+ # Don't forget version if it is 3.2v4 or newer.
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
-sco*)
os=-sco3.2v2
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -239,7 +248,7 @@
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
- | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
+ | m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore
\
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -257,8 +266,9 @@
| mipsisa64sr71k | mipsisa64sr71kel \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
- | ms1 \
+ | mt \
| msp430 \
+ | nios | nios2 \
| ns16k | ns32k \
| or32 \
| pdp10 | pdp11 | pj | pjl \
@@ -286,6 +296,9 @@
;;
m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
;;
+ ms1)
+ basic_machine=mt-unknown
+ ;;
# We use `pc' rather than `unknown'
# because (1) that's what they normally are, and
@@ -336,8 +349,9 @@
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipstx39-* | mipstx39el-* \
| mmix-* \
- | ms1-* \
+ | mt-* \
| msp430-* \
+ | nios-* | nios2-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
@@ -696,6 +710,9 @@
basic_machine=i386-pc
os=-msdos
;;
+ ms1-*)
+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+ ;;
mvs)
basic_machine=i370-ibm
os=-mvs
@@ -803,6 +820,12 @@
pc532 | pc532-*)
basic_machine=ns32k-pc532
;;
+ pc98)
+ basic_machine=i386-pc
+ ;;
+ pc98-*)
+ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
pentium | p5 | k5 | k6 | nexgen | viac3)
basic_machine=i586-pc
;;
@@ -859,6 +882,10 @@
basic_machine=i586-unknown
os=-pw32
;;
+ rdos)
+ basic_machine=i386-pc
+ os=-rdos
+ ;;
rom68k)
basic_machine=m68k-rom68k
os=-coff
@@ -1174,21 +1201,23 @@
| -aos* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd*
\
+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+ | -openbsd* | -solidbsd* \
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* |
-mpeix* | -udk* \
+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+ | -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku*)
+ | -skyos* | -haiku* | -rdos*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
diff -u silc-toolkit-0.9.12/config.guess silc-toolkit-0.9.12/config.guess
--- silc-toolkit-0.9.12/config.guess
+++ silc-toolkit-0.9.12/config.guess
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-timestamp='2005-08-03'
+timestamp='2006-02-23'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -106,7 +106,7 @@
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) &&
exit \$exitcode" 0 ;
trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15
;
: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n
"$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n
"$tmp" && test -d "$tmp" ; } ||
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp)
; } ||
{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating
insecure temp directory" >&2 ; } ||
{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; }
;
@@ -206,6 +206,9 @@
*:ekkoBSD:*:*)
echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
exit ;;
+ *:SolidBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+ exit ;;
macppc:MirBSD:*:*)
echo powerppc-unknown-mirbsd${UNAME_RELEASE}
exit ;;
@@ -764,7 +767,12 @@
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
exit ;;
*:FreeBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e
's/[-(].*//'`
+ case ${UNAME_MACHINE} in
+ pc98)
+ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e
's/[-(].*//'` ;;
+ *)
+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed
-e 's/[-(].*//'` ;;
+ esac
exit ;;
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
@@ -772,6 +780,9 @@
i*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
+ i*:MSYS_NT-*:*:*)
+ echo ${UNAME_MACHINE}-pc-mingw32
+ exit ;;
i*:windows32*:*)
# uname -m includes "-pc" on this system.
echo ${UNAME_MACHINE}-mingw32
@@ -779,8 +790,11 @@
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- x86:Interix*:[34]*)
- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+ x86:Interix*:[345]*)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+ EM64T:Interix*:[345]*)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
@@ -851,7 +865,11 @@
#endif
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+ /^CPU/{
+ s: ::g
+ p
+ }'`"
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
mips64:Linux:*:*)
@@ -870,7 +888,11 @@
#endif
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+ /^CPU/{
+ s: ::g
+ p
+ }'`"
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
or32:Linux:*:*)
@@ -919,6 +941,9 @@
sparc:Linux:*:* | sparc64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
+ vax:Linux:*:*)
+ echo ${UNAME_MACHINE}-dec-linux-gnu
+ exit ;;
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
@@ -964,7 +989,7 @@
LIBC=gnulibc1
# endif
#else
- #ifdef __INTEL_COMPILER
+ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
LIBC=gnu
#else
LIBC=gnuaout
@@ -974,7 +999,11 @@
LIBC=dietlibc
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+ /^LIBC/{
+ s: ::g
+ p
+ }'`"
test x"${LIBC}" != x && {
echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
exit
@@ -1185,7 +1214,6 @@
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
case $UNAME_PROCESSOR in
- *86) UNAME_PROCESSOR=i686 ;;
unknown) UNAME_PROCESSOR=powerpc ;;
esac
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1264,6 +1292,9 @@
i*86:skyos:*:*)
echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/
.*$//'
exit ;;
+ i*86:rdos:*:*)
+ echo ${UNAME_MACHINE}-pc-rdos
+ exit ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
diff -u silc-toolkit-0.9.12/lib/silcsftp/tests/Makefile
silc-toolkit-0.9.12/lib/silcsftp/tests/Makefile
--- silc-toolkit-0.9.12/lib/silcsftp/tests/Makefile
+++ silc-toolkit-0.9.12/lib/silcsftp/tests/Makefile
@@ -92,9 +92,9 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = i386-pc-linux-gnu
-host_triplet = i386-pc-linux-gnu
-target_triplet = i386-pc-linux-gnu
+build_triplet = i486-pc-linux-gnu
+host_triplet = i486-pc-linux-gnu
+target_triplet = i486-pc-linux-gnu
bin_PROGRAMS = sftp_server$(EXEEXT) sftp_client$(EXEEXT)
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/Makefile.defines.in
@@ -133,22 +133,22 @@
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /usr/src/silc-toolkit-0.9.12/missing --run aclocal-1.8
+ACLOCAL = ${SHELL} /home/ancient/jd/tmp/silc-toolkit-0.9.12/missing --run
aclocal-1.8
AMDEP_FALSE = #
AMDEP_TRUE =
-AMTAR = ${SHELL} /usr/src/silc-toolkit-0.9.12/missing --run tar
+AMTAR = ${SHELL} /home/ancient/jd/tmp/silc-toolkit-0.9.12/missing --run tar
AR = ar
-AUTOCONF = ${SHELL} /usr/src/silc-toolkit-0.9.12/missing --run autoconf
-AUTOHEADER = ${SHELL} /usr/src/silc-toolkit-0.9.12/missing --run autoheader
-AUTOMAKE = ${SHELL} /usr/src/silc-toolkit-0.9.12/missing --run automake-1.8
+AUTOCONF = ${SHELL} /home/ancient/jd/tmp/silc-toolkit-0.9.12/missing --run
autoconf
+AUTOHEADER = ${SHELL} /home/ancient/jd/tmp/silc-toolkit-0.9.12/missing --run
autoheader
+AUTOMAKE = ${SHELL} /home/ancient/jd/tmp/silc-toolkit-0.9.12/missing --run
automake-1.8
AWK = gawk
-CC = i386-linux-gcc
+CC = i486-linux-gnu-gcc
CCDEPMODE = depmode=gcc3
CFLAGS = -g -O -Wall -finline-functions -D_REENTRANT
-CPP = i386-linux-gcc -E
+CPP = i486-linux-gnu-gcc -E
CPPFLAGS =
-CXX = i386-linux-g++
-CXXCPP = i386-linux-g++ -E
+CXX = i486-linux-gnu-g++
+CXXCPP = i486-linux-gnu-g++ -E
CXXDEPMODE = depmode=gcc3
CXXFLAGS = -g -O2
CYGPATH_W = echo
@@ -162,7 +162,7 @@
EGREP = grep -E
ETCDIR = /usr/etc
EXEEXT =
-F77 = i386-linux-g77
+F77 = i486-linux-gnu-g77
FFLAGS = -g -O2
FIX_SHA1 = #
HAVE_GETOPT_LONG_FALSE = #
@@ -189,7 +189,7 @@
LN_S = ln -s
LOGSDIR = /usr/logs
LTLIBOBJS =
-MAKEINFO = ${SHELL} /usr/src/silc-toolkit-0.9.12/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/ancient/jd/tmp/silc-toolkit-0.9.12/missing --run
makeinfo
MODULESDIR = ${libdir}/silc/
OBJEXT = o
PACKAGE = silc-toolkit
@@ -202,7 +202,7 @@
PIDFILE = /usr/var/silcd.pid
RANLIB = ranlib
SET_MAKE =
-SHELL = /bin/bash
+SHELL = /bin/sh
SILC_BEOS_FALSE =
SILC_BEOS_TRUE = #
SILC_DIST_CLIENT_FALSE =
@@ -234,7 +234,7 @@
SILC_SIZEOF_VOID_P = 4
SILC_THREADS_FALSE = #
SILC_THREADS_TRUE =
-SILC_TOP_SRCDIR = /usr/src/silc-toolkit-0.9.12
+SILC_TOP_SRCDIR = /home/ancient/jd/tmp/silc-toolkit-0.9.12
SILC_WIN32_FALSE =
SILC_WIN32_TRUE = #
STRIP = strip
@@ -253,21 +253,21 @@
am__leading_dot = .
am__quote =
bindir = ${exec_prefix}/bin
-build = i386-pc-linux-gnu
-build_alias = i386-linux
-build_cpu = i386
+build = i486-pc-linux-gnu
+build_alias = i486-linux-gnu
+build_cpu = i486
build_os = linux-gnu
build_vendor = pc
datadir = ${prefix}/share
exec_prefix = ${prefix}
-host = i386-pc-linux-gnu
-host_alias = i386-linux
-host_cpu = i386
+host = i486-pc-linux-gnu
+host_alias = i486-linux-gnu
+host_cpu = i486
host_os = linux-gnu
host_vendor = pc
includedir = ${prefix}/include/silc/
infodir = ${prefix}/share/info
-install_sh = /usr/src/silc-toolkit-0.9.12/install-sh
+install_sh = /home/ancient/jd/tmp/silc-toolkit-0.9.12/install-sh
libdir = ${prefix}/lib
libexecdir = ${exec_prefix}/libexec
localstatedir = ${prefix}/var
@@ -281,9 +281,9 @@
sharedstatedir = ${prefix}/com
subdirs = lib/silcmath/mpi
sysconfdir = ${prefix}/etc
-target = i386-pc-linux-gnu
+target = i486-pc-linux-gnu
target_alias =
-target_cpu = i386
+target_cpu = i486
target_os = linux-gnu
target_vendor = pc
AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
diff -u silc-toolkit-0.9.12/lib/silcutil/tests/Makefile
silc-toolkit-0.9.12/lib/silcutil/tests/Makefile
--- silc-toolkit-0.9.12/lib/silcutil/tests/Makefile
+++ silc-toolkit-0.9.12/lib/silcutil/tests/Makefile
@@ -91,9 +91,9 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = i386-pc-linux-gnu
-host_triplet = i386-pc-linux-gnu
-target_triplet = i386-pc-linux-gnu
+build_triplet = i486-pc-linux-gnu
+host_triplet = i486-pc-linux-gnu
+target_triplet = i486-pc-linux-gnu
bin_PROGRAMS = test_silcstrutil$(EXEEXT)
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/Makefile.defines.in
@@ -128,22 +128,22 @@
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /usr/src/silc-toolkit-0.9.12/missing --run aclocal-1.8
+ACLOCAL = ${SHELL} /home/ancient/jd/tmp/silc-toolkit-0.9.12/missing --run
aclocal-1.8
AMDEP_FALSE = #
AMDEP_TRUE =
-AMTAR = ${SHELL} /usr/src/silc-toolkit-0.9.12/missing --run tar
+AMTAR = ${SHELL} /home/ancient/jd/tmp/silc-toolkit-0.9.12/missing --run tar
AR = ar
-AUTOCONF = ${SHELL} /usr/src/silc-toolkit-0.9.12/missing --run autoconf
-AUTOHEADER = ${SHELL} /usr/src/silc-toolkit-0.9.12/missing --run autoheader
-AUTOMAKE = ${SHELL} /usr/src/silc-toolkit-0.9.12/missing --run automake-1.8
+AUTOCONF = ${SHELL} /home/ancient/jd/tmp/silc-toolkit-0.9.12/missing --run
autoconf
+AUTOHEADER = ${SHELL} /home/ancient/jd/tmp/silc-toolkit-0.9.12/missing --run
autoheader
+AUTOMAKE = ${SHELL} /home/ancient/jd/tmp/silc-toolkit-0.9.12/missing --run
automake-1.8
AWK = gawk
-CC = i386-linux-gcc
+CC = i486-linux-gnu-gcc
CCDEPMODE = depmode=gcc3
CFLAGS = -g -O -Wall -finline-functions -D_REENTRANT
-CPP = i386-linux-gcc -E
+CPP = i486-linux-gnu-gcc -E
CPPFLAGS =
-CXX = i386-linux-g++
-CXXCPP = i386-linux-g++ -E
+CXX = i486-linux-gnu-g++
+CXXCPP = i486-linux-gnu-g++ -E
CXXDEPMODE = depmode=gcc3
CXXFLAGS = -g -O2
CYGPATH_W = echo
@@ -157,7 +157,7 @@
EGREP = grep -E
ETCDIR = /usr/etc
EXEEXT =
-F77 = i386-linux-g77
+F77 = i486-linux-gnu-g77
FFLAGS = -g -O2
FIX_SHA1 = #
HAVE_GETOPT_LONG_FALSE = #
@@ -184,7 +184,7 @@
LN_S = ln -s
LOGSDIR = /usr/logs
LTLIBOBJS =
-MAKEINFO = ${SHELL} /usr/src/silc-toolkit-0.9.12/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/ancient/jd/tmp/silc-toolkit-0.9.12/missing --run
makeinfo
MODULESDIR = ${libdir}/silc/
OBJEXT = o
PACKAGE = silc-toolkit
@@ -197,7 +197,7 @@
PIDFILE = /usr/var/silcd.pid
RANLIB = ranlib
SET_MAKE =
-SHELL = /bin/bash
+SHELL = /bin/sh
SILC_BEOS_FALSE =
SILC_BEOS_TRUE = #
SILC_DIST_CLIENT_FALSE =
@@ -229,7 +229,7 @@
SILC_SIZEOF_VOID_P = 4
SILC_THREADS_FALSE = #
SILC_THREADS_TRUE =
-SILC_TOP_SRCDIR = /usr/src/silc-toolkit-0.9.12
+SILC_TOP_SRCDIR = /home/ancient/jd/tmp/silc-toolkit-0.9.12
SILC_WIN32_FALSE =
SILC_WIN32_TRUE = #
STRIP = strip
@@ -248,21 +248,21 @@
am__leading_dot = .
am__quote =
bindir = ${exec_prefix}/bin
-build = i386-pc-linux-gnu
-build_alias = i386-linux
-build_cpu = i386
+build = i486-pc-linux-gnu
+build_alias = i486-linux-gnu
+build_cpu = i486
build_os = linux-gnu
build_vendor = pc
datadir = ${prefix}/share
exec_prefix = ${prefix}
-host = i386-pc-linux-gnu
-host_alias = i386-linux
-host_cpu = i386
+host = i486-pc-linux-gnu
+host_alias = i486-linux-gnu
+host_cpu = i486
host_os = linux-gnu
host_vendor = pc
includedir = ${prefix}/include/silc/
infodir = ${prefix}/share/info
-install_sh = /usr/src/silc-toolkit-0.9.12/install-sh
+install_sh = /home/ancient/jd/tmp/silc-toolkit-0.9.12/install-sh
libdir = ${prefix}/lib
libexecdir = ${exec_prefix}/libexec
localstatedir = ${prefix}/var
@@ -276,9 +276,9 @@
sharedstatedir = ${prefix}/com
subdirs = lib/silcmath/mpi
sysconfdir = ${prefix}/etc
-target = i386-pc-linux-gnu
+target = i486-pc-linux-gnu
target_alias =
-target_cpu = i386
+target_cpu = i486
target_os = linux-gnu
target_vendor = pc
AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
diff -u silc-toolkit-0.9.12/lib/silccrypt/tests/Makefile
silc-toolkit-0.9.12/lib/silccrypt/tests/Makefile
--- silc-toolkit-0.9.12/lib/silccrypt/tests/Makefile
+++ silc-toolkit-0.9.12/lib/silccrypt/tests/Makefile
@@ -91,9 +91,9 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = i386-pc-linux-gnu
-host_triplet = i386-pc-linux-gnu
-target_triplet = i386-pc-linux-gnu
+build_triplet = i486-pc-linux-gnu
+host_triplet = i486-pc-linux-gnu
+target_triplet = i486-pc-linux-gnu
bin_PROGRAMS = test_sha1$(EXEEXT) test_md5$(EXEEXT) \
test_hmacsha1$(EXEEXT) test_hmacmd5$(EXEEXT) test_aes$(EXEEXT) \
test_twofish$(EXEEXT) test_silcpkcs$(EXEEXT)
@@ -160,22 +160,22 @@
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /usr/src/silc-toolkit-0.9.12/missing --run aclocal-1.8
+ACLOCAL = ${SHELL} /home/ancient/jd/tmp/silc-toolkit-0.9.12/missing --run
aclocal-1.8
AMDEP_FALSE = #
AMDEP_TRUE =
-AMTAR = ${SHELL} /usr/src/silc-toolkit-0.9.12/missing --run tar
+AMTAR = ${SHELL} /home/ancient/jd/tmp/silc-toolkit-0.9.12/missing --run tar
AR = ar
-AUTOCONF = ${SHELL} /usr/src/silc-toolkit-0.9.12/missing --run autoconf
-AUTOHEADER = ${SHELL} /usr/src/silc-toolkit-0.9.12/missing --run autoheader
-AUTOMAKE = ${SHELL} /usr/src/silc-toolkit-0.9.12/missing --run automake-1.8
+AUTOCONF = ${SHELL} /home/ancient/jd/tmp/silc-toolkit-0.9.12/missing --run
autoconf
+AUTOHEADER = ${SHELL} /home/ancient/jd/tmp/silc-toolkit-0.9.12/missing --run
autoheader
+AUTOMAKE = ${SHELL} /home/ancient/jd/tmp/silc-toolkit-0.9.12/missing --run
automake-1.8
AWK = gawk
-CC = i386-linux-gcc
+CC = i486-linux-gnu-gcc
CCDEPMODE = depmode=gcc3
CFLAGS = -g -O -Wall -finline-functions -D_REENTRANT
-CPP = i386-linux-gcc -E
+CPP = i486-linux-gnu-gcc -E
CPPFLAGS =
-CXX = i386-linux-g++
-CXXCPP = i386-linux-g++ -E
+CXX = i486-linux-gnu-g++
+CXXCPP = i486-linux-gnu-g++ -E
CXXDEPMODE = depmode=gcc3
CXXFLAGS = -g -O2
CYGPATH_W = echo
@@ -189,7 +189,7 @@
EGREP = grep -E
ETCDIR = /usr/etc
EXEEXT =
-F77 = i386-linux-g77
+F77 = i486-linux-gnu-g77
FFLAGS = -g -O2
FIX_SHA1 = #
HAVE_GETOPT_LONG_FALSE = #
@@ -216,7 +216,7 @@
LN_S = ln -s
LOGSDIR = /usr/logs
LTLIBOBJS =
-MAKEINFO = ${SHELL} /usr/src/silc-toolkit-0.9.12/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/ancient/jd/tmp/silc-toolkit-0.9.12/missing --run
makeinfo
MODULESDIR = ${libdir}/silc/
OBJEXT = o
PACKAGE = silc-toolkit
@@ -229,7 +229,7 @@
PIDFILE = /usr/var/silcd.pid
RANLIB = ranlib
SET_MAKE =
-SHELL = /bin/bash
+SHELL = /bin/sh
SILC_BEOS_FALSE =
SILC_BEOS_TRUE = #
SILC_DIST_CLIENT_FALSE =
@@ -261,7 +261,7 @@
SILC_SIZEOF_VOID_P = 4
SILC_THREADS_FALSE = #
SILC_THREADS_TRUE =
-SILC_TOP_SRCDIR = /usr/src/silc-toolkit-0.9.12
+SILC_TOP_SRCDIR = /home/ancient/jd/tmp/silc-toolkit-0.9.12
SILC_WIN32_FALSE =
SILC_WIN32_TRUE = #
STRIP = strip
@@ -280,21 +280,21 @@
am__leading_dot = .
am__quote =
bindir = ${exec_prefix}/bin
-build = i386-pc-linux-gnu
-build_alias = i386-linux
-build_cpu = i386
+build = i486-pc-linux-gnu
+build_alias = i486-linux-gnu
+build_cpu = i486
build_os = linux-gnu
build_vendor = pc
datadir = ${prefix}/share
exec_prefix = ${prefix}
-host = i386-pc-linux-gnu
-host_alias = i386-linux
-host_cpu = i386
+host = i486-pc-linux-gnu
+host_alias = i486-linux-gnu
+host_cpu = i486
host_os = linux-gnu
host_vendor = pc
includedir = ${prefix}/include/silc/
infodir = ${prefix}/share/info
-install_sh = /usr/src/silc-toolkit-0.9.12/install-sh
+install_sh = /home/ancient/jd/tmp/silc-toolkit-0.9.12/install-sh
libdir = ${prefix}/lib
libexecdir = ${exec_prefix}/libexec
localstatedir = ${prefix}/var
@@ -308,9 +308,9 @@
sharedstatedir = ${prefix}/com
subdirs = lib/silcmath/mpi
sysconfdir = ${prefix}/etc
-target = i386-pc-linux-gnu
+target = i486-pc-linux-gnu
target_alias =
-target_cpu = i386
+target_cpu = i486
target_os = linux-gnu
target_vendor = pc
AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
diff -u silc-toolkit-0.9.12/lib/silccore/tests/Makefile
silc-toolkit-0.9.12/lib/silccore/tests/Makefile
--- silc-toolkit-0.9.12/lib/silccore/tests/Makefile
+++ silc-toolkit-0.9.12/lib/silccore/tests/Makefile
@@ -91,9 +91,9 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = i386-pc-linux-gnu
-host_triplet = i386-pc-linux-gnu
-target_triplet = i386-pc-linux-gnu
+build_triplet = i486-pc-linux-gnu
+host_triplet = i486-pc-linux-gnu
+target_triplet = i486-pc-linux-gnu
bin_PROGRAMS = test_silcargument$(EXEEXT)
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/Makefile.defines.in
@@ -128,22 +128,22 @@
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /usr/src/silc-toolkit-0.9.12/missing --run aclocal-1.8
+ACLOCAL = ${SHELL} /home/ancient/jd/tmp/silc-toolkit-0.9.12/missing --run
aclocal-1.8
AMDEP_FALSE = #
AMDEP_TRUE =
-AMTAR = ${SHELL} /usr/src/silc-toolkit-0.9.12/missing --run tar
+AMTAR = ${SHELL} /home/ancient/jd/tmp/silc-toolkit-0.9.12/missing --run tar
AR = ar
-AUTOCONF = ${SHELL} /usr/src/silc-toolkit-0.9.12/missing --run autoconf
-AUTOHEADER = ${SHELL} /usr/src/silc-toolkit-0.9.12/missing --run autoheader
-AUTOMAKE = ${SHELL} /usr/src/silc-toolkit-0.9.12/missing --run automake-1.8
+AUTOCONF = ${SHELL} /home/ancient/jd/tmp/silc-toolkit-0.9.12/missing --run
autoconf
+AUTOHEADER = ${SHELL} /home/ancient/jd/tmp/silc-toolkit-0.9.12/missing --run
autoheader
+AUTOMAKE = ${SHELL} /home/ancient/jd/tmp/silc-toolkit-0.9.12/missing --run
automake-1.8
AWK = gawk
-CC = i386-linux-gcc
+CC = i486-linux-gnu-gcc
CCDEPMODE = depmode=gcc3
CFLAGS = -g -O -Wall -finline-functions -D_REENTRANT
-CPP = i386-linux-gcc -E
+CPP = i486-linux-gnu-gcc -E
CPPFLAGS =
-CXX = i386-linux-g++
-CXXCPP = i386-linux-g++ -E
+CXX = i486-linux-gnu-g++
+CXXCPP = i486-linux-gnu-g++ -E
CXXDEPMODE = depmode=gcc3
CXXFLAGS = -g -O2
CYGPATH_W = echo
@@ -157,7 +157,7 @@
EGREP = grep -E
ETCDIR = /usr/etc
EXEEXT =
-F77 = i386-linux-g77
+F77 = i486-linux-gnu-g77
FFLAGS = -g -O2
FIX_SHA1 = #
HAVE_GETOPT_LONG_FALSE = #
@@ -184,7 +184,7 @@
LN_S = ln -s
LOGSDIR = /usr/logs
LTLIBOBJS =
-MAKEINFO = ${SHELL} /usr/src/silc-toolkit-0.9.12/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/ancient/jd/tmp/silc-toolkit-0.9.12/missing --run
makeinfo
MODULESDIR = ${libdir}/silc/
OBJEXT = o
PACKAGE = silc-toolkit
@@ -197,7 +197,7 @@
PIDFILE = /usr/var/silcd.pid
RANLIB = ranlib
SET_MAKE =
-SHELL = /bin/bash
+SHELL = /bin/sh
SILC_BEOS_FALSE =
SILC_BEOS_TRUE = #
SILC_DIST_CLIENT_FALSE =
@@ -229,7 +229,7 @@
SILC_SIZEOF_VOID_P = 4
SILC_THREADS_FALSE = #
SILC_THREADS_TRUE =
-SILC_TOP_SRCDIR = /usr/src/silc-toolkit-0.9.12
+SILC_TOP_SRCDIR = /home/ancient/jd/tmp/silc-toolkit-0.9.12
SILC_WIN32_FALSE =
SILC_WIN32_TRUE = #
STRIP = strip
@@ -248,21 +248,21 @@
am__leading_dot = .
am__quote =
bindir = ${exec_prefix}/bin
-build = i386-pc-linux-gnu
-build_alias = i386-linux
-build_cpu = i386
+build = i486-pc-linux-gnu
+build_alias = i486-linux-gnu
+build_cpu = i486
build_os = linux-gnu
build_vendor = pc
datadir = ${prefix}/share
exec_prefix = ${prefix}
-host = i386-pc-linux-gnu
-host_alias = i386-linux
-host_cpu = i386
+host = i486-pc-linux-gnu
+host_alias = i486-linux-gnu
+host_cpu = i486
host_os = linux-gnu
host_vendor = pc
includedir = ${prefix}/include/silc/
infodir = ${prefix}/share/info
-install_sh = /usr/src/silc-toolkit-0.9.12/install-sh
+install_sh = /home/ancient/jd/tmp/silc-toolkit-0.9.12/install-sh
libdir = ${prefix}/lib
libexecdir = ${exec_prefix}/libexec
localstatedir = ${prefix}/var
@@ -276,9 +276,9 @@
sharedstatedir = ${prefix}/com
subdirs = lib/silcmath/mpi
sysconfdir = ${prefix}/etc
-target = i386-pc-linux-gnu
+target = i486-pc-linux-gnu
target_alias =
-target_cpu = i386
+target_cpu = i486
target_os = linux-gnu
target_vendor = pc
AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
only in patch2:
unchanged:
--- silc-toolkit-0.9.12.orig/debian/libsilc-1.0-2.install
+++ silc-toolkit-0.9.12/debian/libsilc-1.0-2.install
@@ -0,0 +1,2 @@
+usr/lib/*.so*
+usr/lib/silc/*.so*
only in patch2:
unchanged:
--- silc-toolkit-0.9.12.orig/debian/libsilc-1.0-2-dev.install
+++ silc-toolkit-0.9.12/debian/libsilc-1.0-2-dev.install
@@ -0,0 +1,5 @@
+usr/include/silc/*.h
+usr/lib/*.a
+usr/lib/*.la
+usr/lib/pkgconfig/*.pc
+usr/share/doc/libsilc-dev/toolkit
signature.asc
Description: Digital signature
