r1249 - in glibc-package/trunk/debian: . control.in rules.d
Author: aurel32
Date: 2006-02-28 11:24:02 +0000 (Tue, 28 Feb 2006)
New Revision: 1249
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control.in/main
glibc-package/trunk/debian/rules.d/build.mk
Log:
* Fix the build-dependencies for kfreebsd-amd64.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-02-28 03:33:23 UTC (rev 1248)
+++ glibc-package/trunk/debian/changelog 2006-02-28 11:24:02 UTC (rev 1249)
@@ -11,6 +11,7 @@
* Only create the multiarch directories and the symlinks in /lib/ldconfig
for the main pass. Otherwise alternate libraries would conflict with the
main one when using multiarch.
+ * Fix the build-dependencies for kfreebsd-amd64.
[ Clint Adams ]
* Get rid of -o as a binary operator to [ in tzconfig and postinst.
Modified: glibc-package/trunk/debian/control.in/main
===================================================================
--- glibc-package/trunk/debian/control.in/main 2006-02-28 03:33:23 UTC (rev 1248)
+++ glibc-package/trunk/debian/control.in/main 2006-02-28 11:24:02 UTC (rev 1249)
@@ -3,9 +3,9 @@
Priority: required
Build-Depends: gettext, make (>= 3.80-1), dpkg-dev (>= 1.13.5), bzip2,
texinfo, texi2html, file,
- linux-kernel-headers (>= 2.6.13+0rc3-2) [!hurd-i386 !kfreebsd-i386],
+ linux-kernel-headers (>= 2.6.13+0rc3-2) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev [hurd-i386],
- kfreebsd-kernel-headers [kfreebsd-i386],
+ kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64],
gcc-4.0 [!m68k], gcc-3.4 [m68k], binutils (>= 2.16.1cvs20051109-1),
autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 4.1.76),
libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-i386 [amd64] | ia32-libs-dev (<= 1.5) [amd64], libc6-dev-powerpc [ppc64],
Modified: glibc-package/trunk/debian/rules.d/build.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/build.mk 2006-02-28 03:33:23 UTC (rev 1248)
+++ glibc-package/trunk/debian/rules.d/build.mk 2006-02-28 11:24:02 UTC (rev 1249)
@@ -131,7 +131,7 @@
os=`sed '/^ *config-os *=/!d;s/.*= *//g' $(DEB_BUILDDIR)/config.make`; \
mkdir -p debian/tmp-$(curpass)/lib/$$machine-$$os debian/tmp-$(curpass)/usr/lib/$$machine-$$os; \
ln -s /lib/$$machine-$$os debian/tmp-$(curpass)/lib/ldconfig/$$machine-$$os-lib; \
- ln -s /usr/lib/$$machine-$$os debian/tmp-$(curpass)/lib/ldconfig/$$machine-$$os-usr-lib
+ ln -s /usr/lib/$$machine-$$os debian/tmp-$(curpass)/lib/ldconfig/$$machine-$$os-usr-lib; \
fi
$(call xx,extra_install)
Reply to: