r2236 - in glibc-package/trunk/debian: . sysdeps

[schizo@alioth.debian.org]

Author: schizo
Date: 2007-05-19 21:09:24 +0000 (Sat, 19 May 2007)
New Revision: 2236

Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/sysdeps/depflags.pl
Log:
retain Depends alternative on linux-kernel-headers for now, to avoid
being blocked for testing


Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog	2007-05-19 20:58:33 UTC (rev 2235)
+++ glibc-package/trunk/debian/changelog	2007-05-19 21:09:24 UTC (rev 2236)
@@ -10,8 +10,8 @@
   * debian/debhelper.in/libc.install: do not hardcode the glibc
     version number in the path to gai.conf.
   * debian/control.in/main, debian/sysdeps/depflags.pl:
-    use linux-libc-dev on all linux architectures, and
-    remove all references to linux-kernel-headers.
+    use linux-libc-dev to build on all linux architectures.
+    (retain Depends alternative on linux-kernel-headers)
 
   [ Aurelien Jarno ]
   * debian/local/etc_init.d/glibc.sh: fix a typo.  Closes: #423870. 

Modified: glibc-package/trunk/debian/sysdeps/depflags.pl
===================================================================
--- glibc-package/trunk/debian/sysdeps/depflags.pl	2007-05-19 20:58:33 UTC (rev 2235)
+++ glibc-package/trunk/debian/sysdeps/depflags.pl	2007-05-19 21:09:24 UTC (rev 2236)
@@ -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';