Author: aurel32 Date: 2006-02-23 17:06:15 +0000 (Thu, 23 Feb 2006) New Revision: 1229
Modified: glibc-package/trunk/debian/control glibc-package/trunk/debian/control.in/main glibc-package/trunk/debian/patches/resource_h.diff Log: Fixes that I forget to put back in the SVN from my local tree - regenerate control - small fix to resource_h.diff Modified: glibc-package/trunk/debian/control =================================================================== --- glibc-package/trunk/debian/control 2006-02-23 16:50:25 UTC (rev 1228) +++ glibc-package/trunk/debian/control 2006-02-23 17:06:15 UTC (rev 1229) @@ -8,7 +8,7 @@ kfreebsd-kernel-headers [kfreebsd-i386], 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-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-i386 [amd64] | ia32-libs-dev (<= 1.5) [amd64], quilt Build-Depends-Indep: perl, po-debconf Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org> @@ -343,6 +343,28 @@ This package contains a minimal set of libraries needed for the Debian installer. Do not install it on a normal system. +Package: libc6-i386 +Architecture: amd64 +Section: libs +Priority: standard +Depends: libc6 (= ${Source-Version}) +Conflicts: ia32-libs (<= 1.5) +Description: GNU C Library: 32bit shared libraries for AMD64 + This package includes shared versions of the standard C + library and the standard math library, as well as many others. + This is the 32bit version of the library, meant for AMD64 systems. + +Package: libc6-dev-i386 +Architecture: amd64 +Section: libdevel +Priority: optional +Provides: lib32c-dev +Depends: libc6-i386 (= ${Source-Version}), libc6-dev (= ${Source-Version}), lib32gcc1 +Description: GNU C Library: 32bit development libraries for AMD64 + Contains the symlinks and object files needed to compile and link programs + which use the standard C library. This is the 32bit version of the + library, meant for AMD64 systems. + Package: libc6-sparc64 Architecture: sparc Section: libs Modified: glibc-package/trunk/debian/control.in/main =================================================================== --- glibc-package/trunk/debian/control.in/main 2006-02-23 16:50:25 UTC (rev 1228) +++ glibc-package/trunk/debian/control.in/main 2006-02-23 17:06:15 UTC (rev 1229) @@ -8,7 +8,7 @@ kfreebsd-kernel-headers [kfreebsd-i386], 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 [amd64] (<= 1.5), + libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-i386 [amd64] | ia32-libs-dev (<= 1.5) [amd64], quilt Build-Depends-Indep: perl, po-debconf Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org> Modified: glibc-package/trunk/debian/patches/resource_h.diff =================================================================== --- glibc-package/trunk/debian/patches/resource_h.diff 2006-02-23 16:50:25 UTC (rev 1228) +++ glibc-package/trunk/debian/patches/resource_h.diff 2006-02-23 17:06:15 UTC (rev 1229) @@ -111,12 +111,12 @@ #define RLIMIT_NLIMITS __RLIMIT_NLIMITS #define RLIM_NLIMITS __RLIM_NLIMITS =================================================================== -RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/mips/bits/Attic/resource.h,v +RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/mips/bits/resource.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 ---- libc/sysdeps/unix/sysv/linux/mips/bits/Attic/resource.h 2004/08/16 08:51:46 1.7 -+++ libc/sysdeps/unix/sysv/linux/mips/bits/Attic/resource.h 2005/06/20 15:07:34 1.8 +--- libc/sysdeps/unix/sysv/linux/mips/bits/resource.h 2004/08/16 08:51:46 1.7 ++++ libc/sysdeps/unix/sysv/linux/mips/bits/resource.h 2005/06/20 15:07:34 1.8 @@ -1,5 +1,5 @@ /* Bit values & structures for resource limits. Linux/MIPS version. - Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2004 -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]