r2233 - in glibc-package/trunk/debian: . control.in sysdeps

[schizo@alioth.debian.org]

Author: schizo
Date: 2007-05-19 20:46:06 +0000 (Sat, 19 May 2007)
New Revision: 2233

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:
  * debian/control.in/main, debian/sysdeps/depflags.pl:
    use linux-libc-dev on all linux architectures, and
    remove all references to linux-kernel-headers.


Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog	2007-05-19 20:27:14 UTC (rev 2232)
+++ glibc-package/trunk/debian/changelog	2007-05-19 20:46:06 UTC (rev 2233)
@@ -9,6 +9,9 @@
     that do not exist in sarge or later.
   * 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.
 
   [ Aurelien Jarno ]
   * debian/local/etc_init.d/glibc.sh: fix a typo.  Closes: #423870. 

Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control	2007-05-19 20:27:14 UTC (rev 2232)
+++ glibc-package/trunk/debian/control	2007-05-19 20:46:06 UTC (rev 2233)
@@ -3,7 +3,7 @@
 Priority: required
 Build-Depends: gettext, make (>= 3.80-1), dpkg-dev (>= 1.13.5), bzip2, lzma, file, quilt,
  autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 5.0),
- linux-libc-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !hppa], linux-kernel-headers [hppa],
+ linux-libc-dev [!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-amd64],
  binutils (>= 2.17cvs20070426-1),

Modified: glibc-package/trunk/debian/control.in/main
===================================================================
--- glibc-package/trunk/debian/control.in/main	2007-05-19 20:27:14 UTC (rev 2232)
+++ glibc-package/trunk/debian/control.in/main	2007-05-19 20:46:06 UTC (rev 2233)
@@ -3,7 +3,7 @@
 Priority: required
 Build-Depends: gettext, make (>= 3.80-1), dpkg-dev (>= 1.13.5), bzip2, lzma, file, quilt,
  autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 5.0),
- linux-libc-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !hppa], linux-kernel-headers [hppa],
+ linux-libc-dev [!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-amd64],
  binutils (>= 2.17cvs20070426-1),

Modified: glibc-package/trunk/debian/sysdeps/depflags.pl
===================================================================
--- glibc-package/trunk/debian/sysdeps/depflags.pl	2007-05-19 20:27:14 UTC (rev 2232)
+++ glibc-package/trunk/debian/sysdeps/depflags.pl	2007-05-19 20:46:06 UTC (rev 2233)
@@ -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 | linux-kernel-headers';
+    push @{$libc_dev_c{'Depends'}}, 'linux-libc-dev';
 }
 if ($DEB_HOST_GNU_SYSTEM eq "kfreebsd-gnu") {
     push @{$libc_c{'Suggests'}}, 'locales';