From b265641834b98685a05d6ddaea19413f0a2056da Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Wed, 8 Jun 2011 23:55:21 +0000
Subject: [PATCH] Remove templates for obsolete image types 'kernel-package'
 and 'modulesinline'

svn path=/dists/trunk/linux-2.6/; revision=17633
---
 debian/bin/gencontrol.py                              | 1 -
 debian/templates/control.image.type-kernel-package.in | 7 -------
 debian/templates/control.image.type-modulesinline.in  | 6 ------
 3 files changed, 14 deletions(-)
 delete mode 100644 debian/templates/control.image.type-kernel-package.in
 delete mode 100644 debian/templates/control.image.type-modulesinline.in

diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index 32a2a4287..3fb762beb 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -196,7 +196,6 @@ class Gencontrol(Base):
         else:
             build_modules = True
             image = self.templates["control.image.type-%s" % config_entry_image['type']]
-            #image = self.templates["control.image.type-modulesinline"]
 
         config_entry_xen = self.config.merge('xen', arch, featureset, flavour)
         if config_entry_xen.get('dom0-support', False):
diff --git a/debian/templates/control.image.type-kernel-package.in b/debian/templates/control.image.type-kernel-package.in
deleted file mode 100644
index bf57ac971..000000000
--- a/debian/templates/control.image.type-kernel-package.in
+++ /dev/null
@@ -1,7 +0,0 @@
-Package: linux-image-@upstreamversion@@abiname@@localversion@
-Provides: linux-image, linux-modules-@upstreamversion@@abiname@@localversion@
-Pre-Depends: debconf | debconf-2.0
-Depends: module-init-tools, ${misc:Depends}
-Suggests: linux-doc-@version@
-Description: Linux @upstreamversion@ for @class@
- The Linux kernel @upstreamversion@ and modules for use on @longclass@.
diff --git a/debian/templates/control.image.type-modulesinline.in b/debian/templates/control.image.type-modulesinline.in
deleted file mode 100644
index 6c0c869fb..000000000
--- a/debian/templates/control.image.type-modulesinline.in
+++ /dev/null
@@ -1,6 +0,0 @@
-Package: linux-image-@upstreamversion@@abiname@@localversion@
-Provides: linux-image, linux-modules-@upstreamversion@@abiname@@localversion@
-Depends: module-init-tools, ${misc:Depends}
-Suggests: linux-doc-@version@
-Description: Linux @upstreamversion@ for @class@
- The Linux kernel @upstreamversion@ for use on @longclass@.