r2149 - in glibc-package/trunk/debian: . control.in sysdeps
Author: aurel32
Date: 2007-04-30 08:04:58 +0000 (Mon, 30 Apr 2007)
New Revision: 2149
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control
glibc-package/trunk/debian/control.in/main
glibc-package/trunk/debian/sysdeps/depflags.pl
Log:
keep linux-kernel-headers as an alternative for hppa
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2007-04-30 07:58:26 UTC (rev 2148)
+++ glibc-package/trunk/debian/changelog 2007-04-30 08:04:58 UTC (rev 2149)
@@ -29,7 +29,7 @@
init script.
* debian/control.in/main: build depends on binutils (>= 2.17cvs20070426-1).
Closes: #405738.
- * debian/shlibver: bump shlib to 2.5-5 for the transition to
+ * debian/shlibver: bump shlib to 2.5-5 for the transition to
hash-style=gnu.
[ Michael Banck ]
@@ -50,9 +50,9 @@
+ patches/any/local-disable-nscd-host-caching.diff: update nscd.conf.
[ Clint Adams ]
- * Switch from linux-kernel-headers to linux-libc-dev.
+ * Switch from linux-kernel-headers to linux-libc-dev | linux-kernel-headers.
- -- Aurelien Jarno <aurel32@debian.org> Mon, 30 Apr 2007 00:33:39 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Mon, 30 Apr 2007 10:03:51 +0200
glibc (2.5-4) unstable; urgency=low
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2007-04-30 07:58:26 UTC (rev 2148)
+++ glibc-package/trunk/debian/control 2007-04-30 08:04:58 UTC (rev 2149)
@@ -2,7 +2,7 @@
Section: libs
Priority: required
Build-Depends: gettext, make (>= 3.80-1), dpkg-dev (>= 1.13.5), bzip2, lzma, file,
- linux-libc-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
+ linux-libc-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !hppa], linux-kernel-headers [hppa],
mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev [hurd-i386],
kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64],
gcc-4.0 [hurd-i386], gcc-4.1 (>= 4.1.2-5) [!hurd-i386], binutils (>= 2.17cvs20070426-1),
Modified: glibc-package/trunk/debian/control.in/main
===================================================================
--- glibc-package/trunk/debian/control.in/main 2007-04-30 07:58:26 UTC (rev 2148)
+++ glibc-package/trunk/debian/control.in/main 2007-04-30 08:04:58 UTC (rev 2149)
@@ -2,7 +2,7 @@
Section: libs
Priority: required
Build-Depends: gettext, make (>= 3.80-1), dpkg-dev (>= 1.13.5), bzip2, lzma, file,
- linux-libc-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
+ linux-libc-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !hppa], linux-kernel-headers [hppa],
mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev [hurd-i386],
kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64],
gcc-4.0 [hurd-i386], gcc-4.1 (>= 4.1.2-5) [!hurd-i386], binutils (>= 2.17cvs20070426-1),
Modified: glibc-package/trunk/debian/sysdeps/depflags.pl
===================================================================
--- glibc-package/trunk/debian/sysdeps/depflags.pl 2007-04-30 07:58:26 UTC (rev 2148)
+++ glibc-package/trunk/debian/sysdeps/depflags.pl 2007-04-30 08:04:58 UTC (rev 2149)
@@ -31,7 +31,7 @@
push @{$libc_dev_c{'Recommends'}}, 'c-compiler';
push @{$libc_dev_c{'Replaces'}}, ('man-db (<= 2.3.10-41)', 'gettext (<= 0.10.26-1)',
'ppp (<= 2.2.0f-24)', 'libgdbmg1-dev (<= 1.7.3-24)');
- push @{$libc_dev_c{'Depends'}}, 'linux-libc-dev';
+ push @{$libc_dev_c{'Depends'}}, 'linux-libc-dev | linux-kernel-headers';
}
if ($DEB_HOST_GNU_SYSTEM eq "kfreebsd-gnu") {
push @{$libc_c{'Suggests'}}, 'locales';
Reply to: