[kernel] r11326 - in dists/etch/linux-2.6.24/debian: . bin templates

[Dann Frazier]

Author: dannf
Date: Wed May  7 22:59:28 2008
New Revision: 11326

Log:
drop linux-libc-dev for etch

Removed:
   dists/etch/linux-2.6.24/debian/templates/control.libc-dev.in
Modified:
   dists/etch/linux-2.6.24/debian/bin/gencontrol.py
   dists/etch/linux-2.6.24/debian/changelog
   dists/etch/linux-2.6.24/debian/rules.real

Modified: dists/etch/linux-2.6.24/debian/bin/gencontrol.py
==============================================================================
--- dists/etch/linux-2.6.24/debian/bin/gencontrol.py	(original)
+++ dists/etch/linux-2.6.24/debian/bin/gencontrol.py	Wed May  7 22:59:28 2008
@@ -29,16 +29,11 @@
     def do_arch_setup(self, vars, makeflags, arch, extra):
         config_base = self.config.merge('base', arch)
         vars.update(self.config.merge('image', arch))
-        config_libc_dev = self.config.merge('libc-dev', arch)
-        makeflags['LIBC_DEV_ARCH'] = config_libc_dev.get('arch', config_base.get('kernel-arch'))
 
     def do_arch_packages(self, packages, makefile, arch, vars, makeflags, extra):
         headers_arch = self.templates["control.headers.arch"]
         packages_headers_arch = self.process_packages(headers_arch, vars)
 
-        libc_dev = self.templates["control.libc-dev"]
-        packages_headers_arch[0:0] = self.process_packages(libc_dev, {})
-        
         extra['headers_arch_depends'] = packages_headers_arch[-1]['Depends'] = PackageRelation()
 
         for package in packages_headers_arch:

Modified: dists/etch/linux-2.6.24/debian/changelog
==============================================================================
--- dists/etch/linux-2.6.24/debian/changelog	(original)
+++ dists/etch/linux-2.6.24/debian/changelog	Wed May  7 22:59:28 2008
@@ -1,4 +1,4 @@
-linux-2.6.24 (2.6.24-6~etchnhalf.2) UNRELEASED; urgency=low
+linux-2.6.24 (2.6.24-6~etchnhalf.2) stable; urgency=low
 
   * Add pci ids for the ICH10 southbridge
   * Add stable release 2.6.24.6:
@@ -16,8 +16,9 @@
     - Fix dnotify/close race (CVE-2008-1375)
   * Add stable release 2.6.24.7:
     - fix SMP ordering hole in fcntl_setlk() (CVE-2008-1669)
+  * Drop linux-libc-dev package for etch
 
- -- dann frazier <dannf at debian.org>  Wed, 07 May 2008 15:16:24 -0600
+ -- dann frazier <dannf at debian.org>  Wed, 07 May 2008 16:26:32 -0600
 
 linux-2.6.24 (2.6.24-6~etchnhalf.1) stable; urgency=low
 

Modified: dists/etch/linux-2.6.24/debian/rules.real
==============================================================================
--- dists/etch/linux-2.6.24/debian/rules.real	(original)
+++ dists/etch/linux-2.6.24/debian/rules.real	Wed May  7 22:59:28 2008
@@ -43,7 +43,6 @@
 # Targets
 #
 binary-arch-arch: install-headers_$(ARCH)
-binary-arch-arch: install-libc-dev_$(ARCH)
 binary-arch-featureset: install-headers_$(ARCH)_$(FEATURESET)
 binary-arch-flavour: install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE)
 ifeq ($(MODULES),True)
@@ -323,23 +322,6 @@
 
 	$(MAKE_SELF) install-base
 
-install-libc-dev_$(ARCH): PACKAGE_NAME = linux-libc-dev
-install-libc-dev_$(ARCH): DH_OPTIONS = -p$(PACKAGE_NAME)
-install-libc-dev_$(ARCH): SOURCE_DIR = $(BUILD_DIR)/source
-install-libc-dev_$(ARCH): DIR = $(BUILD_DIR)/build-libc-dev
-install-libc-dev_$(ARCH): OUT_DIR = debian/$(PACKAGE_NAME)/usr
-install-libc-dev_$(ARCH):
-	dh_testdir
-	dh_testroot
-	dh_clean -d -k
-	rm -rf '$(DIR)'
-	mkdir $(DIR)
-	$(MAKE_CLEAN) -C $(SOURCE_DIR) O='$(CURDIR)/$(DIR)' headers_check ARCH=$(LIBC_DEV_ARCH)
-	$(MAKE_CLEAN) -C $(SOURCE_DIR) O='$(CURDIR)/$(DIR)' headers_install ARCH=$(LIBC_DEV_ARCH) INSTALL_HDR_PATH='$(CURDIR)'/$(OUT_DIR)
-	# XXX: Needs to be removed from libc6-dev
-	rm -rf $(OUT_DIR)/include/scsi
-	$(MAKE_SELF) install-base
-
 install-support: PACKAGE_NAME = linux-support-$(UPSTREAMVERSION)$(ABINAME)
 install-support: DH_OPTIONS = -p$(PACKAGE_NAME)
 install-support: PACKAGE_DIR = debian/$(PACKAGE_NAME)