[kernel] r14736 - in dists/trunk/linux-2.6/debian: . bin templates

[Bastian Blank]

Author: waldi
Date: Fri Dec  4 19:16:08 2009
New Revision: 14736

Log:
Drop linux-tree package.

* debian/changelog: Update.
* debian/bin/gencontrol.py, debian/rules.real:
  Remove support for linux-tree package.
* debian/templates/control.tree.in: Remove.

Deleted:
   dists/trunk/linux-2.6/debian/templates/control.tree.in
Modified:
   dists/trunk/linux-2.6/debian/bin/gencontrol.py
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/rules.real

Modified: dists/trunk/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/gencontrol.py	Fri Dec  4 19:11:08 2009	(r14735)
+++ dists/trunk/linux-2.6/debian/bin/gencontrol.py	Fri Dec  4 19:16:08 2009	(r14736)
@@ -26,7 +26,6 @@
 
     def do_main_packages(self, packages, vars, makeflags, extra):
         packages.extend(self.process_packages(self.templates["control.main"], self.vars))
-        packages.append(self.process_real_tree(self.templates["control.tree"][0], self.vars))
 
     def do_arch_setup(self, vars, makeflags, arch, extra):
         config_base = self.config.merge('base', arch)
@@ -319,19 +318,6 @@
                 entry[key] = value
         return entry
 
-    def process_real_tree(self, entry, vars):
-        entry = self.process_package(entry, vars)
-        version = self.changelog[0].version
-
-        value = entry.setdefault('Depends', PackageRelation())
-        value.append("linux-patch-debian-%s (= %s)" % (version.linux_version, version.complete))
-        value.append(PackageRelationGroup(["linux-source-%s (= %s)" % (v.linux_version, v.complete) for v in self.versions]))
-
-        value = entry.setdefault('Provides', PackageRelation())
-        value.extend(["linux-tree-%s" % v.complete.replace('~', '-') for v in self.versions])
-
-        return entry
-
     def write(self, packages, makefile):
         self.write_config()
         super(Gencontrol, self).write(packages, makefile)

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Fri Dec  4 19:11:08 2009	(r14735)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Dec  4 19:16:08 2009	(r14736)
@@ -22,6 +22,7 @@
   * [amd64, powerpc, sparc] Build USB support as module.
   * [amd64] Build AGP support as module.
   * Always enable dummy net driver support.
+  * Drop linux-tree package, it have no users left.
   
   [ Ben Hutchings ]
   * Re-enable accidentally omitted drivers, thanks to Uwe Kleine-König

Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real	Fri Dec  4 19:11:08 2009	(r14735)
+++ dists/trunk/linux-2.6/debian/rules.real	Fri Dec  4 19:16:08 2009	(r14736)
@@ -50,7 +50,6 @@
 binary-indep: install-patch
 binary-indep: install-source
 binary-indep: install-support
-binary-indep: install-tree
 binary-indep: install-firmware
 
 build: $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE)
@@ -178,12 +177,6 @@
 	find $(DIR)/Documentation/DocBook/man/ -name '*.9' | xargs dh_installman
 	+$(MAKE_SELF) install-base
 
-install-dummy:
-	dh_testdir
-	dh_testroot
-	dh_prep
-	+$(MAKE_SELF) install-base
-
 install-headers_$(ARCH): PACKAGE_NAMES = linux-headers-$(UPSTREAMVERSION)$(ABINAME)-all linux-headers-$(UPSTREAMVERSION)$(ABINAME)-all-$(ARCH)
 install-headers_$(ARCH): DH_OPTIONS = $(foreach p, $(PACKAGE_NAMES), -p$(p))
 install-headers_$(ARCH):
@@ -457,10 +450,6 @@
 	dh_install '$<' /usr/src
 	+$(MAKE_SELF) install-base
 
-install-tree: DH_OPTIONS = -plinux-tree-$(VERSION)
-install-tree:
-	+$(MAKE_SELF) install-dummy
-
 install-firmware: PACKAGE_NAME = firmware-linux-free
 install-firmware: DIR = $(BUILD_DIR)/build-firmware
 install-firmware: SOURCE_DIR = $(BUILD_DIR)/source