r3745 - in glibc-package/trunk/debian: . control.in
Author: aurel32
Date: 2009-08-09 19:13:31 +0000 (Sun, 09 Aug 2009)
New Revision: 3745
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control
glibc-package/trunk/debian/control.in/libc
Log:
* Recommends libc6-i686 on amd64 and libc0.1-i686 on kfreebsd-amd64
(Closes: bug#455603).
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-08-09 19:11:13 UTC (rev 3744)
+++ glibc-package/trunk/debian/changelog 2009-08-09 19:13:31 UTC (rev 3745)
@@ -4,11 +4,13 @@
* Remove any/cvs-pthread_mutex_lock.diff following upstream decision.
* Replace debian/sysdeps/depflags.{mk,pl} by entries in debian/control
using the "new" dpkg-dev features. Clean-out some very old entries.
+ * Recommends libc6-i686 on amd64 and libc0.1-i686 on kfreebsd-amd64
+ (Closes: bug#455603).
[ Petr Salinger ]
* kfreebsd/local-sysdeps.diff: update to revision 2696 (from glibc-bsd).
- -- Aurelien Jarno <aurel32@debian.org> Thu, 30 Jul 2009 22:59:32 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Sun, 09 Aug 2009 21:12:43 +0200
eglibc (2.9-23) unstable; urgency=low
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2009-08-09 19:11:13 UTC (rev 3744)
+++ glibc-package/trunk/debian/control 2009-08-09 19:13:31 UTC (rev 3745)
@@ -79,8 +79,12 @@
Architecture: amd64 arm armeb armel i386 m32r m68k mips mipsel powerpc ppc64 sparc s390 hppa sh3 sh4 sh3eb sh4eb
Section: libs
Priority: required
+Depends: hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
+Recommends: libc6-i686 [amd64], libc0.1-i686 [kfreebsd-amd64]
+Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}
-Suggests: debconf | debconf-2.0
+Conflicts: tzdata-etch, tzdata (<< 2007k-1)
+Breaks: nscd (<< 2.9)
Description: GNU C Library: Shared libraries
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C library
@@ -90,8 +94,11 @@
Architecture: amd64 arm armeb armel i386 m32r m68k mips mipsel powerpc ppc64 sparc s390 hppa sh3 sh4 sh3eb sh4eb
Section: libdevel
Priority: optional
-Depends: libc6 (= ${binary:Version})
+Depends: libc6 (= ${binary:Version}), linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386], libpthread-stubs0-dev [hurd-i386]
Recommends: gcc | c-compiler
+Suggests: glibc-doc, manpages-dev
+Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386 kfreebsd-amd64]
+Conflicts: binutils (<< 2.17cvs20070426-1)
Description: GNU C Library: Development Libraries and Header Files
Contains the symlinks, headers, and object files needed to compile
and link programs which use the standard C library.
@@ -147,8 +154,12 @@
Architecture: alpha ia64
Section: libs
Priority: required
+Depends: hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
+Recommends: libc6-i686 [amd64], libc0.1-i686 [kfreebsd-amd64]
+Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}
-Suggests: debconf | debconf-2.0
+Conflicts: tzdata-etch, tzdata (<< 2007k-1)
+Breaks: nscd (<< 2.9)
Description: GNU C Library: Shared libraries
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C library
@@ -158,8 +169,11 @@
Architecture: alpha ia64
Section: libdevel
Priority: optional
-Depends: libc6.1 (= ${binary:Version})
+Depends: libc6.1 (= ${binary:Version}), linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386], libpthread-stubs0-dev [hurd-i386]
Recommends: gcc | c-compiler
+Suggests: glibc-doc, manpages-dev
+Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386 kfreebsd-amd64]
+Conflicts: binutils (<< 2.17cvs20070426-1)
Description: GNU C Library: Development Libraries and Header Files
Contains the symlinks, headers, and object files needed to compile
and link programs which use the standard C library.
@@ -215,8 +229,12 @@
Architecture: hurd-i386
Section: libs
Priority: required
+Depends: hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
+Recommends: libc6-i686 [amd64], libc0.1-i686 [kfreebsd-amd64]
+Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}
-Suggests: debconf | debconf-2.0
+Conflicts: tzdata-etch, tzdata (<< 2007k-1)
+Breaks: nscd (<< 2.9)
Description: GNU C Library: Shared libraries
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C library
@@ -226,8 +244,11 @@
Architecture: hurd-i386
Section: libdevel
Priority: optional
-Depends: libc0.3 (= ${binary:Version})
+Depends: libc0.3 (= ${binary:Version}), linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386], libpthread-stubs0-dev [hurd-i386]
Recommends: gcc | c-compiler
+Suggests: glibc-doc, manpages-dev
+Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386 kfreebsd-amd64]
+Conflicts: binutils (<< 2.17cvs20070426-1)
Description: GNU C Library: Development Libraries and Header Files
Contains the symlinks, headers, and object files needed to compile
and link programs which use the standard C library.
@@ -283,8 +304,12 @@
Architecture: kfreebsd-i386 kfreebsd-amd64
Section: libs
Priority: required
+Depends: hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
+Recommends: libc6-i686 [amd64], libc0.1-i686 [kfreebsd-amd64]
+Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}
-Suggests: debconf | debconf-2.0
+Conflicts: tzdata-etch, tzdata (<< 2007k-1)
+Breaks: nscd (<< 2.9)
Description: GNU C Library: Shared libraries
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C library
@@ -294,8 +319,11 @@
Architecture: kfreebsd-i386 kfreebsd-amd64
Section: libdevel
Priority: optional
-Depends: libc0.1 (= ${binary:Version})
+Depends: libc0.1 (= ${binary:Version}), linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386], libpthread-stubs0-dev [hurd-i386]
Recommends: gcc | c-compiler
+Suggests: glibc-doc, manpages-dev
+Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386 kfreebsd-amd64]
+Conflicts: binutils (<< 2.17cvs20070426-1)
Description: GNU C Library: Development Libraries and Header Files
Contains the symlinks, headers, and object files needed to compile
and link programs which use the standard C library.
Modified: glibc-package/trunk/debian/control.in/libc
===================================================================
--- glibc-package/trunk/debian/control.in/libc 2009-08-09 19:11:13 UTC (rev 3744)
+++ glibc-package/trunk/debian/control.in/libc 2009-08-09 19:13:31 UTC (rev 3745)
@@ -3,6 +3,7 @@
Section: libs
Priority: required
Depends: hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
+Recommends: libc6-i686 [amd64], libc0.1-i686 [kfreebsd-amd64]
Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}
Conflicts: tzdata-etch, tzdata (<< 2007k-1)
Reply to: